Version bump. Dropped old version.

(Portage version: 2.1.3_rc8)

5 files changed, 96 insertions, 88 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 74ab32c453df..6b3e328401dd 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.48 2007/07/12 22:00:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.49 2007/07/12 22:10:03 dev-zero Exp $
+
+*ace-5.5.9 (12 Jul 2007)
+
+  12 Jul 2007; Tiziano Müller <dev-zero@gentoo.org> -ace-5.5.3-r2.ebuild,
+  +ace-5.5.9.ebuild:
+  Version bump. Dropped old version.
 
   12 Jul 2007; Tiziano Müller <dev-zero@gentoo.org> ace-5.5.8.ebuild:
   Cosmetic cleanup, fixed bug #169647
diff --git a/dev-libs/ace/ace-5.5.3-r2.ebuild b/dev-libs/ace/ace-5.5.3-r2.ebuild
deleted file mode 100644
index 1d52d12d7639..000000000000
--- a/dev-libs/ace/ace-5.5.3-r2.ebuild
+++ /dev/null
@@ -1,84 +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.3-r2.ebuild,v 1.2 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit eutils autotools
-
-S="${WORKDIR}/ACE_wrappers"
-DESCRIPTION="The Adaptive Communications Environment"
-SRC_URI="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
-#				)
-#		 )"
-
-# tao currently has upstream bug
-# http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2684
-
-# ciao currently isn't autoconf and depends of tao
-# http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/CIAO/CIAO-INSTALL.html
-
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-#IUSE="X ipv6 tao ciao"
-IUSE="X ipv6"
-
-DEPEND="dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	X? ( || (
-	( x11-libs/libXt
-	x11-libs/libXaw )
-	virtual/x11 )
-	)"
-
-DEPEND="${DEPEND}
-	X? ( || (
-	( x11-proto/xproto )
-	virtual/x11 )
-	)"
-
-src_compile() {
-	export ACE_ROOT="${S}"
-	mkdir build
-	cd build
-	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
-}
-
-src_test() {
-	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"
-	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
-}
-
-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=`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"
-	fi
-}
diff --git a/dev-libs/ace/ace-5.5.9.ebuild b/dev-libs/ace/ace-5.5.9.ebuild
new file mode 100644
index 000000000000..8bd274933343
--- /dev/null
+++ b/dev-libs/ace/ace-5.5.9.ebuild
@@ -0,0 +1,80 @@
+# 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.9.ebuild,v 1.1 2007/07/12 22:10:03 dev-zero 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 )
+	virtual/x11 )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	X? ( || (
+	( x11-proto/xproto )
+	virtual/x11 )
+	)"
+
+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/files/digest-ace-5.5.3-r2 b/dev-libs/ace/files/digest-ace-5.5.3-r2
deleted file mode 100644
index 7fb716ab0e4d..000000000000
--- a/dev-libs/ace/files/digest-ace-5.5.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f51b82275b03f338503a4e01174cc789 ACE-5.5.3.tar.bz2 8073158
-RMD160 289b78cc6a7dddfda68705dccdca373b74711785 ACE-5.5.3.tar.bz2 8073158
-SHA256 6cf285d2f1b0f0d4eac57f894018e1c88bc855a554a2b1d1edb86245757849c8 ACE-5.5.3.tar.bz2 8073158
diff --git a/dev-libs/ace/files/digest-ace-5.5.9 b/dev-libs/ace/files/digest-ace-5.5.9
new file mode 100644
index 000000000000..4adc33dbb472
--- /dev/null
+++ b/dev-libs/ace/files/digest-ace-5.5.9
@@ -0,0 +1,9 @@
+MD5 c52034ca7f9d8272914830f51dd5d02a ACE+TAO+CIAO-5.5.9.tar.bz2 23834445
+RMD160 fe5902de224c57255151c79d430c487f53ca854e ACE+TAO+CIAO-5.5.9.tar.bz2 23834445
+SHA256 68316a33d7cc0f976b2184cdda09fe40386c782b2bb8c5b629ec2dc574d813e3 ACE+TAO+CIAO-5.5.9.tar.bz2 23834445
+MD5 4d49c540780618592c35233569cbec0b ACE+TAO-5.5.9.tar.bz2 22460141
+RMD160 92aa0c465fb8a64f4924e82f19d9e219bc94bd1f ACE+TAO-5.5.9.tar.bz2 22460141
+SHA256 dd73ca2c3b8297a589613f1a2c0a5e88e0226c0d7657f2a62fe06ffc88557ce0 ACE+TAO-5.5.9.tar.bz2 22460141
+MD5 1eb505afffe7aa62cf8a455c8065dd4f ACE-5.5.9.tar.bz2 8061560
+RMD160 0ec944030329e965e1d101f16fd1833613b520b6 ACE-5.5.9.tar.bz2 8061560
+SHA256 f12b6b43eae90f6f50c3f55129e50ad896138341fcb9eade9260965a24a6b23b ACE-5.5.9.tar.bz2 8061560