Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

15 files changed, 100 insertions, 133 deletions

diff --git a/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
deleted file mode 120000
index ea3e7b047..000000000
--- a/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch b/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
deleted file mode 120000
index 9efbca3c0..000000000
--- a/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/0002-Check-empty-subdirectory-ownership.patch
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/PKGBUILD b/java/pacman-makepkg-git/PKGBUILD
deleted file mode 100644
index 0c72f03e9..000000000
--- a/java/pacman-makepkg-git/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dave@archlinux.org>
-
-_pkgname=pacman
-pkgname=$_pkgname-makepkg-git
-_relver=4.0.3
-_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
-pkgver=${_relver}.git
-
-provides=($_pkgname=$pkgver)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-
-pkgrel=1
-
-pkgdesc="A library-based package manager with dependency support (with makepkg from git)"
-arch=('i686' 'x86_64' 'mips64el')
-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' 'parabola-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-$_relver.tar.gz{,.sig}
-        https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz
-        0001-Add-conflict-for-replacing-owned-empty-directory.patch
-        0002-Check-empty-subdirectory-ownership.patch
-        pacman.conf
-        pacman.conf.x86_64
-        pacman.conf.mips64el
-        makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
-         '1a70392526c8768470da678b31905a6e'
-         '4013517cf9016c920b525611bd63d6dc'
-         '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1'
-         '080d9f76f56e135cc62205874636aa0f'
-         'ce9943fc8086d491890565e91ea1a0d8'
-         'eb8dba9bd0b315230fbf0e5dc0a7335b'
-         'debc512689a1aa8c124fe0ccf27f5758')
-
-build() {
-  cd $srcdir/$_pkgname-$_relver
-
-  patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
-  patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc
-  make
-
-  cd $srcdir/$_pkgname-$_gitver
-
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc
-  make
-}
-
-check() {
-  make -C "$_pkgname-$_relver" check
-  make -C "$_pkgname-$_gitver" check
-}
-
-package() {
-  cd $srcdir/$_pkgname-$_relver
-  make DESTDIR=$pkgdir install
-  install $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg
-
-  # 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 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
-      ;;
-    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 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
-      ;;
-    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 -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
-      ;;
-  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|@LDFLAGS[@]|$myldflags|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
-}
diff --git a/java/pacman-makepkg-git/PKGBUILD.orig b/java/pacman-makepkg-git/PKGBUILD.orig
deleted file mode 120000
index 448b40973..000000000
--- a/java/pacman-makepkg-git/PKGBUILD.orig
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/PKGBUILD
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/makepkg.conf b/java/pacman-makepkg-git/makepkg.conf
deleted file mode 120000
index 2d1108635..000000000
--- a/java/pacman-makepkg-git/makepkg.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/makepkg.conf
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf b/java/pacman-makepkg-git/pacman.conf
deleted file mode 120000
index c75a6eed0..000000000
--- a/java/pacman-makepkg-git/pacman.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.mips64el b/java/pacman-makepkg-git/pacman.conf.mips64el
deleted file mode 120000
index 01fb857d8..000000000
--- a/java/pacman-makepkg-git/pacman.conf.mips64el
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf.mips64el
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.x86_64 b/java/pacman-makepkg-git/pacman.conf.x86_64
deleted file mode 120000
index 1be1966fd..000000000
--- a/java/pacman-makepkg-git/pacman.conf.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf.x86_64
\ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.install b/java/pacman-makepkg-git/pacman.install
deleted file mode 120000
index 0b1fee98c..000000000
--- a/java/pacman-makepkg-git/pacman.install
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.install
\ No newline at end of file
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
new file mode 100644
index 000000000..d48b9015b
--- /dev/null
+++ b/libre/chroottools/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=chroottools
+pkgver=20121128.1
+pkgdesc='Chroot tools for Arch and Parabola package maintainers'
+url='http://projects.parabolagnulinux.org/packages/chroottools.git/'
+license=('GPL')
+
+replaces=(devtools)
+provides=(devtools)
+conflicts=(devtools)
+
+pkgrel=1
+arch=('any')
+depends=(
+	'arch-install-scripts' # for pacstrap, used to make chroots
+	'curl'
+	'namcap' # to check packages made by makechrootpkg
+)
+source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar")
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make PREFIX=/usr
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make PREFIX=/usr DESTDIR=${pkgdir} install
+}
+
+md5sums=('8f9b36b50466a278e02e29f0ca06d267')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index bd1d8e59f..9217b4d02 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,15 +4,16 @@
 
 pkgbase=libretools
 pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20121113
