7 files changed, 21 insertions, 338 deletions
diff --git a/dev-lang/parrot/ChangeLog b/dev-lang/parrot/ChangeLog
index 4669f34f0fba..312d57fbf2ff 100644
--- a/dev-lang/parrot/ChangeLog
+++ b/dev-lang/parrot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/parrot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.50 2012/02/16 06:44:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.51 2012/03/08 04:18:42 patrick Exp $
+
+*parrot-4.1.0 (08 Mar 2012)
+
+  08 Mar 2012; Patrick Lauer <patrick@gentoo.org> +parrot-4.1.0.ebuild,
+  -parrot-2.11.0.ebuild, -parrot-3.11.0-r1.ebuild, -parrot-3.3.0.ebuild,
+  -parrot-3.6.0.ebuild, -parrot-3.9.0.ebuild:
+  Bump, remove old, partial fix for #404195
 
 *parrot-4.0.0 (16 Feb 2012)
 
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index df3deea7baca..1b94e6691b98 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,14 +1,6 @@
-DIST parrot-2.11.0.tar.bz2 3155738 RMD160 22d1dccbbcb71788f6e9a6fe69c31a5b5e1276cc SHA1 a17aa732cdf8a76209d6521b5be6feee832c6f13 SHA256 7f3e80f76426235d104779dc7bf24c79dcd1fc419acfafbeee00c61daf210e1f
-DIST parrot-3.11.0.tar.bz2 4303200 RMD160 01674c4f6d3ab0bca5761db5a33049548e2e69d4 SHA1 22d0bd277c956167eb0b8e6a41c211541ba0733e SHA256 e493df95484be7958f3e82637dbadc7ec9a632ed12bcdd0c1d8fff1e249f1f10
-DIST parrot-3.3.0.tar.bz2 3251469 RMD160 c205453cc03d6cb28d68c8b1c2c4f3d27a57fa84 SHA1 29c1ecb21afde110088d52e0c472508ca3d83f82 SHA256 8f474d44a0137a3fd5296c019dbccc6ae64193ff12ce799babc362567115c1ad
-DIST parrot-3.6.0.tar.bz2 3302266 RMD160 fff2ba9cc243e36f270338700cfc44e8ab622941 SHA1 82f5cc7115dc654c7452672b059355b7d3b5a78b SHA256 a6ae5c4a1af3602043d1139a12ae9d4dfe2dd000250b1a76fc339bf4a004f8c7
-DIST parrot-3.9.0.tar.bz2 4305319 RMD160 ddbbac73350e314b108f4062631bc2bedbfe7ec3 SHA1 1f6328eea6e63be2d903e0bc8eb45391d77254b5 SHA256 923b5ef403c26dd94c04127940659aea94516f79243a80de65fbababff44bfad
 DIST parrot-4.0.0.tar.bz2 4304293 RMD160 1c7693e0027c99efba7de2b91504db605053b844 SHA1 12c7bd48b5df4217547e8f913d989a7beafe6bd7 SHA256 a1e0bc3de509b247b2cea4863cc202cdceeaa329729416115d3c20a162a0dd88
-EBUILD parrot-2.11.0.ebuild 2329 RMD160 04ab3d75016dbf70d008eba2fdb1eba5ff390b80 SHA1 67fb16ee72381845f9c23779605dd0400fee4789 SHA256 5aefc17cfac98104482e0606f14231de5523f17d905f37bddff00c16fe62e5c6
-EBUILD parrot-3.11.0-r1.ebuild 2373 RMD160 8f26bfeb5478f44371ea1f0326fbb2753d568668 SHA1 1aeb3ba04bbd9cd024f3aa75b8522a7e012fe6ca SHA256 0f439ee725e183365f5627a7397d41265c8a2dbda93e03730c4ef0d155a43ce8
-EBUILD parrot-3.3.0.ebuild 2395 RMD160 57d38573d5fbdabf59e70ecd5f9c17a10a0354f9 SHA1 62ed4ce9edb2a21d67e292fba017a10efdca2bab SHA256 adf83f7728f3a87c45357c3a70711a39158f4290f09367b4144368954064510a
-EBUILD parrot-3.6.0.ebuild 2581 RMD160 8a0c7b84a2a9b29d936cbdf3c6cab091e8aa17b3 SHA1 4557bec8f33585fa115dae2f4e4352e3738f4d5b SHA256 bb677b450d8974ca01b51481adbd8f5fcdd27ec0ad376e03f5ea9f5d234ab35a
-EBUILD parrot-3.9.0.ebuild 2418 RMD160 f6a6ce08771a8201ec5d143b5e802a545d8be604 SHA1 49c2496c5976fdd5bb247754152b601df176f4eb SHA256 5c5c04c28626d1246b137fe044ec43db28c27a08af7b646ff1e5ce1a7a33ee9c
+DIST parrot-4.1.0.tar.bz2 4302808 RMD160 a0cf550967a37f2273212ed8b401b24ce70329e4 SHA1 32e7bf38d307bc90d6fcf26f1016228bbee307d3 SHA256 826465f3b7045cf81768029b1f18a4fa05259b7268c98c9c0436bd77c74785ec
 EBUILD parrot-4.0.0.ebuild 2418 RMD160 3b0b0938a6686ac76ceadfeaea146e4189899635 SHA1 b2dd21df3325618312bbbf860175999abef30e66 SHA256 cbedff25fe294d4083864e2483755050f52fe5eaf266693048cd0562de527ad0
-MISC ChangeLog 7297 RMD160 427cb36b5bc8455b2c56b720aba8414f5560b084 SHA1 6114225fc37b20318810eaccd6178ffe6fa66007 SHA256 f94a97c4660546cfd0fae6f07e070ebfb2dfc9be052aadbf6b1a21ccd1418321
+EBUILD parrot-4.1.0.ebuild 2578 RMD160 ef8454e75a61440717d3e5f7d5b2b9a644f45054 SHA1 b9b087d3960e7662e32357f90b9e46d1ed1e7292 SHA256 4cfa6d727fb7f0297572b549d76551883c9df8b024c552e8f34e5174b32176c3
+MISC ChangeLog 7562 RMD160 e6c6ca3b7f0e98294f06c6f3cf16342ecbf50d92 SHA1 2a070322ccc97504f694937d85773f3af3edd22e SHA256 e352f59e7212b4e764af51e9498619426a0f934dd44806c3d567c5bf94520e5e
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
diff --git a/dev-lang/parrot/parrot-2.11.0.ebuild b/dev-lang/parrot/parrot-2.11.0.ebuild
deleted file mode 100644
index ed853edc4a38..000000000000
--- a/dev-lang/parrot/parrot-2.11.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.11.0.ebuild,v 1.3 2011/03/26 09:39:08 grobian Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		--pkgconfigdir=pkgconfig \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-3.3.0.ebuild b/dev-lang/parrot/parrot-3.3.0.ebuild
deleted file mode 100644
index 2578d35728e8..000000000000
--- a/dev-lang/parrot/parrot-3.3.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.3.0.ebuild,v 1.1 2011/05/05 14:00:26 patrick Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-#SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/supported/${PV}/${P}.tar.bz2"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/stable/${PV}/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		--pkgconfigdir=pkgconfig \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-3.6.0.ebuild b/dev-lang/parrot/parrot-3.6.0.ebuild
deleted file mode 100644
index 1bb6f2dd30f7..000000000000
--- a/dev-lang/parrot/parrot-3.6.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.6.0.ebuild,v 1.2 2011/08/29 17:32:25 grobian Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-#SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/supported/${PV}/${P}.tar.bz2"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/stable/${PV}/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_prepare() {
-	# skip fink and macports detection, Gentoo Prefix is much better
-	sed -i -e '/_probe_for_libraries(/d' config/init/hints/darwin.pm || die
-}
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-3.9.0.ebuild b/dev-lang/parrot/parrot-3.9.0.ebuild
deleted file mode 100644
index d9eab6767850..000000000000
--- a/dev-lang/parrot/parrot-3.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.9.0.ebuild,v 1.1 2011/10/22 18:34:28 patrick Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-#SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/supported/${PV}/${P}.tar.bz2"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/stable/${PV}/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-3.11.0-r1.ebuild b/dev-lang/parrot/parrot-4.1.0.ebuild
index 46323ccaacbf..bdcf5dada6a4 100644
--- a/dev-lang/parrot/parrot-3.11.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-4.1.0.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.11.0-r1.ebuild,v 1.1 2011/12/27 06:42:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-4.1.0.ebuild,v 1.1 2012/03/08 04:18:42 patrick Exp $
 
-EAPI=4
+EAPI=3
+
+# There's multiple small issues at the moment, so ...
+RESTRICT="test"
 
 inherit eutils multilib
 
@@ -27,7 +30,10 @@ RDEPEND="sys-libs/readline
 DEPEND="dev-lang/perl[doc?]
 	${RDEPEND}"
 
-REQUIRED_USE="opengl? ( pcre )"
+src_prepare() {
+	# Fix for #404195 - pcre detection is wonky
+	sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location"
+}
 
 src_configure() {
 	myconf="--disable-rpath"