dev-libs/ace: version bump, enable proper building of static libraries

Gentoo-Bug: 305029
Gentoo-Bug: 366231

Package-Manager: portage-2.2.20

2 files changed, 89 insertions, 0 deletions

diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 4ff8308da3af..f30eb6166a78 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,3 +1,6 @@
 DIST ACE+TAO+CIAO-5.7.2.tar.bz2 49824451 SHA256 5290e378c9417892e7e57eef06e74affeb6a93ba3e7c67e24e02e72c282ea37a SHA512 798707aaa04b253f4b1241cd3263a87bdf7188437f858aac910a6fbf54bcf27c41f827fe81cea68b813ac068bd7a04f63e7f4eb948432d9240c4979fdf7f0ce1 WHIRLPOOL 23214425fd1d2a13622b1f21ec16fde84eb76a22305a6393642cdb4ea3d6d58481b59323a64ac91bed7ff672d5b5e8b6fe389ed9620ce898a00bf6332370d38e
+DIST ACE+TAO+CIAO-5.8.3.tar.bz2 44653860 SHA256 db4e7722e8c931902b7781c6a17f6d22037c93edc979ab5581a59e4990e59562 SHA512 e062c1922ebec33eea7d55fbb97acc487cb2f0342a80312a5eeebe0d3e026df9632a1b2e93e146c308971c4cfc0189cf7cfbdadfb003493971c837b506e22184 WHIRLPOOL f36decf821a3943677b74b632d7ca17444646b5cb7b867128224fa1f8f4bfb10ce4515282ab671056529aa6f9dc96026709a08e16f4c90c2969c68e8ad82db5a
 DIST ACE+TAO-5.7.2.tar.bz2 26111373 SHA256 95d9bfe506bfe55e489863413d83f214d2f6948a836449ed4dce6cf8c7d05d1d SHA512 9c25bc3773dd92d943bf67595470a485be1d7ebe893ddf20ec55a77d66080cf755e0c5cdc77a8f53d49d1f2ae4ec03cdbc7ac0dc68e179467b8ce7ad3abb5387 WHIRLPOOL 02b575fc831e988164be3667f1c8b34ef7bd6c5fe131884d4443058a70ca68f975391e5b7efc56235e4d4b598879941fd6737a7a1d0448b837a512ee7269630e
+DIST ACE+TAO-5.8.3.tar.bz2 21366503 SHA256 d7b7a8c570b479959465a2b0fe5013933513958b36716c05327b256a63e7c9ae SHA512 9474251a0dff0659cf0951ad7ef48bf98503e6aa293121fecaaa6d4eba665dc557b17d004f4a589b13a45bccf9ddba893fc9ea454b257c7117d8747bbc04c886 WHIRLPOOL 17fe4a016cd4d5b25bda9041a9a6ccf4d9d4ba3daf0f7266c2e3f74797ee492b59b259313e7806d07d8d3768824e15fe06383a1769e060a8b3a62156fc49278a
 DIST ACE-5.7.2.tar.bz2 9724175 SHA256 e358281a93cbc932351030675fb7956875f996e0dc42cf1f499a2d5bd018e0ad SHA512 7f5d77ea9ab1f03ad615cf6b01cb75b0484c5e828790609b8492463153a34c62d974000c0f3952dfdab143cad3c0aa6e2ddc7ea089989b6e9b9797bc6430d38b WHIRLPOOL e57db857a3ca1411fe3bcf166b7aee059d8e07e752cdd919e9ca7a1766bea7562027752326a24937719da432323569f302360849d3976bd44f05f0bfb1ce0946
+DIST ACE-5.8.3.tar.bz2 8956345 SHA256 fabf53dd64674b80eee296cc95705f13866230c70bbac10f475e5a6169395b9d SHA512 3b1e0dfdd59dacbfd987499653e42ad41273de28bb5e920105b897567eed96f6e1b09a03c7f342277c2cf82231426b2bee4ed76ad98fec05e0fe589c9d86c469 WHIRLPOOL 61641e94452a538f90ded35c9b91030246566c3e90e9e7ea48831a7232d765de9207106a9ca58a7674a8e7631e8e8731e648fadb613995c87fe84181a0973105
diff --git a/dev-libs/ace/ace-5.8.3.ebuild b/dev-libs/ace/ace-5.8.3.ebuild
new file mode 100644
index 000000000000..66aa47cf3a2d
--- /dev/null
+++ b/dev-libs/ace/ace-5.8.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils multilib 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="ACE BSD BSD-4 BSD-2 tao? ( sun-iiop RSA )"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X ciao ipv6 static-libs tao"
+
+COMMON_DEPEND="dev-libs/openssl:0"
+# 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_prepare() {
+	sed -i \
+		-e 's:SSL_METHOD:const SSL_METHOD:' \
+		-e 's/-O3//' \
+		configure || die "sed on configure failed"
+	mkdir build || die
+	export ACE_ROOT="${S}"
+
+	epatch_user
+}
+
+src_configure() {
+	pushd build >/dev/null || die
+	ECONF_SOURCE="${S}"
+	econf \
+		--enable-lib-all \
+		$(use_with X) \
+		$(use_enable ipv6) \
+		$(use_enable static-libs static)
+	popd >/dev/null || die
+}
+
+src_compile() {
+	# --with-qos needs ACE_HAS_RAPI
+	emake -C build
+}
+
+src_install() {
+	emake -C build ACE_ROOT="${S}" DESTDIR="${D}" install
+	# 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" || die
+
+	# Install some docs
+	dodoc README NEWS ChangeLog AUTHORS VERSION
+
+	prune_libtool_files
+}
+
+src_test() {
+	emake -C build ACE_ROOT="${S}" check
+}
+
+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
+}