Version bump to fix gcc-3.4 compile problems. Noted in bug #71903

9 files changed, 107 insertions, 24 deletions

diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index e78762d7845f..8034bc343438 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/ace
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.25 2004/12/20 01:34:53 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.26 2005/01/02 04:45:19 dragonheart Exp $
+
+*ace-5.4.3 (02 Jan 2005)
+
+  02 Jan 2005; Daniel Black <dragonheart@gentoo.org> +ace-5.4.3.ebuild,
+  +metadata.xml:
+  Version bump to fix gcc-3.4 compile problems. Noted in bug #71903 by  
+  Arkadi Shishlov <arkadi@it.lv>. Added myself and Michael Imhof as 
+  maintainters in the metadata.xml
 
   20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ace-5.4-r2.ebuild:
   Stable on alpha.
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 7a0e32398943..eb0cb01ffbfc 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7792dc5cfc9a03c61a2f34120579dd6b ChangeLog 2738
-MD5 4621efd43833273d01025f6118adef0f ace-5.4.ebuild 2182
-MD5 7e09165295522bd04a4667121475d6a5 ace-5.4-r2.ebuild 2581
 MD5 22c3bc48a181192de9d16fb670357ee3 ace-5.4-r1.ebuild 2509
+MD5 7e09165295522bd04a4667121475d6a5 ace-5.4-r2.ebuild 2581
 MD5 a202d56fd3622b28877ec98d87c14273 ace-5.3.ebuild 2036
+MD5 8281b8ff00d0ff8a808567f46b9a7dac ace-5.4.3.ebuild 1859
+MD5 4621efd43833273d01025f6118adef0f ace-5.4.ebuild 2182
+MD5 ddba1cdc82520fb02af21a7a3bbf102d files/digest-ace-5.4.3 63
+MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r1 61
 MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r2 61
-MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4 61
+MD5 6dd0e2bcf23864cff58546190947ceec files/ace-5.4.2-makefilefix.patch 2263
 MD5 b88f6bda8016adf15d1660b3f1e0312e files/digest-ace-5.3 60
-MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxixGugEuf3OQ0akRAjTWAJ4xDd4FO0yPOtwmfQAGqCwdNO2DBQCeK/F1
-gEnsJ88EM8ex9u4/J7TbhJ4=
-=kNTy
------END PGP SIGNATURE-----
+MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4 61
diff --git a/dev-libs/ace/ace-5.3.ebuild b/dev-libs/ace/ace-5.3.ebuild
index 3b324942df4b..e35a7a07ebce 100644
--- a/dev-libs/ace/ace-5.3.ebuild
+++ b/dev-libs/ace/ace-5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.6 2004/07/02 04:33:25 eradicator Exp $
+# $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"
diff --git a/dev-libs/ace/ace-5.4-r1.ebuild b/dev-libs/ace/ace-5.4-r1.ebuild
index fdf5a66a3cf0..db2938912e60 100644
--- a/dev-libs/ace/ace-5.4-r1.ebuild
+++ b/dev-libs/ace/ace-5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/11/15 19:28:41 gustavoz Exp $
+# $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"
diff --git a/dev-libs/ace/ace-5.4-r2.ebuild b/dev-libs/ace/ace-5.4-r2.ebuild
index 152577226094..17c9690e7591 100644
--- a/dev-libs/ace/ace-5.4-r2.ebuild
+++ b/dev-libs/ace/ace-5.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r2.ebuild,v 1.3 2004/12/20 01:34:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4-r2.ebuild,v 1.4 2005/01/02 04:45:19 dragonheart Exp $
 
 S=${WORKDIR}/ACE_wrappers
 DESCRIPTION="The Adaptive Communications Environment"
diff --git a/dev-libs/ace/ace-5.4.3.ebuild b/dev-libs/ace/ace-5.4.3.ebuild
new file mode 100644
index 000000000000..279892cef589
--- /dev/null
+++ b/dev-libs/ace/ace-5.4.3.ebuild
@@ -0,0 +1,65 @@
+# 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 $
+
+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 X ssl"
+
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+
+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
+	cd ${S}/include/makeinclude
+	sed -e "s:-O3:${CFLAGS}:" platform_linux.GNU >platform_macros.GNU
+	sed -i -e "s:-O3::" ${S}/configure
+}
+
+src_compile() {
+	export ACE_ROOT=${S}
+	mkdir build
+	cd build
+	ECONF_SOURCE=${S}
+	econf --enable-lib-all `use_with X` `use_with ssl`
+	# --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
index 754708a63727..5b447e531447 100644
--- a/dev-libs/ace/ace-5.4.ebuild
+++ b/dev-libs/ace/ace-5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5 2004/07/02 04:33:25 eradicator Exp $
+# $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"
diff --git a/dev-libs/ace/files/digest-ace-5.4.3 b/dev-libs/ace/files/digest-ace-5.4.3
new file mode 100644
index 000000000000..95c131156746
--- /dev/null
+++ b/dev-libs/ace/files/digest-ace-5.4.3
@@ -0,0 +1 @@
+MD5 4eeb3434ff0b00750331abd7bf187f10 ACE-5.4.3.tar.bz2 6832839
diff --git a/dev-libs/ace/metadata.xml b/dev-libs/ace/metadata.xml
new file mode 100644
index 000000000000..a377c45d2321
--- /dev/null
+++ b/dev-libs/ace/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+    <email>tanitive@gentoo.org</email>
+    <name>Michael Imhof</name>
+</maintainer>
+<maintainer>
+    <email>dragonheart@gentoo.org</email>
+    <name>Daniel Black</name>
+    <description>I just happened to fix this once or twice. Please take over if you want it
+    </description>
+</maintainer>
+<longdescription></longdescription>
+</pkgmetadata>