Version bump, fixes compile problems with gcc-4.2 (bug #187206). Added '-j1' to avoid parallel build problems (thanks to dragonheart)

(Portage version: 2.1.4_rc11)

4 files changed, 151 insertions, 1 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 258681d00a59..02f4e18b6fe2 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/commoncpp2
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.34 2007/08/16 09:52:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.35 2007/12/24 09:31:55 dev-zero Exp $
+
+*commoncpp2-1.6.1 (24 Dec 2007)
+
+  24 Dec 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.6.1-gcc42_atomicity.patch, +commoncpp2-1.6.1.ebuild:
+  Version bump, fixes compile problems with gcc-4.2 (bug #187206). Added '-j1'
+  to avoid parallel build problems (thanks to dragonheart)
 
   16 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   commoncpp2-1.5.7.ebuild:
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
new file mode 100644
index 000000000000..23c10c564eab
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild,v 1.1 2007/12/24 09:31:55 dev-zero Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/commoncpp/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc examples ipv6 gnutls"
+
+RDEPEND="gnutls? ( dev-libs/libgcrypt
+		net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )
+	sys-libs/zlib"
+DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-gcc42_atomicity.patch"
+	eautoconf
+}
+
+src_compile() {
+	use doc || \
+		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
+
+	local myconf
+	use gnutls || myconf="--with-openssl"
+
+	econf \
+		$(use_enable debug) \
+		$(use_with ipv6 ) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS NEWS ChangeLog README THANKS TODO COPYING.addendum
+
+	# Only install html docs
+	# man and latex available, but seems a little wasteful
+	use doc && dohtml doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		cd demo
+		doins *.cpp *.h *.xml README
+	fi
+}
+
+# Some of the tests hang forever
+#src_test() {
+#	cd "${S}/tests"
+#	emake || die "emake tests failed"
+#	./test.sh || die "tests failed"
+#}
diff --git a/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch b/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch
new file mode 100644
index 000000000000..423defe8f7ac
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch
@@ -0,0 +1,75 @@
+diff -Naur commoncpp2-1.6.1.orig/config.h.in commoncpp2-1.6.1/config.h.in
+--- commoncpp2-1.6.1.orig/config.h.in	2007-12-24 09:45:11.000000000 +0100
++++ commoncpp2-1.6.1/config.h.in	2007-12-24 10:25:43.000000000 +0100
+@@ -239,6 +239,9 @@
+ /* Define to 1 if you have the <bits/atomicity.h> header file. */
+ #undef HAVE_BITS_ATOMICITY_H
+ 
++/* Define to 1 if you have the <ext/atomicity.h> header file. */
++#undef HAVE_EXT_ATOMICITY_H
++
+ /* Define to 1 if you have the <bits/wordsize.h> header file. */
+ #undef HAVE_BITS_WORDSIZE_H
+ 
+@@ -1088,7 +1091,11 @@
+ 
+ #if defined(__cplusplus)
+ #if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC)
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
++#include <ext/atomicity.h>
++#else
+ #include <bits/atomicity.h>
++#endif
+ #define HAVE_ATOMIC
+ #endif
+ #endif
+diff -Naur commoncpp2-1.6.1.orig/m4/ost_pthread.m4 commoncpp2-1.6.1/m4/ost_pthread.m4
+--- commoncpp2-1.6.1.orig/m4/ost_pthread.m4	2007-12-24 09:45:11.000000000 +0100
++++ commoncpp2-1.6.1/m4/ost_pthread.m4	2007-12-24 10:12:24.000000000 +0100
+@@ -92,7 +92,9 @@
+   dnl check for gcc's bits/atomicity and the atomic functions therein
+   AC_CHECK_HEADERS([bits/atomicity.h],
+ 	ost_cv_bits_atomicity=yes,
+-	ost_cv_bits_atomicity=no)
++	[AC_CHECK_HEADERS([ext/atomicity.h],
++		ost_cv_bits_atomicity=yes,
++		ost_cv_bits_atomicity=no)])
+   if test $ost_cv_bits_atomicity = yes ; then
+       AC_MSG_CHECKING([for _Atomic_word])
+       AC_TRY_COMPILE([#include <bits/atomicity.h>],
+@@ -103,7 +105,15 @@
+ 	    ],
+ 	    [ost_cv_gcc_atomic=yes
+ 	     AC_DEFINE(HAVE_GCC_BITS_ATOMIC, [1], [has gcc atomic functions])],
+-	    [ost_cv_gcc_atomic=no])
++	    [AC_TRY_COMPILE([#include <ext/atomicity.h>],
++		    [
++		    _Atomic_word i = 0;
++		    __atomic_add(&i, 1);
++		    __exchange_and_add(&i, 1);
++		    ],
++		    [ost_cv_gcc_atomic=yes
++		    AC_DEFINE(HAVE_GCC_BITS_ATOMIC, [1], [has gcc atomic functions])],
++		    [ost_cv_gcc_atomic=no])])
+       AC_MSG_RESULT($ost_cv_gcc_atomic)
+ 
+       AC_MSG_CHECKING([for __gnu_cxx::_Atomic_word])
+@@ -117,7 +127,17 @@
+ 	    [ost_cv_gcc_cxx_atomic=yes
+ 	     AC_DEFINE(HAVE_GCC_CXX_BITS_ATOMIC, [1], 
+ 		[has __gnu_cxx atomic functions])],
+-	    [ost_cv_gcc_cxx_atomic=no])
++	    [AC_TRY_COMPILE([#include <ext/atomicity.h>],
++		    [
++		    using namespace __gnu_cxx;
++		    _Atomic_word i = 0;
++		    __atomic_add(&i, 1);
++		    __exchange_and_add(&i, 1);
++		    ],
++		    [ost_cv_gcc_cxx_atomic=yes
++		     AC_DEFINE(HAVE_GCC_CXX_BITS_ATOMIC, [1], 
++			[has __gnu_cxx atomic functions])],
++		    [ost_cv_gcc_cxx_atomic=no])])
+       AC_MSG_RESULT($ost_cv_gcc_cxx_atomic)
+   fi
+ 
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.6.1 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.6.1
new file mode 100644
index 000000000000..302fcd23f46b
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.6.1
@@ -0,0 +1,3 @@
+MD5 2ebd8eb80996515be0385378da783091 commoncpp2-1.6.1.tar.gz 864006
+RMD160 ed78367610464fc5cff488f29f9371636098b55c commoncpp2-1.6.1.tar.gz 864006
+SHA256 54dd187608917fa7f3368b70e637c27fe2d0b2996463d6ef6373f1b9f99bbeb2 commoncpp2-1.6.1.tar.gz 864006