Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el

3 files changed, 28 insertions, 22 deletions

diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 7828e7eb4..999350dc8 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -22,11 +22,10 @@ optdepends=('bridge-utils: Network bridging support'
 install=initscripts.install
 source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
         'wireless.conf.d')
-md5sums=('df73e4c4043d4eaf6502ca6738c549aa'
-         '027576534885b8d5dded9be546057b12')
-
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
+md5sums=('cbd4320b6b1790f8c1fd80917650a566'
+         '027576534885b8d5dded9be546057b12')
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 2f4c7961d..0c57c0bfd 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -258,6 +258,7 @@ find $pkgdir -type d -exec chmod 755 {} \;
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
 md5sums=('923210b0c4190733bf314e48f588c112'
+<<<<<<< HEAD
          'abad63eab1f9485f6b1af76f5109f1e4'
          '5d40a23419b48f5b49f1f10be0e733c3'
          'af5937ac06a78907ceb499351bdff7ab'
@@ -265,6 +266,8 @@ md5sums=('923210b0c4190733bf314e48f588c112'
          'ba583747f515e51ec0f16d535e4be6e0')
 md5sums=('8feab9fb6c177052cb79248a223fbf66'
          'a480007d95472cc16825f5afe6e18e54'
+=======
+>>>>>>> 4aea7f1d98a7fba9a021ade4c9d475b180687fe8
          'abad63eab1f9485f6b1af76f5109f1e4'
          '5d40a23419b48f5b49f1f10be0e733c3'
          'af5937ac06a78907ceb499351bdff7ab'
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index cbee2b234..28a900957 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=${pkgname%-libre}
 pkgver=9.20
 pkgrel=1
 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://p7zip.sourceforge.net/'
 makedepends=('yasm' 'nasm')
@@ -22,30 +22,34 @@ replaces=('p7zip')
 sha1sums=('c976df4543ea946a65bc3f5e3d4e9baa417e5f12'
           '3a3333d4703955664fdd4023c624ab4828af0ab1')
 build() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
+  cd "${srcdir}/${_pkgname}_${pkgver}"
 
-    msg "Removing unRar"
-	sed -e '/Rar/d' -i makefile*
-	rm -rf CPP/7zip/Compress/Rar
-	patch -p1 -i $startdir/src/9.04-makefile.patch
+  msg "Removing unRar"
+  sed -e '/Rar/d' -i makefile*
+  rm -rf CPP/7zip/Compress/Rar
+  patch -p1 -i $startdir/src/9.04-makefile.patch
 
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-	sed -i "s|usr/local|usr|g" makefile
+  if [[ $CARCH = x86_64 ]] ; then
+    cp makefile.linux_amd64_asm makefile.machine
+  elif [ $CARCH = mips64el ]; then
+    cp makefile.linux_any_cpu_gcc_4.X makefile.machine
+  else
+    cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+  fi
+  sed -i "s|usr/local|usr|g" makefile
 
-	make all3 OPTFLAGS="${CXXFLAGS}"
+  make all3 OPTFLAGS="${CXXFLAGS}"
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
+  cd "${srcdir}/${_pkgname}_${pkgver}"
 
-	make install \
-		DEST_HOME="${pkgdir}/usr" \
-		DEST_MAN="${pkgdir}/usr/share/man" \
-		DEST_SHARE_DOC="http://www.bugaco.com/7zip"
+  make install \
+    DEST_HOME="${pkgdir}/usr" \
+    DEST_MAN="${pkgdir}/usr/share/man" \
+    DEST_SHARE_DOC="http://www.bugaco.com/7zip"
 
-	install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
-	sed "s|${pkgdir}/usr|/usr|g" -i "${pkgdir}"/usr/bin/7z{,a,r}
-	install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
+  install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
+  sed "s|${pkgdir}/usr|/usr|g" -i "${pkgdir}"/usr/bin/7z{,a,r}
+  install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
 }