fix memory exhaustion on compile - bug #192768. Fix bad defines bug #192676 thanks Alin N?stac. added get_libdir and warning thanks Donnie. removed ace-5.5.8 because it was old.

Package-Manager: portage-2.1.3.9

6 files changed, 43 insertions, 118 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 511a1979580e..7a6bbd3c8533 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/ace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.51 2007/10/07 19:52:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.52 2007/10/08 09:06:40 dragonheart Exp $
+
+  08 Oct 2007; Daniel Black <dragonheart@gentoo.org> ace-5.5-r1.ebuild,
+  -ace-5.5.8.ebuild, ace-5.6.1.ebuild:
+  fix memory exhaustion on compile - bug #192768. Fix bad defines bug #192676
+  thanks Alin N?stac. added get_libdir and warning thanks Donnie. removed
+  ace-5.5.8 because it was old.
 
 *ace-5.6.1 (07 Oct 2007)
 
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 251f295246cf..d111bc4bd047 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,34 +1,27 @@
-DIST ACE+TAO+CIAO-5.5.8.tar.bz2 23766813 RMD160 4a6af82c4293a27bbaaae89f43c82e71eff88bc9 SHA1 d4f9707d71ea1ba2de96be503e2b4660855d737a SHA256 1c8f4e7a078f1b1277068d6c6dd28f7c7a5ed5cb5735a1cdb706f4c8b80db1c1
 DIST ACE+TAO+CIAO-5.5.9.tar.bz2 23834445 RMD160 fe5902de224c57255151c79d430c487f53ca854e SHA1 d6d11c920c43b1f26b5596017a39532a44ded077 SHA256 68316a33d7cc0f976b2184cdda09fe40386c782b2bb8c5b629ec2dc574d813e3
 DIST ACE+TAO+CIAO-5.6.1.tar.bz2 24590534 RMD160 2ab740d3efd3b0b804ccec9c5af4ac8762afc237 SHA1 3b1ed3e4b5f8b52041af78a3179396ff9dd907c0 SHA256 3c8b70de975189abbdd0f27dec98b14b11d972185763aa3720ef1fe444c437b5
-DIST ACE+TAO-5.5.8.tar.bz2 22295160 RMD160 64165755e4391e1146759c4d976cfe1dd7fe7f99 SHA1 cdb2654cbd5548f53665e82afd041528e72a1fe0 SHA256 2f9e186cedfb22d083d6de163b2f34a461b6c9ce8f2df2cabc87232428cf139d
 DIST ACE+TAO-5.5.9.tar.bz2 22460141 RMD160 92aa0c465fb8a64f4924e82f19d9e219bc94bd1f SHA1 e94ffc31a6ea253998fbb669794ee3ab4ed3a1d7 SHA256 dd73ca2c3b8297a589613f1a2c0a5e88e0226c0d7657f2a62fe06ffc88557ce0
 DIST ACE+TAO-5.6.1.tar.bz2 20388344 RMD160 ced8ec06cea29fe72bd386c8d302b8f0813bbebe SHA1 7988a95e59e32077196abc7e46338511646faade SHA256 b64257b0478949065385943915e26a49641f1fb1ca9d8f5dbf823545a916d0b6
 DIST ACE-5.5+TAO-1.5.tar.bz2 19518497 RMD160 a11421585630071a24d9c1f6ba2d4bdd81b25e9b SHA1 b4fc49e8fc9e3fea96d308971ebfe17a124f061e SHA256 48bac6620ceda1801cdaa9751a6b0b01be960fd34607897fb823adfe5114797d
-DIST ACE-5.5.8.tar.bz2 8065238 RMD160 75b328869a691d8a1b1d3d13ed80c42e94089323 SHA1 992d934fad2367f41a7fa148625faf985ef22c02 SHA256 009fa7348fc3e6a2230836ef20b1ab47a04c2bda57aed14a8d47b3f4f544eb18
 DIST ACE-5.5.9.tar.bz2 8061560 RMD160 0ec944030329e965e1d101f16fd1833613b520b6 SHA1 8db9bb554044e01a57b2557d5f47e4d53eb3b00d SHA256 f12b6b43eae90f6f50c3f55129e50ad896138341fcb9eade9260965a24a6b23b
 DIST ACE-5.5.tar.bz2 7595626 RMD160 300763ae9e46975ec35fb0cbe0d9b1959058c2dc SHA1 4b80d60e56b4469ddfcb109a4ee973d0316c44ba SHA256 174f665d96edd8af2b38123e0c94039f8f429ecee99d9cb761afde1a082f5ddd
 DIST ACE-5.6.1.tar.bz2 7907583 RMD160 644c6f58a33b9458b2eafe92578287a9d89cfc96 SHA1 ca788beab7074d179036e51ccd513dde53bfe2d6 SHA256 211a2448de16b0425b2d53ab6609829976b9cd55406699e97f863b6e9ff1f345
-EBUILD ace-5.5-r1.ebuild 1742 RMD160 73195de8f2413877199611adcc05472458fadcf1 SHA1 c16ae6cc37a16b3354a861e4b90aacf9336dc252 SHA256 1cf05da8126679b1fc08c8bd4406dfc3eb6d111489700c84c745c08b6de96d9c
-MD5 1e2b22a18b5b0886f386662dca6c2d97 ace-5.5-r1.ebuild 1742
-RMD160 73195de8f2413877199611adcc05472458fadcf1 ace-5.5-r1.ebuild 1742
-SHA256 1cf05da8126679b1fc08c8bd4406dfc3eb6d111489700c84c745c08b6de96d9c ace-5.5-r1.ebuild 1742
-EBUILD ace-5.5.8.ebuild 2130 RMD160 12ad9fa8bcf0f9306eb75c8679336daa0106410e SHA1 8fd2df84ad84231ab1faf8aa8d33513666f757fe SHA256 48e6f6e9d23d966e30a9023893d7ef267046d7f429052c5312fcea2152158632
-MD5 3708745b34c33ff21bd4a5628cff1b2c ace-5.5.8.ebuild 2130
-RMD160 12ad9fa8bcf0f9306eb75c8679336daa0106410e ace-5.5.8.ebuild 2130
-SHA256 48e6f6e9d23d966e30a9023893d7ef267046d7f429052c5312fcea2152158632 ace-5.5.8.ebuild 2130
+EBUILD ace-5.5-r1.ebuild 2150 RMD160 9ca2c2d7e557cee579110592084a46c95c65f375 SHA1 3a4ddb742147c0ece5afb405ae678fcfcb5929ee SHA256 4f15051aa5d8423172b3ba80e8ccd6cd8a29a62c83ed1317b118b1a78a03430c
+MD5 5d66dd7884989d18c47805ca16c435bb ace-5.5-r1.ebuild 2150
+RMD160 9ca2c2d7e557cee579110592084a46c95c65f375 ace-5.5-r1.ebuild 2150
+SHA256 4f15051aa5d8423172b3ba80e8ccd6cd8a29a62c83ed1317b118b1a78a03430c ace-5.5-r1.ebuild 2150
 EBUILD ace-5.5.9.ebuild 2130 RMD160 de47db441ad9b8dd38be8c870c44e58f7e84154c SHA1 33bf609f0019d541ff69ce7465fc37a28a61121b SHA256 ab776760c8ee5738c8abaa6a16be8ae0fee92cba6c8c4f38e5095589a8453ff2
 MD5 9bf82b0404d5118462851a10af249439 ace-5.5.9.ebuild 2130
 RMD160 de47db441ad9b8dd38be8c870c44e58f7e84154c ace-5.5.9.ebuild 2130
 SHA256 ab776760c8ee5738c8abaa6a16be8ae0fee92cba6c8c4f38e5095589a8453ff2 ace-5.5.9.ebuild 2130
-EBUILD ace-5.6.1.ebuild 2135 RMD160 144da5168e05dc8c7302470965afdf4adcfc50e0 SHA1 99c65e8aebc7824ee3e72f25a2307db0d504f366 SHA256 3169e6eadd2b0ab8b52d7355d9386c9e03a0193d4999d9cc71f15738f5e53196
-MD5 435b358f18f598d477f1edbf71d3bf31 ace-5.6.1.ebuild 2135
-RMD160 144da5168e05dc8c7302470965afdf4adcfc50e0 ace-5.6.1.ebuild 2135
-SHA256 3169e6eadd2b0ab8b52d7355d9386c9e03a0193d4999d9cc71f15738f5e53196 ace-5.6.1.ebuild 2135
-MISC ChangeLog 6304 RMD160 7d5c7a4a7107f64dfc52b472031f1b27d3064d12 SHA1 c00540e5fb064cf8c8e2e2b8ec632027e456e6ba SHA256 cca0c82faba2d79edafc4513303d127d8aa581ebd01b0d1fde2df3fb2adf22ba
-MD5 50c93f51ec6199ad9550d4515e810c5a ChangeLog 6304
-RMD160 7d5c7a4a7107f64dfc52b472031f1b27d3064d12 ChangeLog 6304
-SHA256 cca0c82faba2d79edafc4513303d127d8aa581ebd01b0d1fde2df3fb2adf22ba ChangeLog 6304
+EBUILD ace-5.6.1.ebuild 2347 RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 SHA1 0362ca26400e689ae3395fb08ed874d865ff3324 SHA256 8fb602445dfb2a6c7381662646031d1a7bbcd948c71e581b09f30593d2464603
+MD5 3f0daf2f16c6d10731bb4d0dc3d80f0d ace-5.6.1.ebuild 2347
+RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 ace-5.6.1.ebuild 2347
+SHA256 8fb602445dfb2a6c7381662646031d1a7bbcd948c71e581b09f30593d2464603 ace-5.6.1.ebuild 2347
+MISC ChangeLog 6600 RMD160 def5cf1be02e74af25487075e7e91dcef78eafa0 SHA1 f069d84541911905003a0d0801c3ad0bc24bbb80 SHA256 083c2f6029f90b24bb185f24de71e8c4cee65ee79c824a9077a7aa879b6a53e4
+MD5 7ebe0b974a648178cac5254d6417891f ChangeLog 6600
+RMD160 def5cf1be02e74af25487075e7e91dcef78eafa0 ChangeLog 6600
+SHA256 083c2f6029f90b24bb185f24de71e8c4cee65ee79c824a9077a7aa879b6a53e4 ChangeLog 6600
 MISC metadata.xml 498 RMD160 9fa238ee9626dc5367cfea540e09ddab03e28987 SHA1 6624d6c6dceaee1f8ee7b43379201bd979fbd2e4 SHA256 328dbc3435f54440a3e41f68f89abbda2b6f819b06d6b6fe7cad4a79d1d513d6
 MD5 217e2c83ae11650476c0e06e4d4b9abc metadata.xml 498
 RMD160 9fa238ee9626dc5367cfea540e09ddab03e28987 metadata.xml 498
@@ -36,9 +29,6 @@ SHA256 328dbc3435f54440a3e41f68f89abbda2b6f819b06d6b6fe7cad4a79d1d513d6 metadata
 MD5 d648b62c7d54ea508a47f16e3dd7a984 files/digest-ace-5.5-r1 485
 RMD160 54cd31fb74f5b0e676d8db0cb520527942c783c6 files/digest-ace-5.5-r1 485
 SHA256 35803657dd6b74b7254d5c7f12df3be04f62ba73735b49759b4eccc36ff77ff0 files/digest-ace-5.5-r1 485
-MD5 d9d5df7990a49d7a49a34145d9c45b89 files/digest-ace-5.5.8 750
-RMD160 244cea05a78fd6709e5778293f4873a8ac02a993 files/digest-ace-5.5.8 750
-SHA256 66ee1b99d5b08519a69bf1fb2f22d67283bcd87757dfbe52824d43e8c4823335 files/digest-ace-5.5.8 750
 MD5 106e07d109c2c95848df0c257dfe82da files/digest-ace-5.5.9 750
 RMD160 2f07b6926813b180ab5b5cf5c4fd2712f22e7082 files/digest-ace-5.5.9 750
 SHA256 5eaa24785fc8c4dd1d6e1e628391fdeab437d431da7ed1e3c56b7870dbb5cf55 files/digest-ace-5.5.9 750
diff --git a/dev-libs/ace/ace-5.5-r1.ebuild b/dev-libs/ace/ace-5.5-r1.ebuild
index be4920aac260..4520b2672171 100644
--- a/dev-libs/ace/ace-5.5-r1.ebuild
+++ b/dev-libs/ace/ace-5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5-r1.ebuild,v 1.9 2007/07/22 08:33:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5-r1.ebuild,v 1.10 2007/10/08 09:06:40 dragonheart Exp $
 
 inherit eutils
 
@@ -28,7 +28,10 @@ src_compile() {
 	export ACE_ROOT="${S}"
 	mkdir build
 	cd build
-	ECONF_SOURCE="${S}"
+
+	export ace_cv_new_throws_bad_alloc_exception="yes"
+
+	ECONF_SOURCE=${S}
 	econf --enable-lib-all $(use_with X) $(use_enable ipv6) $(use_with tao) || \
 		die "econf died"
 	# --with-qos needs ACE_HAS_RAPI
@@ -36,14 +39,15 @@ src_compile() {
 }
 
 src_test() {
-	cd ${S}/build
-	make ACE_ROOT=${S} check || die "self test failed"
+	cd "${S}"/build
+	make ACE_ROOT="${S}" check || die "self test failed"
 	#einfo "src_test currently stalls after Process_Mutex_Test"
 }
 
 src_install() {
 	cd build
 	make ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install"
+	sed -i -e "^#define PACKAGE_.*//g" /usr/include/ace/config.h
 	# punt gperf stuff
 	rm -rf "${D}"/usr/bin/gperf "${D}"/usr/share
 }
@@ -54,8 +58,12 @@ pkg_postinst() {
 
 	local CC_MACHINE=`gcc -dumpmachine`
 	local CC_VERSION=`gcc -dumpversion`
-	if [ -d "/usr/lib/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace" ]; then
-		mv "/usr/lib/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace" \
-			"/usr/lib/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace.old"
+	if [ -d "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace" ]; then
+	ewarn "moving /usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace to"
+	ewarn "ace.old"
+	ewarn "This is required, as anything trying to compile against ACE will"
+	ewarn "have problems with conflicting OS.h files if this is not done."
+		mv "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace" \
+			"/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/${CC_VERSION}/include/ace.old"
 	fi
 }
diff --git a/dev-libs/ace/ace-5.5.8.ebuild b/dev-libs/ace/ace-5.5.8.ebuild
deleted file mode 100644
index bc812dfe4bfd..000000000000
--- a/dev-libs/ace/ace-5.5.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5.8.ebuild,v 1.5 2007/07/22 08:33:04 graaff Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Adaptive Communications Environment"
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
-SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 )
-	tao? (
-		!ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 )
-		ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-${PV}.tar.bz2 )
-	)"
-LICENSE="BSD as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="X ipv6 tao ciao"
-
-COMMON_DEPEND="dev-libs/openssl"
-# TODO probably more
-RDEPEND="${COMMON_DEPEND}
-	X? ( x11-libs/libXt x11-libs/libXaw )"
-
-DEPEND="${COMMON_DEPEND}
-	X? ( x11-proto/xproto )"
-
-S="${WORKDIR}/ACE_wrappers"
-
-src_compile() {
-	export ACE_ROOT="${S}"
-	mkdir build
-	cd build
-
-	# This disables a silly test which fills the memory
-	# waiting for a bad_alloc exception and happily
-	# leaking memory (bug #169647)
-	export ace_cv_new_throws_bad_alloc_exception="yes"
-
-	ECONF_SOURCE="${S}"
-	econf \
-		--enable-lib-all \
-		$(use_with X) \
-		$(use_enable ipv6) \
-		|| die "econf died"
-	# --with-qos needs ACE_HAS_RAPI
-	emake static_libs=1 || die "emake failed"
-}
-
-src_install() {
-	cd build
-	emake ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install"
-	insinto /usr/include/ace
-	doins "${S}/ace/OS.inl"
-	doins "${S}/ace/Select_Reactor.h"
-	# punt gperf stuff
-	rm -rf "${D}/usr/bin" "${D}/usr/share"
-}
-
-src_test() {
-	cd "${S}/build"
-	emake ACE_ROOT="${S}" check || die "self test failed"
-}
-
-pkg_postinst() {
-	# This is required, as anything trying to compile against ACE will have
-	# problems with conflicting OS.h files if this is not done.
-
-	local CC_MACHINE=$($(tc-getCC) -dumpmachine)
-	if [ -d "/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then
-		mv "/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \
-			"/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old"
-	fi
-}
diff --git a/dev-libs/ace/ace-5.6.1.ebuild b/dev-libs/ace/ace-5.6.1.ebuild
index 5855bdb108a9..33f1baa8d222 100644
--- a/dev-libs/ace/ace-5.6.1.ebuild
+++ b/dev-libs/ace/ace-5.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.6.1.ebuild,v 1.1 2007/10/07 19:52:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.6.1.ebuild,v 1.2 2007/10/08 09:06:40 dragonheart Exp $
 
 inherit toolchain-funcs
 
@@ -59,15 +59,18 @@ src_install() {
 src_test() {
 	cd "${S}/build"
 	emake ACE_ROOT="${S}" check || die "self test failed"
+	sed -i -e "^#define PACKAGE_.*//g" /usr/include/ace/config.h
 }
 
 pkg_postinst() {
-	# This is required, as anything trying to compile against ACE will have
-	# problems with conflicting OS.h files if this is not done.
 
 	local CC_MACHINE=$($(tc-getCC) -dumpmachine)
-	if [ -d "/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then
-		mv "/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \
-			"/usr/lib/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old"
+	if [ -d "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then
+	ewarn "moving /usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace to"
+	ewarn "ace.old"
+	ewarn "This is required, as anything trying to compile against ACE will"
+	ewarn "have problems with conflicting OS.h files if this is not done."
+		mv "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \
+			"/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old"
 	fi
 }
diff --git a/dev-libs/ace/files/digest-ace-5.5.8 b/dev-libs/ace/files/digest-ace-5.5.8
deleted file mode 100644
index 2c666abd4f53..000000000000
--- a/dev-libs/ace/files/digest-ace-5.5.8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 00e75e3572fa6f2a44b9cf3cee1894ae ACE+TAO+CIAO-5.5.8.tar.bz2 23766813
-RMD160 4a6af82c4293a27bbaaae89f43c82e71eff88bc9 ACE+TAO+CIAO-5.5.8.tar.bz2 23766813
-SHA256 1c8f4e7a078f1b1277068d6c6dd28f7c7a5ed5cb5735a1cdb706f4c8b80db1c1 ACE+TAO+CIAO-5.5.8.tar.bz2 23766813
-MD5 9ceb7c4849634819577009bff5093e0e ACE+TAO-5.5.8.tar.bz2 22295160
-RMD160 64165755e4391e1146759c4d976cfe1dd7fe7f99 ACE+TAO-5.5.8.tar.bz2 22295160
-SHA256 2f9e186cedfb22d083d6de163b2f34a461b6c9ce8f2df2cabc87232428cf139d ACE+TAO-5.5.8.tar.bz2 22295160
-MD5 c2f7d7e91b8454899f3ac10dadc633a2 ACE-5.5.8.tar.bz2 8065238
-RMD160 75b328869a691d8a1b1d3d13ed80c42e94089323 ACE-5.5.8.tar.bz2 8065238
-SHA256 009fa7348fc3e6a2230836ef20b1ab47a04c2bda57aed14a8d47b3f4f544eb18 ACE-5.5.8.tar.bz2 8065238