Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

1 files changed, 18 insertions, 21 deletions

diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index b6a2e92e3..909f7daf3 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 67927 2012-03-16 10:14:41Z spupykin $
+# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.1.0
+pkgver=4.2.0
 #_rel=stable
 _rel=devel
-pkgrel=2
+pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.parrotcode.org/"
 license=('GPL')
-depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi')
+depends=('icu' 'openssl' 'libffi')
 makedepends=('perl-json')
 optdepends=('freeglut')
-options=(!emptydirs !makeflags)
-source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/parrot-$pkgver.tar.gz")
-md5sums=('23c37c82aeac2d5bf9fd00a7873dab0d')
+options=(!makeflags)
+source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -24,29 +24,26 @@ build() {
   sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm
   sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm
 
-  [ $NOEXTRACT -eq 1 ] || perl Configure.pl --prefix=/usr --parrot_is_shared
+  perl Configure.pl --prefix=/usr \
+    --parrot_is_shared \
+    --disable-rpath
 
   find -type f -name Makefile | while read F; do
     grep "$srcdir" $F  && sed -i \
-      "s#-Wl,-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true
+      "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
     grep "$srcdir" $F  && sed -i \
-      "s#-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true
+      "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F
   done
+
+  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
+  make all parrot_utils docs html
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  OLD_LIB_PATH=$LD_LIBRARY_PATH
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srcdir/parrot-$pkgver/blib/lib
-  make -j1 all parrot_utils docs html RPATH_BLIB=
-
-  export LD_LIBRARY_PATH=`pwd`/blib/lib
-  make -j1 DESTDIR="$pkgdir" install-dev
+  make DESTDIR="$pkgdir" install-dev
 
-  sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm
-
-  export LD_LIBRARY_PATH=$OLD_LIB_PATH
+  sed -i "s#$srcdir#/usr/src#" \
+    $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm
 }
-
-# vim:set ts=2 sw=2 et: