Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chntpw/PKGBUILD
	community/hardinfo/PKGBUILD
	community/obconf/obconf.install
	community/xplc/PKGBUILD
	community/zziplib/PKGBUILD
	core/rp-pppoe/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/icon-naming-utils/PKGBUILD
	extra/lxmenu-data/PKGBUILD
	extra/openbox/PKGBUILD
	extra/phonon-xine/PKGBUILD
	extra/qt/PKGBUILD
	extra/zope-interface/PKGBUILD
	libre/pacman/PKGBUILD
	libre/pacman/pacman.conf.mips64el
	libre/pacman/rePKGBUILD
	testing/coreutils/PKGBUILD
	testing/net-tools/PKGBUILD

3 files changed, 31 insertions, 35 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index bccfb3d82..2b1a423b2 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
+# $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.5.2
-pkgrel=1.1
+pkgver=3.5.3
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -19,15 +19,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         pacman.conf.x86_64
         pacman.conf.mips64el
-        makepkg.conf
-	makepkg.conf.mips64el)
-
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
-         'c7e6dbee04b7c492febea4366519b91d'
-         '8809642ed398d2b9b98c5974b8b5e348'
-         '3b2e740853e3d1463885675809d4c6ff'
-         'a8684989d3dfad5a6e1bcf95af3e571b'
-         'c1ddddc5cbd1273eafcf1d858c100de0')
+        makepkg.conf)
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -50,13 +42,15 @@ package() {
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 "
+      myflags="-march=i686 -mtune=generic -O2 -pipe"
+      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
       ;;
     x86_64)
       install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 "
+      myflags="-march=x86-64 -mtune=generic -O2 -pipe"
+      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
       ;;
     mips64el)
       install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
@@ -65,15 +59,11 @@ package() {
       myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop "
       ;;
   esac
-  if [ $CARCH = mips64el ]; then
-      install -m644 $srcdir/makepkg.conf.mips64el $pkgdir/etc/makepkg.conf
-  else
-      install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  fi
   # set things correctly in the default conf file
   sed -i $pkgdir/etc/makepkg.conf \
     -e "s|@CARCH[@]|$mycarch|g" \
     -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@LDFLAGS[@]|$myldflags|g" \
     -e "s|@CARCHFLAGS[@]|$myflags|g"
 
   # install completion files
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a655e935f..bfa971b7b 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -29,9 +29,9 @@ CHOST="@CHOST@"
 #-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="@CARCHFLAGS@"
+CXXFLAGS="@CARCHFLAGS@"
+LDFLAGS="@LDFLAGS@"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index d7378a9f9..af613dc74 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-unset source
-source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
-        pacman.conf
-        pacman.conf.x86_64
-        makepkg.conf)
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
+CARCH=x86_64
+unset build package md5sums source
+_repo=core
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+	# files for pkg modifications
+  pacman.conf
+  pacman.conf.x86_64
+        )
+options=(!strip)
 
 build() {
   cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
+  rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+  # put actions for package modifications below this line
 
 }
 
 package() {
+  cd ${srcdir}
   cp -a ./* ${pkgdir}
-  rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf}
 
+  rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
+
+# No need to repackage for mips64el
   case "$CARCH" in
     i686)
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
@@ -30,4 +35,5 @@ package() {
   esac
 }
 
-# vim: set ts=2 sw=2 et:
+
+# vim:set ts=2 sw=2 et: