[arch-commits] Commit in pacman/repos (12 files)

2017-02-11 Thread Pierre Schmitz 
Date: Saturday, February 11, 2017 @ 11:50:15
  Author: pierre
Revision: 288658

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pacman/repos/staging-i686/
  pacman/repos/staging-i686/PKGBUILD
(from rev 288657, pacman/trunk/PKGBUILD)
  pacman/repos/staging-i686/makepkg.conf
(from rev 288657, pacman/trunk/makepkg.conf)
  pacman/repos/staging-i686/pacman-5.0.1-roundup.patch
(from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/staging-i686/pacman.conf.i686
(from rev 288657, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-i686/pacman.conf.x86_64
(from rev 288657, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/staging-x86_64/
  pacman/repos/staging-x86_64/PKGBUILD
(from rev 288657, pacman/trunk/PKGBUILD)
  pacman/repos/staging-x86_64/makepkg.conf
(from rev 288657, pacman/trunk/makepkg.conf)
  pacman/repos/staging-x86_64/pacman-5.0.1-roundup.patch
(from rev 288657, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/staging-x86_64/pacman.conf.i686
(from rev 288657, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-x86_64/pacman.conf.x86_64
(from rev 288657, pacman/trunk/pacman.conf.x86_64)

---+
 staging-i686/PKGBUILD |   99 +++
 staging-i686/makepkg.conf |  147 +++
 staging-i686/pacman-5.0.1-roundup.patch   |  174 
 staging-i686/pacman.conf.i686 |   91 ++
 staging-i686/pacman.conf.x86_64   |  100 
 staging-x86_64/PKGBUILD   |   99 +++
 staging-x86_64/makepkg.conf   |  147 +++
 staging-x86_64/pacman-5.0.1-roundup.patch |  174 
 staging-x86_64/pacman.conf.i686   |   91 ++
 staging-x86_64/pacman.conf.x86_64 |  100 
 10 files changed, 1222 insertions(+)

Copied: pacman/repos/staging-i686/PKGBUILD (from rev 288657, 
pacman/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-02-11 11:50:15 UTC (rev 288658)
@@ -0,0 +1,99 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee 
+# Maintainer: Dave Reisner 
+
+pkgname=pacman
+pkgver=5.0.1
+pkgrel=5
+pkgdesc="A library-based package manager with dependency support"
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')
+checkdepends=('python2' 'fakechroot')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman-5.0.1-roundup.patch
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('377a2664d6007d72d6d8a126add83bcf'
+ 'SKIP'
+ '1a6573187531068d38cb4478cd20368c'
+ 'bdb40c76225c2fd8874bd34b6a3f6ad7'
+ 'c511ee4c7a86a37e8841440ede89300d'
+ 'f5b59fe5f016eebd9590318530bbd996')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 

+
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  
+  # v5.0.1..pacman-5.0.1..c2f97580
+  patch -p1 -i $srcdir/pacman-5.0.1-roundup.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make V=1
+  make -C contrib 
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 "$pkgdir/etc"
+  install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
+
+  case $CARCH in
+i686)
+  mycarch="i686"
+  mychost="i686-pc-linux-gnu"
+  myflags="-march=i686"
+  ;;
+x86_64)
+  mycarch="x86_64"
+  mychost="x86_64-pc-linux-gnu"
+  myflags="-march=x86-64"
+  ;;
+  esac
+
+  # set things correctly in the default conf file
+  install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+  sed -i "$pkgdir/etc/makepkg.conf" \
+-e "s|@CARCH[@]|$mycarch|g" \
+-e "s|@CHOST[@]|$mychost|g" \
+-e "s|@CARCHFLAGS[@]|$myflags|g"
+
+  # put bash_completion in the right location
+  install -dm755 "$pkgdir/usr/share/bash-completion/completions"
+  mv "$pkgdir/etc/bash_completion.d/pacman" 
"$pkgdir/usr/share/bash-completion/completions"
+  rmdir "$pkgdir/etc/bash_completion.d"
+
+  for f in makepkg pacman-key; do
+ln

[arch-commits] Commit in pacman/repos (12 files)

2016-05-17 Thread Allan McRae 
Date: Wednesday, May 18, 2016 @ 07:56:29
  Author: allan
Revision: 268274

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 268273, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 268273, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman-5.0.1-roundup.patch
(from rev 268273, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 268273, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 268273, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 268273, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 268273, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman-5.0.1-roundup.patch
(from rev 268273, pacman/trunk/pacman-5.0.1-roundup.patch)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 268273, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 268273, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |   99 +++
 testing-i686/makepkg.conf |  147 +++
 testing-i686/pacman-5.0.1-roundup.patch   |  174 
 testing-i686/pacman.conf.i686 |   91 ++
 testing-i686/pacman.conf.x86_64   |  100 
 testing-x86_64/PKGBUILD   |   99 +++
 testing-x86_64/makepkg.conf   |  147 +++
 testing-x86_64/pacman-5.0.1-roundup.patch |  174 
 testing-x86_64/pacman.conf.i686   |   91 ++
 testing-x86_64/pacman.conf.x86_64 |  100 
 10 files changed, 1222 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 268273:268274 to see the changes.

[arch-commits] Commit in pacman/repos (12 files)

2016-05-02 Thread Allan McRae 
Date: Monday, May 2, 2016 @ 15:06:16
  Author: allan
Revision: 266766

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pacman/repos/staging-i686/
  pacman/repos/staging-i686/0001-libmakepkg-fix-is_array-function.patch
(from rev 266765, pacman/trunk/0001-libmakepkg-fix-is_array-function.patch)
  pacman/repos/staging-i686/PKGBUILD
(from rev 266765, pacman/trunk/PKGBUILD)
  pacman/repos/staging-i686/makepkg.conf
(from rev 266765, pacman/trunk/makepkg.conf)
  pacman/repos/staging-i686/pacman.conf.i686
(from rev 266765, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-i686/pacman.conf.x86_64
(from rev 266765, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/staging-x86_64/
  pacman/repos/staging-x86_64/0001-libmakepkg-fix-is_array-function.patch
(from rev 266765, pacman/trunk/0001-libmakepkg-fix-is_array-function.patch)
  pacman/repos/staging-x86_64/PKGBUILD
(from rev 266765, pacman/trunk/PKGBUILD)
  pacman/repos/staging-x86_64/makepkg.conf
(from rev 266765, pacman/trunk/makepkg.conf)
  pacman/repos/staging-x86_64/pacman.conf.i686
(from rev 266765, pacman/trunk/pacman.conf.i686)
  pacman/repos/staging-x86_64/pacman.conf.x86_64
(from rev 266765, pacman/trunk/pacman.conf.x86_64)

+
 staging-i686/0001-libmakepkg-fix-is_array-function.patch   |   32 ++
 staging-i686/PKGBUILD  |   97 +++
 staging-i686/makepkg.conf  |  147 +++
 staging-i686/pacman.conf.i686  |   91 ++
 staging-i686/pacman.conf.x86_64|  100 +++
 staging-x86_64/0001-libmakepkg-fix-is_array-function.patch |   32 ++
 staging-x86_64/PKGBUILD|   97 +++
 staging-x86_64/makepkg.conf|  147 +++
 staging-x86_64/pacman.conf.i686|   91 ++
 staging-x86_64/pacman.conf.x86_64  |  100 +++
 10 files changed, 934 insertions(+)

Copied: pacman/repos/staging-i686/0001-libmakepkg-fix-is_array-function.patch 
(from rev 266765, pacman/trunk/0001-libmakepkg-fix-is_array-function.patch)
===
--- staging-i686/0001-libmakepkg-fix-is_array-function.patch
(rev 0)
+++ staging-i686/0001-libmakepkg-fix-is_array-function.patch2016-05-02 
13:06:16 UTC (rev 266766)
@@ -0,0 +1,32 @@
+From 2822a45fa91b430c99b4b8bd3531ee745ada1ab7 Mon Sep 17 00:00:00 2001
+From: Allan McRae 
+Date: Fri, 26 Feb 2016 15:01:11 +1000
+Subject: [PATCH] libmakepkg: fix is_array function
+
+This happened to work for the majority of cases because the only calling
+function used a variable named "i" that was related to the variable being
+passed to the function.
+
+Fixes FS#48340.
+
+Signed-off-by: Allan McRae 
+---
+ scripts/libmakepkg/util/util.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
+index 675e75d..f9f1c20 100644
+--- a/scripts/libmakepkg/util/util.sh
 b/scripts/libmakepkg/util/util.sh
+@@ -46,7 +46,7 @@ is_array() {
+   local shellopts=$(shopt -p)
+   shopt -s extglob
+ 
+-  if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * 
]]; then
++  if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * 
]]; then
+   ret=0
+   fi
+ 
+-- 
+2.7.1
+

Copied: pacman/repos/staging-i686/PKGBUILD (from rev 266765, 
pacman/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-05-02 13:06:16 UTC (rev 266766)
@@ -0,0 +1,97 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee 
+# Maintainer: Dave Reisner 
+
+pkgname=pacman
+pkgver=5.0.1
+pkgrel=3
+pkgdesc="A library-based package manager with dependency support"
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+checkdepends=('python2' 'fakechroot')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+0001-libmakepkg-fix-is_array-function.patch
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('377a2664d6007d72d6d8a126add83bcf'
+ 'SKIP'
+ '55732144f1048f714f1f93203e9b7728'
+ 'bdb40c76225c2fd8874bd34b6a3f6ad7'
+ 'c511ee4c7a86a37e8841440ede89300d'
+

[arch-commits] Commit in pacman/repos (12 files)

2016-01-29 Thread Allan McRae 
Date: Saturday, January 30, 2016 @ 01:41:44
  Author: allan
Revision: 258692

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 258691, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/ensure-matching-database-and-package-version.patch
(from rev 258691, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-i686/makepkg.conf
(from rev 258691, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 258691, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 258691, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 258691, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/ensure-matching-database-and-package-version.patch
(from rev 258691, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 258691, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 258691, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 258691, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |   90 ++
 testing-i686/ensure-matching-database-and-package-version.patch   |   60 
 testing-i686/makepkg.conf |  147 
++
 testing-i686/pacman.conf.i686 |   91 ++
 testing-i686/pacman.conf.x86_64   |  100 ++
 testing-x86_64/PKGBUILD   |   90 ++
 testing-x86_64/ensure-matching-database-and-package-version.patch |   60 
 testing-x86_64/makepkg.conf   |  147 
++
 testing-x86_64/pacman.conf.i686   |   91 ++
 testing-x86_64/pacman.conf.x86_64 |  100 ++
 10 files changed, 976 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 258691, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-01-30 00:41:44 UTC (rev 258692)
@@ -0,0 +1,90 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee 
+# Maintainer: Dave Reisner 
+
+pkgname=pacman
+pkgver=5.0.0
+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' 'base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')   # roundup patch alters docs
+checkdepends=('python2' 'fakechroot')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
+ 'SKIP'
+ 'bdb40c76225c2fd8874bd34b6a3f6ad7'
+ 'c511ee4c7a86a37e8841440ede89300d'
+ 'f5b59fe5f016eebd9590318530bbd996')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 

+
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make V=1
+  make -C contrib 
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 "$pkgdir/etc"
+  install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
+
+  case $CARCH in
+i686)
+  mycarch="i686"
+  mychost="i686-pc-linux-gnu"
+  myflags="-march=i686"
+  ;;
+x86_64)
+  mycarch="x86_64"
+  mychost="x86_64-unknown-linux-gnu"
+  myflags="-march=x86-64"
+  ;;
+  esac
+
+  # set things correctly in the default conf file
+  install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+  sed -i "$pkgdir/etc/makepkg.conf" \
+-e "s|@CARCH[@]|$mycarch|g" \
+-e "s|@CHOST[@]|$mychost|g" \
+-e "s|@CARCHFLAGS[@]|$myflags|g"
+
+  # put bash_completion in the right location
+  install -dm755 "$pkgdir/usr/share/bash-completion/completions"
+  mv "$pkgdir/etc/bash_completion.d/pacman" 
"$pkgdir/usr/share/bash-completion/completions"
+  rmdir

[arch-commits] Commit in pacman/repos (12 files)

2015-08-12 Thread Allan McRae 
Date: Wednesday, August 12, 2015 @ 09:11:00
  Author: allan
Revision: 243201

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 243200, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/ensure-matching-database-and-package-version.patch
(from rev 243200, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-i686/makepkg.conf
(from rev 243200, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 243200, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 243200, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 243200, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/ensure-matching-database-and-package-version.patch
(from rev 243200, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 243200, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 243200, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 243200, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |   98 ++
 testing-i686/ensure-matching-database-and-package-version.patch   |   60 
 testing-i686/makepkg.conf |  146 
++
 testing-i686/pacman.conf.i686 |   90 ++
 testing-i686/pacman.conf.x86_64   |   99 ++
 testing-x86_64/PKGBUILD   |   98 ++
 testing-x86_64/ensure-matching-database-and-package-version.patch |   60 
 testing-x86_64/makepkg.conf   |  146 
++
 testing-x86_64/pacman.conf.i686   |   90 ++
 testing-x86_64/pacman.conf.x86_64 |   99 ++
 10 files changed, 986 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 243200, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-08-12 07:11:00 UTC (rev 243201)
@@ -0,0 +1,98 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.2.1
+pkgrel=3
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash' 'glibc' 'libarchive=3.1.2' 'curl=7.39.0'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')   # roundup patch alters docs
+checkdepends=('python2' 'fakechroot')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+   ensure-matching-database-and-package-version.patch
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('2a596fc8f723e99660c0869a74afcf47'
+ 'SKIP'
+ 'e8f72afe6f417d11bd36ada042744fe4'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '08beec98ce8c3eca6a980c4a21c0bef0')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
+
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -p1 -i $srcdir/ensure-matching-database-and-package-version.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
+  case $CARCH in
+i686)
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+x86_64)
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64
+  ;;
+  esac
+
+  # set things correctly in the default conf file
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc
+  sed -i $pkgdir/etc/makepkg.conf \
+-e s|@CARCH[@]|$mycarch|g \
+-e s|@CHOST[@]|$mychost|g \
+-e s|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install

[arch-commits] Commit in pacman/repos (12 files)

2015-07-23 Thread Allan McRae 
Date: Friday, July 24, 2015 @ 03:56:49
  Author: allan
Revision: 242469

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 242468, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/ensure-matching-database-and-package-version.patch
(from rev 242468, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-i686/makepkg.conf
(from rev 242468, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 242468, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 242468, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 242468, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/ensure-matching-database-and-package-version.patch
(from rev 242468, 
pacman/trunk/ensure-matching-database-and-package-version.patch)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 242468, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 242468, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 242468, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |   98 ++
 testing-i686/ensure-matching-database-and-package-version.patch   |   60 
 testing-i686/makepkg.conf |  146 
++
 testing-i686/pacman.conf.i686 |   90 ++
 testing-i686/pacman.conf.x86_64   |   99 ++
 testing-x86_64/PKGBUILD   |   98 ++
 testing-x86_64/ensure-matching-database-and-package-version.patch |   60 
 testing-x86_64/makepkg.conf   |  146 
++
 testing-x86_64/pacman.conf.i686   |   90 ++
 testing-x86_64/pacman.conf.x86_64 |   99 ++
 10 files changed, 986 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 242468, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-07-24 01:56:49 UTC (rev 242469)
@@ -0,0 +1,98 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.2.1
+pkgrel=2
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash' 'glibc' 'libarchive=3.1.2' 'curl=7.39.0'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')   # roundup patch alters docs
+checkdepends=('python2' 'fakechroot')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+   ensure-matching-database-and-package-version.patch
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('2a596fc8f723e99660c0869a74afcf47'
+ 'SKIP'
+ 'e8f72afe6f417d11bd36ada042744fe4'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '03d578816b56852d803cbafac85b9f09')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
+
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -p1 -i $srcdir/ensure-matching-database-and-package-version.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
+  case $CARCH in
+i686)
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+x86_64)
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64
+  ;;
+  esac
+
+  # set things correctly in the default conf file
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc
+  sed -i $pkgdir/etc/makepkg.conf \
+-e s|@CARCH[@]|$mycarch|g \
+-e s|@CHOST[@]|$mychost|g \
+-e s|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install

[arch-commits] Commit in pacman/repos (12 files)

2015-01-11 Thread Allan McRae 
Date: Monday, January 12, 2015 @ 06:56:24
  Author: allan
Revision: 228935

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 228934, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 228934, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman-4.2.0-roundup.patch
(from rev 228934, pacman/trunk/pacman-4.2.0-roundup.patch)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 228934, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 228934, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 228934, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 228934, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman-4.2.0-roundup.patch
(from rev 228934, pacman/trunk/pacman-4.2.0-roundup.patch)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 228934, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 228934, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |  101 
 testing-i686/makepkg.conf |  146 +++
 testing-i686/pacman-4.2.0-roundup.patch   |  342 
 testing-i686/pacman.conf.i686 |   90 +++
 testing-i686/pacman.conf.x86_64   |   99 
 testing-x86_64/PKGBUILD   |  101 
 testing-x86_64/makepkg.conf   |  146 +++
 testing-x86_64/pacman-4.2.0-roundup.patch |  342 
 testing-x86_64/pacman.conf.i686   |   90 +++
 testing-x86_64/pacman.conf.x86_64 |   99 
 10 files changed, 1556 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 228934:228935 to see the changes.

[arch-commits] Commit in pacman/repos (12 files)

2014-12-21 Thread Allan McRae 
Date: Monday, December 22, 2014 @ 05:13:47
  Author: allan
Revision: 227922

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 227921, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 227921, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman-4.2.0-roundup.patch
(from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 227921, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 227921, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 227921, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 227921, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman-4.2.0-roundup.patch
(from rev 227921, pacman/trunk/pacman-4.2.0-roundup.patch)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 227921, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 227921, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/PKGBUILD |   98 ++
 testing-i686/makepkg.conf |  146 
 testing-i686/pacman-4.2.0-roundup.patch   |   94 ++
 testing-i686/pacman.conf.i686 |   90 +
 testing-i686/pacman.conf.x86_64   |   99 ++
 testing-x86_64/PKGBUILD   |   98 ++
 testing-x86_64/makepkg.conf   |  146 
 testing-x86_64/pacman-4.2.0-roundup.patch |   94 ++
 testing-x86_64/pacman.conf.i686   |   90 +
 testing-x86_64/pacman.conf.x86_64 |   99 ++
 10 files changed, 1054 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 227921, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-12-22 04:13:47 UTC (rev 227922)
@@ -0,0 +1,98 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.2.0
+pkgrel=3
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash' 'glibc' 'libarchive=3.1.2' 'curl=7.39.0'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+checkdepends=('python2' 'fakechroot')
+optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf
+pacman-4.2.0-roundup.patch)
+md5sums=('184ce14f1f326fede72012cca51bba51'
+ 'SKIP'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '0d07f2a750ba20d114c3adc799d371de'
+ 'e98459a565bb4e199695f9c319d7d52d')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae 
al...@archlinux.org
+
+prepare() {
+  cd $pkgname-$pkgver
+  
+  # v4.2.0..c8448bb4
+  patch -p1 -i $srcdir/pacman-4.2.0-roundup.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
+  case $CARCH in
+i686)
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+x86_64)
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64
+  ;;
+  esac
+
+  # set things correctly in the default conf file
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc
+  sed -i $pkgdir/etc/makepkg.conf \
+-e s|@CARCH[@]|$mycarch|g \
+-e s|@CHOST[@]|$mychost|g \
+-e s|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install -dm755 $pkgdir/usr/share/bash-completion/completions
+  mv $pkgdir/etc/bash_completion.d/pacman 
$pkgdir/usr/share/bash-completion/completions
+  rmdir $pkgdir/etc/bash_completion.d
+
+  for f in makepkg pacman-key; do
+ln -s pacman

[arch-commits] Commit in pacman/repos (12 files)

2014-11-21 Thread Allan McRae 
Date: Friday, November 21, 2014 @ 12:24:43
  Author: allan
Revision: 226781

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/0001-pacman-key-compatibility-with-gnupg-2.1.patch
(from rev 226780, 
pacman/trunk/0001-pacman-key-compatibility-with-gnupg-2.1.patch)
  pacman/repos/testing-i686/PKGBUILD
(from rev 226780, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 226780, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 226780, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 226780, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/0001-pacman-key-compatibility-with-gnupg-2.1.patch
(from rev 226780, 
pacman/trunk/0001-pacman-key-compatibility-with-gnupg-2.1.patch)
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 226780, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 226780, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 226780, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 226780, pacman/trunk/pacman.conf.x86_64)

---+
 testing-i686/0001-pacman-key-compatibility-with-gnupg-2.1.patch   |   27 +
 testing-i686/PKGBUILD |   96 ++
 testing-i686/makepkg.conf |  140 
++
 testing-i686/pacman.conf.i686 |   90 ++
 testing-i686/pacman.conf.x86_64   |   99 
+++
 testing-x86_64/0001-pacman-key-compatibility-with-gnupg-2.1.patch |   27 +
 testing-x86_64/PKGBUILD   |   96 ++
 testing-x86_64/makepkg.conf   |  140 
++
 testing-x86_64/pacman.conf.i686   |   90 ++
 testing-x86_64/pacman.conf.x86_64 |   99 
+++
 10 files changed, 904 insertions(+)

Copied: 
pacman/repos/testing-i686/0001-pacman-key-compatibility-with-gnupg-2.1.patch 
(from rev 226780, 
pacman/trunk/0001-pacman-key-compatibility-with-gnupg-2.1.patch)
===
--- testing-i686/0001-pacman-key-compatibility-with-gnupg-2.1.patch 
(rev 0)
+++ testing-i686/0001-pacman-key-compatibility-with-gnupg-2.1.patch 
2014-11-21 11:24:43 UTC (rev 226781)
@@ -0,0 +1,27 @@
+From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001
+From: Tobias Powalowski tp...@archlinux.org
+Date: Fri, 21 Nov 2014 20:54:58 +1000
+Subject: [PATCH] pacman-key: compatibility with gnupg-2.1
+
+GnuPG 2.1 no longer allow empty passphrases by default.
+
+Signed-off-by: Allan McRae al...@archlinux.org
+---
+ scripts/pacman-key.sh.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
+index ba8d02e..5ba0ad8 100644
+--- a/scripts/pacman-key.sh.in
 b/scripts/pacman-key.sh.in
+@@ -151,6 +151,7 @@ Key-Usage: sign
+ Name-Real: Pacman Keyring Master Key
+ Name-Email: pacman@localhost
+ Expire-Date: 0
++%no-protection
+ %commit
+ %echo Done
+ EOF
+-- 
+2.1.3
+

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 226780, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-11-21 11:24:43 UTC (rev 226781)
@@ -0,0 +1,96 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.1.2
+pkgrel=7
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base' 'base-devel')
+depends=('bash=4.2.042-2' 'glibc=2.17-2' 'libarchive=3.1.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+checkdepends=('python2' 'fakechroot')
+optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+options=('strip' 'debug')
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+   0001-pacman-key-compatibility-with-gnupg-2.1.patch
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
+ 'SKIP'
+ 'd0e015b1bf78cbf9762d9c44ea5f77a9'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '2da6544e387f940588a90cb4b9b914e2')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae

[arch-commits] Commit in pacman/repos (12 files)

2013-06-17 Thread Allan McRae 
Date: Tuesday, June 18, 2013 @ 06:06:17
  Author: allan
Revision: 188693

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 188692, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 188692, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 188692, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 188692, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 188692, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 188692, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 188692, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 188692, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 188692, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 188692, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   86 ++
 testing-i686/makepkg.conf |  140 
 testing-i686/pacman.conf.i686 |   90 +++
 testing-i686/pacman.conf.x86_64   |   99 +
 testing-i686/pacman.install   |   75 +++
 testing-x86_64/PKGBUILD   |   86 ++
 testing-x86_64/makepkg.conf   |  140 
 testing-x86_64/pacman.conf.i686   |   90 +++
 testing-x86_64/pacman.conf.x86_64 |   99 +
 testing-x86_64/pacman.install |   75 +++
 10 files changed, 980 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 188692, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-06-18 04:06:17 UTC (rev 188693)
@@ -0,0 +1,86 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.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' 'base-devel')
+depends=('bash=4.2.042-2' 'glibc=2.17-2' 'libarchive=3.1.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+checkdepends=('python2' 'fakechroot')
+optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
+ 'SKIP'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '5f360e003e95f1a5cbd6e60d937dfd25')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  
+  case $CARCH in
+i686)
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+x86_64)
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+  mv ${pkgdir}/etc/bash_completion.d/pacman \
+${pkgdir}/usr/share/bash-completion/completions
+  rmdir ${pkgdir}/etc/bash_completion.d
+
+  for f in makepkg pacman-key; do
+ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
+  done
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 188692, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2013-06-18

[arch-commits] Commit in pacman/repos (12 files)

2013-05-06 Thread Allan McRae 
Date: Tuesday, May 7, 2013 @ 05:39:23
  Author: allan
Revision: 184463

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 184462, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 184462, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 184462, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 184462, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 184462, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 184462, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 184462, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 184462, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 184462, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 184462, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   86 ++
 testing-i686/makepkg.conf |  140 
 testing-i686/pacman.conf.i686 |   90 +++
 testing-i686/pacman.conf.x86_64   |   99 +
 testing-i686/pacman.install   |   75 +++
 testing-x86_64/PKGBUILD   |   86 ++
 testing-x86_64/makepkg.conf   |  140 
 testing-x86_64/pacman.conf.i686   |   90 +++
 testing-x86_64/pacman.conf.x86_64 |   99 +
 testing-x86_64/pacman.install |   75 +++
 10 files changed, 980 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 184462, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-05-07 03:39:23 UTC (rev 184463)
@@ -0,0 +1,86 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.1.1
+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' 'base-devel')
+depends=('bash=4.2.042-2' 'glibc=2.17-2' 'libarchive=3.1.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+checkdepends=('python2' 'fakechroot')
+optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('72a1688ff73c1c0b79d8f87b3793d446'
+ 'SKIP'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '5f360e003e95f1a5cbd6e60d937dfd25')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc \
+--with-scriptlet-shell=/usr/bin/bash \
+--with-ldconfig=/usr/bin/ldconfig
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
+
+  # install Arch specific stuff
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  
+  case $CARCH in
+i686)
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+x86_64)
+  mycarch=x86_64
+  mychost=x86_64-unknown-linux-gnu
+  myflags=-march=x86-64
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # put bash_completion in the right location
+  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+  mv ${pkgdir}/etc/bash_completion.d/pacman \
+${pkgdir}/usr/share/bash-completion/completions
+  rmdir ${pkgdir}/etc/bash_completion.d
+
+  for f in makepkg pacman-key; do
+ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
+  done
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 184462, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2013-05-07

[arch-commits] Commit in pacman/repos (12 files)

2013-04-01 Thread Allan McRae 
Date: Monday, April 1, 2013 @ 08:36:08
  Author: allan
Revision: 181134

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 181133, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 181133, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf.i686
(from rev 181133, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 181133, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 181133, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 181133, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 181133, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf.i686
(from rev 181133, pacman/trunk/pacman.conf.i686)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 181133, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 181133, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   79 
 testing-i686/makepkg.conf |  137 
 testing-i686/pacman.conf.i686 |   90 +++
 testing-i686/pacman.conf.x86_64   |   99 ++
 testing-i686/pacman.install   |   75 +++
 testing-x86_64/PKGBUILD   |   79 
 testing-x86_64/makepkg.conf   |  137 
 testing-x86_64/pacman.conf.i686   |   90 +++
 testing-x86_64/pacman.conf.x86_64 |   99 ++
 testing-x86_64/pacman.install |   75 +++
 10 files changed, 960 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 181133, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-04-01 06:36:08 UTC (rev 181134)
@@ -0,0 +1,79 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.1.0
+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' 'base-devel')
+depends=('bash' 'glibc=2.15' 'libarchive=3.1.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')
+checkdepends=('fakechroot')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf.i686
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
+ '4959b8d00056398195f4e549e7bdd346'
+ '2db6c94709bb30cc614a176ecf8badb1'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '2ea6f0a5badef735ec7d30a372f5e9c6')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+  make -C contrib
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf.i686 $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+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
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  install -Dm644 contrib/bash_completion 
$pkgdir/usr/share/bash-completion/completions/pacman
+  for f in makepkg pacman-key; do
+ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
+  done
+
+  install -Dm644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 181133, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2013-04-01 06:36:08 UTC (rev 181134)
@@ -0,0 +1,137 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION

[arch-commits] Commit in pacman/repos (12 files)

2012-06-02 Thread Gaetan Bisson 
Date: Sunday, June 3, 2012 @ 01:23:46
  Author: bisson
Revision: 160648

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 160647, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 160647, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 160647, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 160647, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 160647, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 160647, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 160647, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 160647, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 160647, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 160647, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   77 ++
 testing-i686/makepkg.conf |  121 
 testing-i686/pacman.conf  |   95 
 testing-i686/pacman.conf.x86_64   |  106 +++
 testing-i686/pacman.install   |   75 ++
 testing-x86_64/PKGBUILD   |   77 ++
 testing-x86_64/makepkg.conf   |  121 
 testing-x86_64/pacman.conf|   95 
 testing-x86_64/pacman.conf.x86_64 |  106 +++
 testing-x86_64/pacman.install |   75 ++
 10 files changed, 948 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 160647, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-06-03 05:23:46 UTC (rev 160648)
@@ -0,0 +1,77 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.3
+pkgrel=2
+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' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
+ '99734ea46795f466d41c503e9e23b6d4'
+ '556d49489e82b5750cf026d3b18c8f4f'
+ '589cd34eb9d5b678455e8289394f523e')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686
+  ;;
+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
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  install -Dm644 contrib/bash_completion 
$pkgdir/usr/share/bash-completion/completions/pacman
+  for f in makepkg pacman-key; do
+ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
+  done
+
+  install -Dm644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 160647, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2012-06-03 05:23:46 UTC (rev 160648)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION

