Use system libbz2 and libz

(Portage version: 2.2_rc40/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 43 insertions, 32 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index ef596987e..86f1d3837 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Aug 2009; Torsten Veller <tove@gentoo.org> perl-5.10.1-r11.ebuild:
+  Use system libbz2 and libz
+
   25 Aug 2009; Torsten Veller <tove@gentoo.org> -perl-5.8.8-r10.ebuild,
   -perl-5.10.0.ebuild, -perl-5.10.0-r1.ebuild, -perl-5.10.0-r2.ebuild,
   -perl-5.10.0-r10.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 74ee352f4..567b01ed1 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST perl-5.10.1-2.tar.bz2 3308 RMD160 eced6d2ddd67a577f85f3f69093a643f4a9a4701 SHA1 7c386212b823428bc704753416bb2ca7e8373504 SHA256 bd3a0299e4a386c95cd685c251fc93cdc1272a557465c777d35ce64823cad19d
 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
-EBUILD perl-5.10.1-r11.ebuild 16329 RMD160 a0285adc022ab55f6e6143d17afbe5bbf134d409 SHA1 2db2f09903d8fa520ebb281d9d192db126c14f4a SHA256 d67d0a10f23e9d1d9a7be95e3a748dc57e770ca3ec8734c5612e6f695306af1b
-MISC ChangeLog 1366 RMD160 73931d7365f7841df3368bcdc3044990a10f6ded SHA1 58f3d6cf6db1424e5c60ced22e960e2e05a89a41 SHA256 d5c46278dbed4c3a21b2c784e08f538436cb16cd2fed1a782d3748497a41dee8
+EBUILD perl-5.10.1-r11.ebuild 16094 RMD160 462811afe58c3ca7e2ac514a70021c2411a8bec8 SHA1 76ad90160fc70ccef14d6d3969bf245c23c107f7 SHA256 3b4896e03ea2befaec9a2198249cba0e0d41e14c5bb274b33e902b8f1395ca91
+MISC ChangeLog 1468 RMD160 067327f831f21833b03cce94289aadad5b74b02c SHA1 4b83e4a1e4d5ddbd3108a7a2dfa17e95779eaf1a SHA256 a824cac7bf0d8b7aaea586515b793dfe1710027b8faa3ea53bf6be99d7023f5e
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqUF4gACgkQV3J2n04Eauz67ACdE/cRQKqS2ns7ivA5dQAayxqC
++uoAn3B35FQjao8q9EhzFtJQ+oyP0JwI
+=sxX1
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/perl-5.10.1-r11.ebuild b/dev-lang/perl/perl-5.10.1-r11.ebuild
index 33596850f..6a50b1be0 100644
--- a/dev-lang/perl/perl-5.10.1-r11.ebuild
+++ b/dev-lang/perl/perl-5.10.1-r11.ebuild
@@ -8,36 +8,33 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib
 
 PATCH_VER=2
 
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-IUSE="berkdb debug gdbm ithreads"
-IUSE="${IUSE} doc build"
-COMMON_DEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-SLOT="0"
-
-DEPEND="${COMMON_DEPEND}
-	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )
-	!<perl-core/File-Spec-0.87
-	!<perl-core/Test-Simple-0.47-r1"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND=">=app-admin/perl-cleaner-1.03"
+PERL_OLDVERSEN="5.10.0"
 
 SHORT_PV="${PV%.*}"
 MY_P="perl-${PV/_rc/-RC}"
 MY_PV="${PV%_rc*}"
+
 DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
 S="${WORKDIR}/${MY_P}"
 SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2
 	http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
 KEYWORDS=""
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-PERL_OLDVERSEN="5.10.0"
+IUSE="berkdb build debug doc gdbm ithreads"
+
+COMMON_DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${COMMON_DEPEND}
+	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND=">=app-admin/perl-cleaner-1.03"
 
 dual_scripts() {
 	# - perl-core/Archive-Tar
@@ -102,7 +99,7 @@ src_configure() {
 	# This flag makes compiling crash in interesting ways
 	filter-flags "-malign-double"
 	# Fixes bug #97645
-	use ppc && filter-flags -mpowerpc-gpopt
+	use ppc && filter-flags "-mpowerpc-gpopt"
 	# Fixes bug #143895 on gcc-4.1.1
 	filter-flags "-fsched2-use-superblocks"
 
@@ -115,6 +112,19 @@ src_configure() {
 
 	export LC_ALL="C"
 
+	# 266337
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=/usr/include
+	export BZIP2_LIB=/usr/$(get_libdir)
+	cat <<-EOF > "${S}/ext/Compress-Raw-Zlib/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = /usr/include
+		LIB = /usr/{get_libdir}
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+
 	case ${CHOST} in
 		*-freebsd*)   osname="freebsd" ;;
 		*-dragonfly*) osname="dragonfly" ;;
@@ -206,19 +216,8 @@ src_test() {
 
 src_install() {
 	export LC_ALL="C"
-	src_install_perl
-}
-
-src_install_perl() {
 	local i
-
-#	# Need to do this, else apps do not link to dynamic version of
-#	# the library ...
 	local coredir="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}/CORE"
-#	dodir ${coredir}
-#	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-#	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
-#	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
 
 	# Fix for "stupid" modules and programs
 	dodir /usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}
@@ -230,7 +229,6 @@ src_install_perl() {
 	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
 
 	rm "${D}"/usr/bin/perl
-	#TODO: eselect?
 	ln -s perl${MY_PV} "${D}"/usr/bin/perl
 
 	dolib.so "${D}"/${coredir}/${LIBPERL} || die