Remove PACKAGE_* definitions from installed config.h (#192676).

Package-Manager: portage-2.1.4.5

3 files changed, 99 insertions, 2 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 40b9de64badd..c8f39194bc82 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ace
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.56 2008/11/04 13:36:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.57 2008/12/14 11:56:46 mrness Exp $
+
+*ace-5.6.5-r2 (14 Dec 2008)
+
+  14 Dec 2008; Alin Năstac <mrness@gentoo.org> +ace-5.6.5-r2.ebuild:
+  Remove PACKAGE_* definitions from installed config.h (#192676).
 
   04 Nov 2008; Daniel Black <dragonheart@gentoo.org>
   +files/ace-missing-refcountable-header.patch, ace-5.6.5-r1.ebuild:
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 25e530ac1627..c9fac7437c8b 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ace-missing-refcountable-header.patch 658 RMD160 d616b07612bce1aa3a404e363e31012e22c8caab SHA1 9d83df1adc108f05348c65d15bdd3781a07d6d89 SHA256 002c4c9ad8ed363c6e61f6497a91c3a8eaeec3feb24d87d4bc9ac89ac2c72150
 DIST ACE+TAO+CIAO-5.6.1.tar.bz2 24590534 RMD160 2ab740d3efd3b0b804ccec9c5af4ac8762afc237 SHA1 3b1ed3e4b5f8b52041af78a3179396ff9dd907c0 SHA256 3c8b70de975189abbdd0f27dec98b14b11d972185763aa3720ef1fe444c437b5
 DIST ACE+TAO+CIAO-5.6.5.tar.bz2 28235274 RMD160 bcc2cb8f851d6c9d346ea111a9eecf8f8b14f802 SHA1 2dec77f253401f5ea33019da16408e42232725fd SHA256 8db1ec565bb2ca80354a740bbce18f4c5e41af888a79e7f207b0cd9f9636f571
@@ -10,6 +13,14 @@ DIST ACE-5.6.5.tar.bz2 8901969 RMD160 2264ed23716dd45aa4095d2e30c4e2ff78d60a4f S
 EBUILD ace-5.5-r1.ebuild 2150 RMD160 9ca2c2d7e557cee579110592084a46c95c65f375 SHA1 3a4ddb742147c0ece5afb405ae678fcfcb5929ee SHA256 4f15051aa5d8423172b3ba80e8ccd6cd8a29a62c83ed1317b118b1a78a03430c
 EBUILD ace-5.6.1.ebuild 2347 RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 SHA1 0362ca26400e689ae3395fb08ed874d865ff3324 SHA256 8fb602445dfb2a6c7381662646031d1a7bbcd948c71e581b09f30593d2464603
 EBUILD ace-5.6.5-r1.ebuild 2363 RMD160 dbae1eae59d60f484dfc7d132f05591e850c03a4 SHA1 f06fa6c5e7e35a41e6b3d775bacfda463cc50c57 SHA256 7a841a7f6241444f3d287e49b034cdae09de705da3c55c235be48fe4b02eb490
+EBUILD ace-5.6.5-r2.ebuild 2454 RMD160 982fade1554a819f66c4b9495c6138ca795c8592 SHA1 dce5a10d756ec889ffde9dcb91918d07c008a9d2 SHA256 5aec661f714cb7bb7f819f03cb77ef1005b9d12158342b6e49fa8b0486b0df57
 EBUILD ace-5.6.5.ebuild 2348 RMD160 a68961662187c132a8f2f51531b93485d8dbde00 SHA1 a65014891df825dcd3ccb18358a6a3b4359813f1 SHA256 f04a2be5525bd184fc47ac3fb0a721ed706aba23201a50ba1c08cbaa5f51bca4
-MISC ChangeLog 7259 RMD160 d8aba0b6c53296f30b217f09c99e2df159406802 SHA1 27ce4eee47681de83afbdaa5bee9a69fde380181 SHA256 5a0e7391923ff6cf23c8f26b5b275d478afffb36602561c54c7b578c51551840
+MISC ChangeLog 7420 RMD160 eaf44bc336c271d3bf1e2578f637b71f15cebdb0 SHA1 289ffbb0aec2d453d4693a7593cfe655c1b37156 SHA256 2256b81189a0273a3edc82d8c3d027b686159a7cdfb723b3ab1f7f5cc700c84f
 MISC metadata.xml 665 RMD160 539012d56635aac6a7cee8279e682eb403acd31f SHA1 3bbf978e011136d77ce500f52fe751de34428734 SHA256 8b0bb6b0a5d7c9b095a5dd666cb1b2a8114a5c8134595899c3b2008eee1b1787
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklE9JQACgkQPrHvTlXvhtvzuACcDPwVNDhfErzj0OmMteMTFTiH
+EpUAnid4Htjk+xBFPcAfE1xqZnkrX3Q2
+=ZmLf
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/ace/ace-5.6.5-r2.ebuild b/dev-libs/ace/ace-5.6.5-r2.ebuild
new file mode 100644
index 000000000000..7b3f580f7e28
--- /dev/null
+++ b/dev-libs/ace/ace-5.6.5-r2.ebuild
@@ -0,0 +1,81 @@
+# 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.6.5-r2.ebuild,v 1.1 2008/12/14 11:56:46 mrness Exp $
+
+inherit toolchain-funcs eutils
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ace-missing-refcountable-header.patch
+}
+
+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 "emake failed"
+}
+
+src_install() {
+	cd build
+	emake ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install"
+	insinto /usr/include/ace
+	doins \
+		"${S}/ace/Svc_Conf_Token_Table.h" \
+		"${S}/ace/Unbounded_Set_Ex.inl" \
+		"${S}/ace/Unbounded_Set_Ex.h" \
+		"${S}/ace/Unbounded_Set_Ex.cpp"
+	# punt gperf stuff
+	rm -rf "${D}/usr/bin" "${D}/usr/share"
+	# remove PACKAGE_* definitions from installed config.h (#192676)
+	sed -i -e "s:^[ \t]*#define[ \t]\+PACKAGE_.*$:/\* & \*/:g" "${D}/usr/include/ace/config.h"
+}
+
+src_test() {
+	cd "${S}/build"
+	emake ACE_ROOT="${S}" check || die "self test failed"
+}
+
+pkg_postinst() {
+
+	local CC_MACHINE=$($(tc-getCC) -dumpmachine)
+	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
+}