[arch-commits] Commit in pacman/repos (12 files)

2012-04-07 Thread Dave Reisner 
Date: Saturday, April 7, 2012 @ 12:38:35
  Author: dreisner
Revision: 155849

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 155848, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 155848, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 155848, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 155848, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 155848, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 155848, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 155848, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 155848, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 155848, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 155848, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   77 ++
 testing-i686/makepkg.conf |  121 
 testing-i686/pacman.conf  |  100 +
 testing-i686/pacman.conf.x86_64   |  111 +
 testing-i686/pacman.install   |   73 +
 testing-x86_64/PKGBUILD   |   77 ++
 testing-x86_64/makepkg.conf   |  121 
 testing-x86_64/pacman.conf|  100 +
 testing-x86_64/pacman.conf.x86_64 |  111 +
 testing-x86_64/pacman.install |   73 +
 10 files changed, 964 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 155848, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-04-07 16:38:35 UTC (rev 155849)
@@ -0,0 +1,77 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner dreis...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.3
+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' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
+ '4605b3490d4fd1e5c6e20db17da9ded6'
+ 'a0edf98ad1845a4c7d902a86638d5d2d'
+ 'db051afbd12993b7743ccd4d58668499')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686 
+  ;;
+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 
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  install -Dm644 contrib/bash_completion 
$pkgdir/usr/share/bash-completion/completions/pacman
+  for f in makepkg pacman-key; do
+ln -s pacman $pkgdir/usr/share/bash-completion/completions/$f
+  done
+
+  install -Dm644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 155848, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2012-04-07 16:38:35 UTC (rev 155849)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION
+#

[arch-commits] Commit in pacman/repos (12 files)

2012-02-11 Thread Dave Reisner 
Date: Saturday, February 11, 2012 @ 16:39:49
  Author: dreisner
Revision: 149918

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 149917, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 149917, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 149917, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 149917, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 149917, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 149917, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 149917, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 149917, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 149917, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 149917, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   78 +++
 testing-i686/makepkg.conf |  121 
 testing-i686/pacman.conf  |  100 +
 testing-i686/pacman.conf.x86_64   |  111 +
 testing-i686/pacman.install   |   73 +
 testing-x86_64/PKGBUILD   |   78 +++
 testing-x86_64/makepkg.conf   |  121 
 testing-x86_64/pacman.conf|  100 +
 testing-x86_64/pacman.conf.x86_64 |  111 +
 testing-x86_64/pacman.install |   73 +
 10 files changed, 966 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 149917, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-02-11 21:39:49 UTC (rev 149918)
@@ -0,0 +1,78 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.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' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+ '575140dce3ea597d91b6d081aa3f6a00'
+ '4605b3490d4fd1e5c6e20db17da9ded6'
+ 'a0edf98ad1845a4c7d902a86638d5d2d'
+ 'db051afbd12993b7743ccd4d58668499')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+check() {
+  make -C $pkgname-$pkgver check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686 
+  ;;
+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 
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 149917, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2012-02-11 21:39:49 UTC (rev 149918)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION

[arch-commits] Commit in pacman/repos (12 files)

2012-01-16 Thread Dave Reisner 
Date: Monday, January 16, 2012 @ 14:48:37
  Author: dreisner
Revision: 146700

db-move: moved pacman from [testing] to [core] (i686)

Added:
  pacman/repos/core-i686/PKGBUILD
(from rev 146699, pacman/repos/testing-i686/PKGBUILD)
  pacman/repos/core-i686/makepkg.conf
(from rev 146699, pacman/repos/testing-i686/makepkg.conf)
  pacman/repos/core-i686/pacman.conf
(from rev 146699, pacman/repos/testing-i686/pacman.conf)
  pacman/repos/core-i686/pacman.conf.x86_64
(from rev 146699, pacman/repos/testing-i686/pacman.conf.x86_64)
  pacman/repos/core-i686/pacman.install
(from rev 146699, pacman/repos/testing-i686/pacman.install)
Deleted:
  pacman/repos/core-i686/0001-makepkg-fix-removing-symbolic-link.patch
  pacman/repos/core-i686/PKGBUILD
  pacman/repos/core-i686/makepkg.conf
  pacman/repos/core-i686/pacman.conf
  pacman/repos/core-i686/pacman.conf.x86_64
  pacman/repos/core-i686/pacman.install
  pacman/repos/testing-i686/

---+
 0001-makepkg-fix-removing-symbolic-link.patch |   32 ---
 PKGBUILD  |  149 +++
 makepkg.conf  |  235 
 pacman.conf   |  180 ++
 pacman.conf.x86_64|  200 +++-
 pacman.install|  135 +++--
 6 files changed, 478 insertions(+), 453 deletions(-)

Deleted: core-i686/0001-makepkg-fix-removing-symbolic-link.patch
===
--- core-i686/0001-makepkg-fix-removing-symbolic-link.patch 2012-01-16 
19:33:36 UTC (rev 146699)
+++ core-i686/0001-makepkg-fix-removing-symbolic-link.patch 2012-01-16 
19:48:37 UTC (rev 146700)
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae al...@archlinux.org
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae al...@archlinux.org
-Signed-off-by: Dan McGee d...@archlinux.org
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)

