Fixed headers installation (bug #229013, thanks to Matt Michalowski)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64

3 files changed, 82 insertions, 2 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 09d18419445c..b6bf557fc776 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.53 2008/06/20 14:21:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.54 2008/06/29 13:08:15 dev-zero Exp $
+
+*ace-5.6.5-r1 (29 Jun 2008)
+
+  29 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> +ace-5.6.5-r1.ebuild:
+  Fixed headers installation (bug #229013, thanks to Matt Michalowski)
 
 *ace-5.6.5 (20 Jun 2008)
 
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 91048fced1b7..0801f79107e6 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -8,6 +8,7 @@ DIST ACE-5.6.1.tar.bz2 7907583 RMD160 644c6f58a33b9458b2eafe92578287a9d89cfc96 S
 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.6.1.ebuild 2347 RMD160 90ce097e59facbe40ed2930ccb97d8d6357494c9 SHA1 0362ca26400e689ae3395fb08ed874d865ff3324 SHA256 8fb602445dfb2a6c7381662646031d1a7bbcd948c71e581b09f30593d2464603
+EBUILD ace-5.6.5-r1.ebuild 2251 RMD160 230c76ce4efca7e19be181b7f043d3d4d5c55794 SHA1 e34a1b7f9d6839a8e900ce774f263cd3c0a2df03 SHA256 ae7db1e04977e8bdc326585cf7644f5cf16b4c119defa43af064b2fcc143124d
 EBUILD ace-5.6.5.ebuild 2348 RMD160 a68961662187c132a8f2f51531b93485d8dbde00 SHA1 a65014891df825dcd3ccb18358a6a3b4359813f1 SHA256 f04a2be5525bd184fc47ac3fb0a721ed706aba23201a50ba1c08cbaa5f51bca4
-MISC ChangeLog 6789 RMD160 b39bfb1784b425aca2e8656d78cc52f2825422a8 SHA1 b352f8e7e97ea54a035e48658598187fbc68c2da SHA256 e45d948f5bc4f0d1d8b5c7ce2fd6defd3dc2179f4551c049f3c1c552de339b18
+MISC ChangeLog 6962 RMD160 d7caa2478228e2aed536e5829898f1aa77cf5442 SHA1 a92ed48b28aa1ead2ce0d40831c92f5e2f23fc28 SHA256 f51b70091818444feb099a6ee090bbe87b5570d299d20eb99f53c486daae1132
 MISC metadata.xml 498 RMD160 9fa238ee9626dc5367cfea540e09ddab03e28987 SHA1 6624d6c6dceaee1f8ee7b43379201bd979fbd2e4 SHA256 328dbc3435f54440a3e41f68f89abbda2b6f819b06d6b6fe7cad4a79d1d513d6
diff --git a/dev-libs/ace/ace-5.6.5-r1.ebuild b/dev-libs/ace/ace-5.6.5-r1.ebuild
new file mode 100644
index 000000000000..4b2963dea899
--- /dev/null
+++ b/dev-libs/ace/ace-5.6.5-r1.ebuild
@@ -0,0 +1,74 @@
+# 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-r1.ebuild,v 1.1 2008/06/29 13:08:15 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 )"
+
+DEPEND="${COMMON_DEPEND}
+	X? ( x11-proto/xproto )"
+
+S="${WORKDIR}/ACE_wrappers"
+
+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"
+}
+
+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() {
+
+	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
+}