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.

(Portage version: 2.1.3.9)

5 files changed, 31 insertions, 96 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/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