- scripts/makepkg.sh.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
 a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
-   local file=$(get_filepath $netfile || true)
-   if [[ -n $file ]]; then
-   msg2 $(gettext Found %s) ${file##*/}
--  rm -f $srcdir/$file
-+  rm -f $srcdir/${file##*/}
-   ln -s $file $srcdir/
-   continue
-   fi
--- 
-1.7.6
-

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-01-16 19:33:36 UTC (rev 146699)
+++ core-i686/PKGBUILD  2012-01-16 19:48:37 UTC (rev 146700)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=pacman
-pkgver=3.5.4
-pkgrel=4
-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' 'glibc=2.14' 'libarchive=2.8.4' 'libfetch=2.28' 
'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-'curl: for rankmirrors usage')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-pacman.conf
-pacman.conf.x86_64
-makepkg.conf
-0001-makepkg-fix-removing-symbolic-link.patch)
-md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
- 'e99eb721b6b704f68c5f47468507c102'
- 'f8b939d9b2beb79a0436961a2d707d7c'
- 'c034b061c86b3f26a9646cf8efc7ff11'
- '749a4ddc6d8418d8d031f1c9b4e09d6f')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1  $srcdir/0001-makepkg-fix-removing-symbolic-link.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install Arch specific stuff
-  mkdir -p $pkgdir/etc
-  case $CARCH in
-i686)
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-  mycarch=i686
-  mychost=i686-pc-linux-gnu
-  myflags=-march=i686 
-  ;;
-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 
-  ;;
-  esac
-  install

