pacman-3.5.3-1

4 files changed, 138 insertions, 39 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index dfdc56f09..236cc27f4 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
-# $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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base')
@@ -18,11 +18,13 @@ options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         pacman.conf.x86_64
+        pacman.conf.mips64el
         makepkg.conf)
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
+md5sums=('c36c18ed4d8ec69c0ecb4f9684266901'
          'c7e6dbee04b7c492febea4366519b91d'
          '8809642ed398d2b9b98c5974b8b5e348'
-         'a8684989d3dfad5a6e1bcf95af3e571b')
+         '4139efd9cc65aef199de1ebace9d9e84'
+         'be10d3d2e533515a0470237761415568')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -45,13 +47,22 @@ 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
+      mycarch="mips64el"
+      mychost="mips64el-unknown-linux-gnu"
+      myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
+      myldflags=""
       ;;
   esac
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
@@ -59,6 +70,7 @@ package() {
   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/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
new file mode 100644
index 000000000..8290fbf1d
--- /dev/null
+++ b/libre/pacman/pacman.conf.mips64el
@@ -0,0 +1,95 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#CleanMethod = KeepInstalled
+Architecture = mips64el
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[libre-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[libre]
+Include = /etc/pacman.d/mirrorlist
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index 251d44d72..af613dc74 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,39 +1,30 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=pacman
-pkgver=3.5.2
-pkgrel=1.2
-_pkgrel=1
-pkgdesc="A library-based package manager with dependency support"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-groups=('base')
-depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist-libre')
-optdepends=('fakeroot: for makepkg usage as normal user'
-            'curl: for rankmirrors usage')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool !strip)
-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'
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+source PKGBUILD
+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
@@ -44,4 +35,5 @@ package() {
   esac
 }
 
-# vim: set ts=2 sw=2 et:
+
+# vim:set ts=2 sw=2 et: