version bump + old version cleanout

(Portage version: 2.0.51.22-r2)

11 files changed, 72 insertions, 254 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 8bf2c23124e9..7f099fe478d3 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/ace
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.29 2005/05/30 19:07:39 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.30 2005/07/30 01:52:58 dragonheart Exp $
+
+*ace-5.4.6 (30 Jul 2005)
+
+  30 Jul 2005; Daniel Black <dragonheart@gentoo.org> -ace-5.3.ebuild,
+  -ace-5.4.ebuild, -ace-5.4-r1.ebuild, ace-5.4.3.ebuild, +ace-5.4.6.ebuild:
+  version bump + old version cleanout
 
   30 May 2005; Michael Imhof <tantive@gentoo.org> metadata.xml:
   Fixed metadata.
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index eacd51c3e971..0eb7e0631a26 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 1d454516512928235071f898539e737a ChangeLog 3335
 MD5 37941ec072eecc05f4d28f36f98f006a metadata.xml 502
+MD5 39768cbaf2907a409241838c845d3897 ace-5.4-r1.ebuild 2512
+MD5 8521648598f1060f6ddd3649881fbebd ace-5.4.6.ebuild 1473
+MD5 316b7c9b9145b570e200a8d77d1853a2 ace-5.4-r2.ebuild 2580
 MD5 2c3f045f18624da32b8435ec0b23aeb8 ace-5.3.ebuild 2037
+MD5 096b36566dbd01aea6ad16ee7814b4c4 ace-5.4.3.ebuild 1786
 MD5 3d69597df668ca58b4668dec61aa6d78 ace-5.4.ebuild 2183
-MD5 316b7c9b9145b570e200a8d77d1853a2 ace-5.4-r2.ebuild 2580
-MD5 1d454516512928235071f898539e737a ChangeLog 3335
-MD5 39768cbaf2907a409241838c845d3897 ace-5.4-r1.ebuild 2512
-MD5 862f8fef6917d3d28273901add61e56e ace-5.4.3.ebuild 1861
-MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r2 61
 MD5 cda67156d3d7e40ae83547ed35c17bd4 files/digest-ace-5.4.3 63
+MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r1 61
+MD5 92a5ea661e004e4b9e6b6047c05ef61d files/digest-ace-5.4.6 63
+MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r2 61
 MD5 b88f6bda8016adf15d1660b3f1e0312e files/digest-ace-5.3 60
 MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4 61
-MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCm2SpKtJO8LeSoosRAn2ZAJ9Lnfw3KRd9/0wXanTMEOSLoKACbACdGyg/
-eJCgtv57lJ14v0agCcu8RHo=
-=oflN
------END PGP SIGNATURE-----
diff --git a/dev-libs/ace/ace-5.3.ebuild b/dev-libs/ace/ace-5.3.ebuild
deleted file mode 100644
index e35a7a07ebce..000000000000
--- a/dev-libs/ace/ace-5.3.ebuild
+++ /dev/null
@@ -1,75 +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.3.ebuild,v 1.7 2005/01/02 04:45:19 dragonheart Exp $
-
-S=${WORKDIR}/ACE_wrappers
-DESCRIPTION="The Adaptive Communications Environment"
-SRC_URI="http://deuce.doc.wustl.edu/old_distribution/ACE-${PV}.tar.gz"
-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
-	cd ${D}/usr/lib
-	ln -s libACE.so.${PV} libACE.so.`echo ${PV} | cut -f1 -d.`
-	ln -s libACE.so.${PV} libACE.so
-
-	cd ${S}/ace
-	cp -r *.h *.cpp *.i *.inl ${D}/usr/include/ace
-	chmod 644 ${D}/usr/include/ace/*
-
-	cd ${S}/man
-	cp -r man? ${D}/usr/share/man
-	chmod 644 ${D}/usr/share/man/man?/*
-	gzip ${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-r1.ebuild b/dev-libs/ace/ace-5.4-r1.ebuild
deleted file mode 100644
index db2938912e60..000000000000
--- a/dev-libs/ace/ace-5.4-r1.ebuild
+++ /dev/null
@@ -1,81 +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-r1.ebuild,v 1.4 2005/01/02 04:45:19 dragonheart 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
-	cp -r *.{h,hpp,i,inl} ${D}/usr/include/ace
-# 	cp -r * ${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.3.ebuild b/dev-libs/ace/ace-5.4.3.ebuild
index 279892cef589..c57b46ab608a 100644
--- a/dev-libs/ace/ace-5.4.3.ebuild
+++ b/dev-libs/ace/ace-5.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2005/01/02 04:45:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4.3.ebuild,v 1.2 2005/07/30 01:52:58 dragonheart Exp $
 
 inherit eutils
 
@@ -19,8 +19,6 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	#epatch ${FILESDIR}/${P}-makefilefix.patch || die "patch failed"
 	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 \
 		|| cp config-linux.h config.h
diff --git a/dev-libs/ace/ace-5.4.6.ebuild b/dev-libs/ace/ace-5.4.6.ebuild
new file mode 100644
index 000000000000..5ee21f2abef7
--- /dev/null
+++ b/dev-libs/ace/ace-5.4.6.ebuild
@@ -0,0 +1,55 @@
+# 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.6.ebuild,v 1.1 2005/07/30 01:52:58 dragonheart 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="~x86 ~sparc ~ppc ~alpha ~amd64"
+IUSE="ipv6"
+
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+
+RDEPEND="${DEPEND}"
+
+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
+	emake 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.4.ebuild b/dev-libs/ace/ace-5.4.ebuild
deleted file mode 100644
index 5b447e531447..000000000000
--- a/dev-libs/ace/ace-5.4.ebuild
+++ /dev/null
@@ -1,75 +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.ebuild,v 1.6 2005/01/02 04:45:19 dragonheart 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
-	cd ${D}/usr/lib
-	ln -s libACE.so.${PV} libACE.so.`echo ${PV} | cut -f1 -d.`
-	ln -s libACE.so.${PV} libACE.so
-
-	cd ${S}/ace
-	#don't really need the .cpp's after it's built
-	#cp -r *.{h,hpp,i,inl} ${D}/usr/include/ace
-	cp -r * ${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/files/digest-ace-5.3 b/dev-libs/ace/files/digest-ace-5.3
deleted file mode 100644
index f9deef7fa9f1..000000000000
--- a/dev-libs/ace/files/digest-ace-5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b91fbf2dc1816a196362038020914ed ACE-5.3.tar.gz 7515407
diff --git a/dev-libs/ace/files/digest-ace-5.4 b/dev-libs/ace/files/digest-ace-5.4
deleted file mode 100644
index 5af8e0d0bdcd..000000000000
--- a/dev-libs/ace/files/digest-ace-5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51e997b07ea8a9cf38361cc9f2b6fede ACE-5.4.tar.bz2 5934471
diff --git a/dev-libs/ace/files/digest-ace-5.4-r1 b/dev-libs/ace/files/digest-ace-5.4-r1
deleted file mode 100644
index 5af8e0d0bdcd..000000000000
--- a/dev-libs/ace/files/digest-ace-5.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51e997b07ea8a9cf38361cc9f2b6fede 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
new file mode 100644
index 000000000000..d45cb0f6dfca
--- /dev/null
+++ b/dev-libs/ace/files/digest-ace-5.4.6
@@ -0,0 +1 @@
+MD5 1033774902b918be2317c174caef673d ACE-5.4.6.tar.bz2 6875711