[arch-commits] Commit in pacman/repos (12 files)

2012-01-16 Thread Dave Reisner 
Date: Monday, January 16, 2012 @ 14:48:38
  Author: dreisner
Revision: 146701

db-move: moved pacman from [testing] to [core] (x86_64)

Added:
  pacman/repos/core-x86_64/PKGBUILD
(from rev 146699, pacman/repos/testing-x86_64/PKGBUILD)
  pacman/repos/core-x86_64/makepkg.conf
(from rev 146699, pacman/repos/testing-x86_64/makepkg.conf)
  pacman/repos/core-x86_64/pacman.conf
(from rev 146699, pacman/repos/testing-x86_64/pacman.conf)
  pacman/repos/core-x86_64/pacman.conf.x86_64
(from rev 146699, pacman/repos/testing-x86_64/pacman.conf.x86_64)
  pacman/repos/core-x86_64/pacman.install
(from rev 146699, pacman/repos/testing-x86_64/pacman.install)
Deleted:
  pacman/repos/core-x86_64/0001-makepkg-fix-removing-symbolic-link.patch
  pacman/repos/core-x86_64/PKGBUILD
  pacman/repos/core-x86_64/makepkg.conf
  pacman/repos/core-x86_64/pacman.conf
  pacman/repos/core-x86_64/pacman.conf.x86_64
  pacman/repos/core-x86_64/pacman.install
  pacman/repos/testing-x86_64/