-pkgdesc="Scripts for Parabola development"
+pkgver=20121128
+pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/libretools.git/"
 license=('GPL3+')
 
 pkgrel=1
 arch=('any')
-depends=(openssh rsync git wget devtools tokyocabinet)
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2)
+groups=(base-devel)
+depends=(openssh rsync git wget chroottools tokyocabinet)
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -44,4 +45,4 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('966fb9828f55f58e2aa974065e726621')
+md5sums=('4c730066c2152f929ca63424019b165a')
diff --git a/libre/makepkg-git/PKGBUILD b/libre/makepkg-git/PKGBUILD
new file mode 100644
index 000000000..60453a927
--- /dev/null
+++ b/libre/makepkg-git/PKGBUILD
@@ -0,0 +1,49 @@
+# vim: set ts=2 sw=2 et:
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Dan McGee <dan@archlinux.org>
+# Maintainer (Arch): Dave Reisner <dave@archlinux.org>
+
+_pkgname=pacman
+pkgname=makepkg-git
+_relver=4.0.3
+_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
+pkgver=${_relver}.git
+
+provides=($_pkgname=$pkgver)
+replaces=(pacman-makepkg-git)
+conflicts=(pacman-makepkg-git)
+
+pkgrel=2
+
+pkgdesc="Pacman's makepkg, built from git sources"
+#arch=('i686' 'x86_64' 'mips64el')
+arch=('any')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+#groups=('base')
+depends=('bash' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+#backup=(etc/pacman.conf etc/makepkg.conf)
+#install=pacman.install
+options=(!libtool)
+source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar)
+md5sums=('2152bdff59dcab8e7d36103a4756e5bf')
+
+build() {
+  cd $srcdir/$_pkgname-$_gitver
+
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var
+  make
+}
+
+check() {
+  make -C "$_pkgname-$_gitver" check
+}
+
+package() {
+  install -Dm755 $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg-git
+}
diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/~lukeshu/emacs-lucid/PKGBUILD
index 45489c1b3..ebc49645d 100755
--- a/~lukeshu/emacs-lucid/PKGBUILD
+++ b/~lukeshu/emacs-lucid/PKGBUILD
@@ -1,5 +1,5 @@
 # $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org>
 # Contributor (Arch): Renchi Raju <renchi@green.tam.uiuc.edu>
 
@@ -15,7 +15,7 @@ conflicts=("$_pkgname")
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
 source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig})
 md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
diff --git a/~lukeshu/emacs-lucid/librenamcap b/~lukeshu/emacs-lucid/librenamcap
new file mode 100644
index 000000000..a42ac9e22
--- /dev/null
+++ b/~lukeshu/emacs-lucid/librenamcap
@@ -0,0 +1,8 @@
+emacs-lucid E: incorrect-owner var/games (root:games)
+emacs-lucid E: incorrect-owner var/games/emacs (root:games)
+emacs-lucid E: incorrect-owner var/games/emacs/snake-scores (root:games)
+emacs-lucid E: incorrect-owner var/games/emacs/tetris-scores (root:games)
+emacs-lucid W: file-in-non-standard-dir var/games/
+emacs-lucid W: file-in-non-standard-dir var/games/emacs/
+emacs-lucid W: file-in-non-standard-dir var/games/emacs/snake-scores
+emacs-lucid W: file-in-non-standard-dir var/games/emacs/tetris-scores
diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD
index e2e053f11..0a8fda0ea 100644
--- a/~lukeshu/xcalib/PKGBUILD
+++ b/~lukeshu/xcalib/PKGBUILD
@@ -1,5 +1,6 @@
-# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
-# adpoted from mOLOk since pkgver=0.7
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor (AUR): Frank Ickstadt <frank.ickstadt@gmail.com>
+# Contributor (AUR): mOLOk
 
 pkgname=xcalib
 pkgver=0.8