version bump inspired by bug #227533. removed old unstable version

Package-Manager: portage-2.1.4.4

3 files changed, 24 insertions, 15 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 7a6bbd3c8533..09d18419445c 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.52 2007/10/08 09:06:40 dragonheart Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.53 2008/06/20 14:21:27 dragonheart Exp $
+
+*ace-5.6.5 (20 Jun 2008)
+
+  20 Jun 2008; Daniel Black <dragonheart@gentoo.org> -ace-5.5.9.ebuild,
+  +ace-5.6.5.ebuild:
+  version bump inspired by bug #227533. removed old unstable version
 
   08 Oct 2007; Daniel Black <dragonheart@gentoo.org> ace-5.5-r1.ebuild,
   -ace-5.5.8.ebuild, ace-5.6.1.ebuild:
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index c159fa9a0256..91048fced1b7 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,13 +1,13 @@
-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.9.tar.bz2 22460141 RMD160 92aa0c465fb8a64f4924e82f19d9e219bc94bd1f SHA1 e94ffc31a6ea253998fbb669794ee3ab4ed3a1d7 SHA256 dd73ca2c3b8297a589613f1a2c0a5e88e0226c0d7657f2a62fe06ffc88557ce0
+DIST ACE+TAO+CIAO-5.6.5.tar.bz2 28235274 RMD160 bcc2cb8f851d6c9d346ea111a9eecf8f8b14f802 SHA1 2dec77f253401f5ea33019da16408e42232725fd SHA256 8db1ec565bb2ca80354a740bbce18f4c5e41af888a79e7f207b0cd9f9636f571
 DIST ACE+TAO-5.6.1.tar.bz2 20388344 RMD160 ced8ec06cea29fe72bd386c8d302b8f0813bbebe SHA1 7988a95e59e32077196abc7e46338511646faade SHA256 b64257b0478949065385943915e26a49641f1fb1ca9d8f5dbf823545a916d0b6
+DIST ACE+TAO-5.6.5.tar.bz2 23736201 RMD160 5a866a3d4be41bcbb68b87542cb7a73d4ddc1bae SHA1 3d0b07ed83651a32281359a2a8d233bfc9b3f9ed SHA256 8b32b5b553dfe608451a3b008d3f8d4f3dc441821804f207363cf1a622b6290d
 DIST ACE-5.5+TAO-1.5.tar.bz2 19518497 RMD160 a11421585630071a24d9c1f6ba2d4bdd81b25e9b SHA1 b4fc49e8fc9e3fea96d308971ebfe17a124f061e SHA256 48bac6620ceda1801cdaa9751a6b0b01be960fd34607897fb823adfe5114797d
-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
+DIST ACE-5.6.5.tar.bz2 8901969 RMD160 2264ed23716dd45aa4095d2e30c4e2ff78d60a4f SHA1 9696ce572787dd586d34643a82a49d0f8808e422 SHA256 8d7d24348b0cc67a68165af0f17ee5d8ad906ec303aa2c0bbab23d931acc036f
 EBUILD ace-5.5-r1.ebuild 2150 RMD160 9ca2c2d7e557cee579110592084a46c95c65f375 SHA1 3a4ddb742147c0ece5afb405ae678fcfcb5929ee SHA256 4f15051aa5d8423172b3ba80e8ccd6cd8a29a62c83ed1317b118b1a78a03430c
-EBUILD ace-5.5.9.ebuild 2130 RMD160 de47db441ad9b8dd38be8c870c44e58f7e84154c SHA1 33bf609f0019d541ff69ce7465fc37a28a61121b SHA256 ab776760c8ee5738c8abaa6a16be8ae0fee92cba6c8c4f38e5095589a8453ff2
 EBUILD ace-5.6.1.ebuild 2347 RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 SHA1 0362ca26400e689ae3395fb08ed874d865ff3324 SHA256 8fb602445dfb2a6c7381662646031d1a7bbcd948c71e581b09f30593d2464603
-MISC ChangeLog 6600 RMD160 def5cf1be02e74af25487075e7e91dcef78eafa0 SHA1 f069d84541911905003a0d0801c3ad0bc24bbb80 SHA256 083c2f6029f90b24bb185f24de71e8c4cee65ee79c824a9077a7aa879b6a53e4
+EBUILD ace-5.6.5.ebuild 2348 RMD160 a68961662187c132a8f2f51531b93485d8dbde00 SHA1 a65014891df825dcd3ccb18358a6a3b4359813f1 SHA256 f04a2be5525bd184fc47ac3fb0a721ed706aba23201a50ba1c08cbaa5f51bca4
+MISC ChangeLog 6789 RMD160 b39bfb1784b425aca2e8656d78cc52f2825422a8 SHA1 b352f8e7e97ea54a035e48658598187fbc68c2da SHA256 e45d948f5bc4f0d1d8b5c7ce2fd6defd3dc2179f4551c049f3c1c552de339b18
 MISC metadata.xml 498 RMD160 9fa238ee9626dc5367cfea540e09ddab03e28987 SHA1 6624d6c6dceaee1f8ee7b43379201bd979fbd2e4 SHA256 328dbc3435f54440a3e41f68f89abbda2b6f819b06d6b6fe7cad4a79d1d513d6
diff --git a/dev-libs/ace/ace-5.5.9.ebuild b/dev-libs/ace/ace-5.6.5.ebuild
index 6ca840e58709..900b54ea60c5 100644
--- a/dev-libs/ace/ace-5.5.9.ebuild
+++ b/dev-libs/ace/ace-5.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/07/22 08:33:04 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.6.5.ebuild,v 1.1 2008/06/20 14:21:27 dragonheart Exp $
 
 inherit toolchain-funcs
 
@@ -34,7 +34,7 @@ src_compile() {
 	# 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"
+	#export ace_cv_new_throws_bad_alloc_exception="yes"
 
 	ECONF_SOURCE="${S}"
 	econf \
@@ -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
 }