---+
 0001-makepkg-fix-removing-symbolic-link.patch |   32 ---
 PKGBUILD  |  149 +++
 makepkg.conf  |  235 
 pacman.conf   |  180 ++
 pacman.conf.x86_64|  200 +++-
 pacman.install|  135 +++--
 6 files changed, 478 insertions(+), 453 deletions(-)

Deleted: core-x86_64/0001-makepkg-fix-removing-symbolic-link.patch
===
--- core-x86_64/0001-makepkg-fix-removing-symbolic-link.patch   2012-01-16 
19:48:37 UTC (rev 146700)
+++ core-x86_64/0001-makepkg-fix-removing-symbolic-link.patch   2012-01-16 
19:48:38 UTC (rev 146701)
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae al...@archlinux.org
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae al...@archlinux.org
-Signed-off-by: Dan McGee d...@archlinux.org
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)

- scripts/makepkg.sh.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
 a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
-   local file=$(get_filepath $netfile || true)
-   if [[ -n $file ]]; then
-   msg2 $(gettext Found %s) ${file##*/}
--  rm -f $srcdir/$file
-+  rm -f $srcdir/${file##*/}
-   ln -s $file $srcdir/
-   continue
-   fi
--- 
-1.7.6
-

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-01-16 19:48:37 UTC (rev 146700)
+++ core-x86_64/PKGBUILD2012-01-16 19:48:38 UTC (rev 146701)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-
-pkgname=pacman
-pkgver=3.5.4
-pkgrel=4
-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' 'glibc=2.14' 'libarchive=2.8.4' 'libfetch=2.28' 
'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-'curl: for rankmirrors usage')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-pacman.conf
-pacman.conf.x86_64
-makepkg.conf
-0001-makepkg-fix-removing-symbolic-link.patch)
-md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
- 'e99eb721b6b704f68c5f47468507c102'
- 'f8b939d9b2beb79a0436961a2d707d7c'
- 'c034b061c86b3f26a9646cf8efc7ff11'
- '749a4ddc6d8418d8d031f1c9b4e09d6f')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1  $srcdir/0001-makepkg-fix-removing-symbolic-link.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install Arch specific stuff
-  mkdir -p $pkgdir/etc
-  case $CARCH in
-i686)
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-  mycarch=i686
-  mychost=i686-pc-linux-gnu
-  myflags=-march=i686 
-  ;;
-x86_64)
-  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-  mycarch=x86_64
-  mychost=x86_64-unknown-linux-gnu
-

