version bump hopefully fixing bug #169647 thanks to Patrizio Bassi

(Portage version: 2.1.2.7)

8 files changed, 49 insertions, 164 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index d6957862e2f9..ab0c0371b5af 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.46 2007/04/22 11:44:40 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.47 2007/06/22 22:24:51 dragonheart Exp $
+
+*ace-5.5.8 (22 Jun 2007)
+
+  22 Jun 2007; Daniel Black <dragonheart@gentoo.org> -ace-5.4-r2.ebuild,
+  -ace-5.4.6.ebuild, -ace-5.5.ebuild, +ace-5.5.8.ebuild:
+  version bump hopefully fixing bug #169647 thanks to Patrizio Bassi
 
   22 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> ace-5.5-r1.ebuild:
   Stable on alpha wrt bug #148898
diff --git a/dev-libs/ace/ace-5.4-r2.ebuild b/dev-libs/ace/ace-5.4-r2.ebuild
deleted file mode 100644
index 33259d2e0386..000000000000
--- a/dev-libs/ace/ace-5.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4-r2.ebuild,v 1.5 2005/04/09 20:50:55 hansmi Exp $
-
-S=${WORKDIR}/ACE_wrappers
-DESCRIPTION="The Adaptive Communications Environment"
-SRC_URI="http://deuce.doc.wustl.edu/old_distribution/ACE-${PV}.tar.bz2"
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="x86 sparc ppc alpha amd64"
-IUSE="ipv6"
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/ace
-	use ipv6 && sed -e "s/#define ACE_HAS_PTHREADS$/#define ACE_HAS_PTHREADS\n#define ACE_HAS_IPV6/" config-linux.h >config.h
-	use ipv6 || cp config-linux.h config.h
-	cd ${S}/include/makeinclude
-	sed -e "s:-O3:${CFLAGS}:" platform_linux.GNU >platform_macros.GNU
-}
-
-src_compile() {
-	export ACE_ROOT=${S}
-	cd ${S}/ace
-	emake static_libs=1 || die
-}
-
-src_install() {
-	dodir /usr/include/ace /usr/lib /usr/share/man/man3
-	cd ${S}/ace
-	cp libACE.so ${D}/usr/lib/libACE.so.${PV}
-	cp libACE.a ${D}/usr/lib/libACE.a
-	cp libACE_RMCast.so ${D}/usr/lib/libACE_RMCast.so.${PV}
-	cp libACE_RMCast.a ${D}/usr/lib/libACE_RMCast.a
-	cd ${D}/usr/lib
-# 	ln -s libACE.so.${PV} libACE.so.`echo ${PV} | cut -f1 -d.`
-	ln -s libACE.so.${PV} libACE.so
-	ln -s libACE.so.${PV} libACE.so.${PV}.0
-# 	ln -s libACE_RMCast.so.${PV} libACE_RMCast.so.`echo ${PV} | cut -f1 -d.`
-	ln -s libACE_RMCast.so.${PV} libACE_RMCast.so
-	ln -s libACE_RMCast.so.${PV} libACE_RMCast.so.${PV}.0
-
-	cd ${S}/ace
-	#don't really need the .cpp's after it's built
-	#Hmm, 5.4 seems to need the .cpp's?
-#	cp -r *.{h,hpp,i,inl} ${D}/usr/include/ace
-	cp -r * ${D}/usr/include/ace/
-	cp -r os_include ${D}/usr/include/ace/
-	chmod -R 644 ${D}/usr/include/ace/*
-	cd ${D}/usr/include/ace/
-	find -type d -exec chmod 755 \{\} \;
-
-	cd ${S}/man
-	cp -r man? ${D}/usr/share/man
-	chmod 644 ${D}/usr/share/man/man?/*
-	gzip -q ${D}/usr/share/man/man?/*
-
-	cd ${S}
-	dodoc ACE-INSTALL* AUTHORS COPYING FAQ PROBLEM-REPORT-FORM README
-	dodoc THANKS TODO VERSION
-	cd ${S}/docs
-	dodoc *
-	cd ${S}
-	docinto ChangeLogs
-	dodoc ChangeLog
-	cd ${S}/ChangeLogs
-	dodoc *
-}
-
-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.4.6.ebuild b/dev-libs/ace/ace-5.4.6.ebuild
deleted file mode 100644
index bebe860398b5..000000000000
--- a/dev-libs/ace/ace-5.4.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4.6.ebuild,v 1.6 2006/10/20 00:10:23 kloeri Exp $
-
-inherit eutils
-
-S="${WORKDIR}/ACE_wrappers"
-DESCRIPTION="The Adaptive Communications Environment"
-SRC_URI="http://deuce.doc.wustl.edu/old_distribution/ACE-${PV}.tar.bz2"
-HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
-
-SLOT="0"
-LICENSE="BSD as-is"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
-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)
-	# --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"
-}
-
-
-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.ebuild b/dev-libs/ace/ace-5.5.8.ebuild
index 398c67e89753..995e54643f58 100644
--- a/dev-libs/ace/ace-5.5.ebuild
+++ b/dev-libs/ace/ace-5.5.8.ebuild
@@ -1,18 +1,33 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.ebuild,v 1.1 2006/05/06 14:51:27 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.5.8.ebuild,v 1.1 2007/06/22 22:24:51 dragonheart Exp $
 
-inherit eutils
+inherit eutils autotools
 
 S="${WORKDIR}/ACE_wrappers"
 DESCRIPTION="The Adaptive Communications Environment"
-SRC_URI="http://deuce.doc.wustl.edu/old_distribution/ACE-${PV}.tar.bz2"
+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
+				)
+		 )"
+
+# 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"
+IUSE="X ipv6 tao ciao"
+#IUSE="X ipv6"
 
 DEPEND="dev-libs/openssl"
 
@@ -29,12 +44,19 @@ DEPEND="${DEPEND}
 	virtual/x11 )
 	)"
 
+src_unpack() {
+	unpack ${A}
+#	cd "${S}"
+#	AT_M4DIR=m4 eautoreconf
+}
+
 src_compile() {
 	export ACE_ROOT="${S}"
 	mkdir build
 	cd build
 	ECONF_SOURCE="${S}"
-	econf --enable-lib-all $(use_with X) $(use_enable ipv6)
+	econf --enable-lib-all $(use_with X) $(use_enable ipv6) || \
+		die "econf died"
 	# --with-qos needs ACE_HAS_RAPI
 	emake static_libs=1 || die
 }
@@ -49,6 +71,11 @@ src_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
 }
 
 
diff --git a/dev-libs/ace/files/digest-ace-5.4-r2 b/dev-libs/ace/files/digest-ace-5.4-r2
deleted file mode 100644
index 8cf57f299cbb..000000000000
--- a/dev-libs/ace/files/digest-ace-5.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51e997b07ea8a9cf38361cc9f2b6fede ACE-5.4.tar.bz2 5934471
-RMD160 087582c79eb478bc20ed770ecf9b5e7a8a75a4c0 ACE-5.4.tar.bz2 5934471
-SHA256 57c307658a51fbf28f5d105f24de33a7818adf725915f64ecc570e4bc0b0d58d ACE-5.4.tar.bz2 5934471
diff --git a/dev-libs/ace/files/digest-ace-5.4.6 b/dev-libs/ace/files/digest-ace-5.4.6
deleted file mode 100644
index 855fb40011c2..000000000000
--- a/dev-libs/ace/files/digest-ace-5.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1033774902b918be2317c174caef673d ACE-5.4.6.tar.bz2 6875711
-RMD160 c4e21544fb7a1885abf28ccc6087f70a673071c4 ACE-5.4.6.tar.bz2 6875711
-SHA256 43412665329638da59b9d4cf0dddb92cd3b935f683a9a4e7ee61e5932a8460aa ACE-5.4.6.tar.bz2 6875711
diff --git a/dev-libs/ace/files/digest-ace-5.5 b/dev-libs/ace/files/digest-ace-5.5
deleted file mode 100644
index d7f84d5b057c..000000000000
--- a/dev-libs/ace/files/digest-ace-5.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 23b8278b50b43ed9b6fa096a65436878 ACE-5.5.tar.bz2 7595626
-RMD160 300763ae9e46975ec35fb0cbe0d9b1959058c2dc ACE-5.5.tar.bz2 7595626
-SHA256 174f665d96edd8af2b38123e0c94039f8f429ecee99d9cb761afde1a082f5ddd ACE-5.5.tar.bz2 7595626
diff --git a/dev-libs/ace/files/digest-ace-5.5.8 b/dev-libs/ace/files/digest-ace-5.5.8
new file mode 100644
index 000000000000..2c666abd4f53
--- /dev/null
+++ b/dev-libs/ace/files/digest-ace-5.5.8
@@ -0,0 +1,9 @@
+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