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

Package-Manager: portage-2.1.4_rc11

5 files changed, 167 insertions, 5 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/Manifest b/dev-cpp/commoncpp2/Manifest
index 17c3dd1d239c..207828facd13 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -10,6 +10,10 @@ AUX 1.5.7-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 S
 MD5 19e8c5d30a29269e4a3b5a0f5f6a927b files/1.5.7-ssl_config.patch 958
 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 files/1.5.7-ssl_config.patch 958
 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4 files/1.5.7-ssl_config.patch 958
+AUX 1.6.1-gcc42_atomicity.patch 2639 RMD160 0916103aaba35a52489e31dd51b772b7884580a9 SHA1 8bee6826e92d5706c6589a86b61498b59c2caff5 SHA256 8675d295fc33c3468d4ec33dfc3f6ff6114b939c03f45f6f026bfa5bc2293587
+MD5 755e77e67c2382a527a9bfbe9b67f23f files/1.6.1-gcc42_atomicity.patch 2639
+RMD160 0916103aaba35a52489e31dd51b772b7884580a9 files/1.6.1-gcc42_atomicity.patch 2639
+SHA256 8675d295fc33c3468d4ec33dfc3f6ff6114b939c03f45f6f026bfa5bc2293587 files/1.6.1-gcc42_atomicity.patch 2639
 AUX ccext2-as-needed.diff 923 RMD160 f64b0b12d1065ce5800004e6584ddc3f9cf8788e SHA1 9a6ef5c185bf6b7a8b6e6a8349d8b6ccbc46e59e SHA256 ca9578232c15668237176f594c4147a588b609d3f52212b27b0fafda9f4080b9
 MD5 e7b92afa5a4ce1a6ec7ba74bbbaa2f5c files/ccext2-as-needed.diff 923
 RMD160 f64b0b12d1065ce5800004e6584ddc3f9cf8788e files/ccext2-as-needed.diff 923
@@ -21,6 +25,7 @@ SHA256 234b12b446c22c0fe85971e76b267fa6eb92222f5df90fd935be3a219b83b63d files/cc
 DIST commoncpp2-1.3.1.tar.gz 808549 RMD160 5b87314650ca89f55f2d740c4dd98a167ae36c60 SHA1 e0f3ab69dcf81f971ce7fde219c73ada5bc0d8f7 SHA256 2044e36db76614e82f273a75b92894826ff13e222b22009d1a593af971c2027c
 DIST commoncpp2-1.5.1.tar.gz 862555 RMD160 ebfc941ea65bbf10f8d6485945748066280719b9 SHA1 aa529ef1f7b886c320fe455a12ff355d80bc7890 SHA256 32e37df5f089c63d95a150b465d925ea33609c1fe3de952efbdca91add8c45d0
 DIST commoncpp2-1.5.7.tar.gz 858598 RMD160 897076e80a9d6acca1c7f11dd1dc94c3a32fc73b SHA1 f0d522bbbba279c2c5520fa411c78ea7b4814846 SHA256 95b0e86c27db1ec0b79abe4097f4449f1e15dde1870202ead0551c506269a504
+DIST commoncpp2-1.6.1.tar.gz 864006 RMD160 ed78367610464fc5cff488f29f9371636098b55c SHA1 f72956dee03c0b83dd6ef77b905ff6a98163c963 SHA256 54dd187608917fa7f3368b70e637c27fe2d0b2996463d6ef6373f1b9f99bbeb2
 EBUILD commoncpp2-1.3.1.ebuild 935 RMD160 cd7e96c746c44e285f066e7185434e0675b59448 SHA1 a934aec23a6d04d008c7a23c66986ee6cfd101ea SHA256 cd802a616b0e65f8860ad4f38233d97ad6142aaf23caca91f87dcf76273f8fa7
 MD5 f04993d53175cb214cf534ebf12e9dd9 commoncpp2-1.3.1.ebuild 935
 RMD160 cd7e96c746c44e285f066e7185434e0675b59448 commoncpp2-1.3.1.ebuild 935
@@ -33,10 +38,14 @@ EBUILD commoncpp2-1.5.7.ebuild 1724 RMD160 4baff74c86748a37622f68b5e3706893c740d
 MD5 c8e4a0d6690f259b0268a4eb7d22411c commoncpp2-1.5.7.ebuild 1724
 RMD160 4baff74c86748a37622f68b5e3706893c740d246 commoncpp2-1.5.7.ebuild 1724
 SHA256 388c7535c960e201215641ced79ace228916c2e71e5f9087ba35494238e83426 commoncpp2-1.5.7.ebuild 1724
-MISC ChangeLog 5673 RMD160 a060107bb9db008be8c92bf31638daf86f5c7bdd SHA1 314c4348b7f634ec41a9c1a0ce6d45bf96965959 SHA256 4043ccf322a70d060663f4f11bd75da0d8f1c921e835ef585d9d2f2acc4b200c
-MD5 1a56beb56173aade6a1d10957676bc5b ChangeLog 5673
-RMD160 a060107bb9db008be8c92bf31638daf86f5c7bdd ChangeLog 5673
-SHA256 4043ccf322a70d060663f4f11bd75da0d8f1c921e835ef585d9d2f2acc4b200c ChangeLog 5673
+EBUILD commoncpp2-1.6.1.ebuild 1674 RMD160 97ad9cb984250ee09b1eecae059e32fbf3a88665 SHA1 084826744b866d83f6fecda10196fc2de464acee SHA256 715e05aeddf536b527a445046d23c117f06dab214578aa5c772aa77d80663c47
+MD5 64efff6e6ee950a02f62333fa97de129 commoncpp2-1.6.1.ebuild 1674
+RMD160 97ad9cb984250ee09b1eecae059e32fbf3a88665 commoncpp2-1.6.1.ebuild 1674
+SHA256 715e05aeddf536b527a445046d23c117f06dab214578aa5c772aa77d80663c47 commoncpp2-1.6.1.ebuild 1674
+MISC ChangeLog 5960 RMD160 386cd09deb5b7ebb3c7f84de15d73265b53ea880 SHA1 d855e74940bc7c296b11fb6c005f7a94754ef96b SHA256 2a7d43ecaf9973eae3baed988fcd9c15644a033169af0d4997f4dccfae6d04ba
+MD5 a4c8ce3cab5897befe0e2e1a8570839e ChangeLog 5960
+RMD160 386cd09deb5b7ebb3c7f84de15d73265b53ea880 ChangeLog 5960
+SHA256 2a7d43ecaf9973eae3baed988fcd9c15644a033169af0d4997f4dccfae6d04ba ChangeLog 5960
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
@@ -50,3 +59,6 @@ SHA256 48506e0f2c47f9b6af57dfd91706babf2826751c01afb2f41f2ed629be007e99 files/di
 MD5 6784c189ce72a015a24cf1e8f8af7ad2 files/digest-commoncpp2-1.5.7 250
 RMD160 9569323acef2194dd9647a2f8df0d09f25e9e4f1 files/digest-commoncpp2-1.5.7 250
 SHA256 a052e6f8c78ecf4c0bafadf60a8677d50a1e06a463182485a6490d602ff40bb9 files/digest-commoncpp2-1.5.7 250
+MD5 034751efe6bb3d51a24f88ed1132fcff files/digest-commoncpp2-1.6.1 250
+RMD160 f3926e6d9cdd4c4fbe1a7b2d266b8118d6996c92 files/digest-commoncpp2-1.6.1 250
+SHA256 9725c0f032a58594eeaa9061de7c1ce22e233ea1fa6f1bd530110d2021b588da files/digest-commoncpp2-1.6.1 250
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