[arch-commits] Commit in pacman/repos (12 files)

2012-01-02 Thread Dave Reisner 
Date: Monday, January 2, 2012 @ 14:34:07
  Author: dreisner
Revision: 145833

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pacman/repos/staging-i686/
  pacman/repos/staging-i686/PKGBUILD
(from rev 145832, pacman/trunk/PKGBUILD)
  pacman/repos/staging-i686/makepkg.conf
(from rev 145832, pacman/trunk/makepkg.conf)
  pacman/repos/staging-i686/pacman.conf
(from rev 145832, pacman/trunk/pacman.conf)
  pacman/repos/staging-i686/pacman.conf.x86_64
(from rev 145832, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/staging-i686/pacman.install
(from rev 145832, pacman/trunk/pacman.install)
  pacman/repos/staging-x86_64/
  pacman/repos/staging-x86_64/PKGBUILD
(from rev 145832, pacman/trunk/PKGBUILD)
  pacman/repos/staging-x86_64/makepkg.conf
(from rev 145832, pacman/trunk/makepkg.conf)
  pacman/repos/staging-x86_64/pacman.conf
(from rev 145832, pacman/trunk/pacman.conf)
  pacman/repos/staging-x86_64/pacman.conf.x86_64
(from rev 145832, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/staging-x86_64/pacman.install
(from rev 145832, pacman/trunk/pacman.install)

---+
 staging-i686/PKGBUILD |   72 +
 staging-i686/makepkg.conf |  121 
 staging-i686/pacman.conf  |   94 +++
 staging-i686/pacman.conf.x86_64   |  103 ++
 staging-i686/pacman.install   |   73 +
 staging-x86_64/PKGBUILD   |   72 +
 staging-x86_64/makepkg.conf   |  121 
 staging-x86_64/pacman.conf|   94 +++
 staging-x86_64/pacman.conf.x86_64 |  103 ++
 staging-x86_64/pacman.install |   73 +
 10 files changed, 926 insertions(+)

Copied: pacman/repos/staging-i686/PKGBUILD (from rev 145832, 
pacman/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-02 19:34:07 UTC (rev 145833)
@@ -0,0 +1,72 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.1
+pkgrel=2
+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' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('76bd88eff8cd94bc9899faa091822dc1'
+ '4ebee5e1da37a6afdf06c1bc55efbf92'
+ '3e3342bd4abda20bb758595c1cbfb014'
+ 'db051afbd12993b7743ccd4d58668499')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686 
+  ;;
+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 
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}

Copied: pacman/repos/staging-i686/makepkg.conf (from rev 145832, 
pacman/trunk/makepkg.conf)
===
--- staging-i686/makepkg.conf   (rev 0)
+++ staging-i686/makepkg.conf   2012-01-02 19:34:07 UTC (rev 145833)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION
+#
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'

[arch-commits] Commit in pacman/repos (12 files)

2011-10-13 Thread Dan McGee 
Date: Thursday, October 13, 2011 @ 13:54:15
  Author: dan
Revision: 140414

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pacman/repos/testing-i686/
  pacman/repos/testing-i686/PKGBUILD
(from rev 140413, pacman/trunk/PKGBUILD)
  pacman/repos/testing-i686/makepkg.conf
(from rev 140413, pacman/trunk/makepkg.conf)
  pacman/repos/testing-i686/pacman.conf
(from rev 140413, pacman/trunk/pacman.conf)
  pacman/repos/testing-i686/pacman.conf.x86_64
(from rev 140413, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-i686/pacman.install
(from rev 140413, pacman/trunk/pacman.install)
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
(from rev 140413, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg.conf
(from rev 140413, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman.conf
(from rev 140413, pacman/trunk/pacman.conf)
  pacman/repos/testing-x86_64/pacman.conf.x86_64
(from rev 140413, pacman/trunk/pacman.conf.x86_64)
  pacman/repos/testing-x86_64/pacman.install
(from rev 140413, pacman/trunk/pacman.install)

---+
 testing-i686/PKGBUILD |   74 ++
 testing-i686/makepkg.conf |  121 
 testing-i686/pacman.conf  |   93 +++
 testing-i686/pacman.conf.x86_64   |  102 ++
 testing-i686/pacman.install   |   62 ++
 testing-x86_64/PKGBUILD   |   74 ++
 testing-x86_64/makepkg.conf   |  121 
 testing-x86_64/pacman.conf|   93 +++
 testing-x86_64/pacman.conf.x86_64 |  102 ++
 testing-x86_64/pacman.install |   62 ++
 10 files changed, 904 insertions(+)

Copied: pacman/repos/testing-i686/PKGBUILD (from rev 140413, 
pacman/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-13 17:54:15 UTC (rev 140414)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.0
+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' 'glibc=2.14' 'libarchive=2.8.4' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+optdepends=('fakeroot: for makepkg usage as normal user'
+'curl: for rankmirrors usage')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('8c97f4804d2a0847956c45888b0ea517'
+ 'ae4abf6df12483d26b39529ab27c0837'
+ '99d8fae7a3c761e3ebad800f6a216e83'
+ 'db051afbd12993b7743ccd4d58668499')
+
+# keep an upgrade path for older installations
+PKGEXT='.pkg.tar.gz'
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # install Arch specific stuff
+  mkdir -p $pkgdir/etc
+  case $CARCH in
+i686)
+  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+  mycarch=i686
+  mychost=i686-pc-linux-gnu
+  myflags=-march=i686 
+  ;;
+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 
+  ;;
+  esac
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # 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|@CARCHFLAGS[@]|$myflags|g
+
+  # install completion files
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
+  mkdir -p $pkgdir/usr/share/zsh/site-functions/
+  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
+}
+
+# vim: set ts=2 sw=2 et:

Copied: pacman/repos/testing-i686/makepkg.conf (from rev 140413, 
pacman/trunk/makepkg.conf)
===
--- testing-i686/makepkg.conf   (rev 0)
+++ testing-i686/makepkg.conf   2011-10-13 17:54:15 UTC (rev 140414)
@@ -0,0 +1,121 @@
+#
+# /etc/makepkg.conf
+#
+
+#
+# SOURCE ACQUISITION
+#
+#
+#-- The download utilities that makepkg should use to acquire