new version + fix for #134461

(Portage version: 2.1_rc2)

4 files changed, 73 insertions, 3 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 35a715b18072..86efd7131ea1 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/commoncpp2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.20 2006/04/27 14:49:46 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.21 2006/06/04 18:34:28 arj Exp $
+
+*commoncpp2-1.4.1 (04 Jun 2006)
+
+  16 Jan 2006; Anders Rune Jensen <arj@gentoo.org>
+  +commoncpp2-1.4.1.ebuild:
+  New version + fix from #134461
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-commoncpp2-1.3.1, files/digest-commoncpp2-1.3.13,
@@ -13,9 +19,9 @@
   commoncpp2-1.3.20-r1.ebuild, commoncpp2-1.3.22.ebuild:
   Change USE flag from xml2->xml
 
-*commoncpp2-1.3.20-r1 (16 Jan 2006)
+*commoncpp2-1.3.22 (16 Jan 2006)
 
-  16 Jan 2006; Anders RUne Jensen <arj@gentoo.org>
+  16 Jan 2006; Anders Rune Jensen <arj@gentoo.org>
   +commoncpp2-1.3.22.ebuild:
   New version. Fixes #118968
 
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.4.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.4.1.ebuild
new file mode 100644
index 000000000000..44057d4c9a4a
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.4.1.ebuild,v 1.1 2006/06/04 18:34:28 arj Exp $
+
+inherit eutils
+
+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://sourceforge/gnutelephony/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/commoncpp/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xml doc ipv6"
+
+DEPEND="xml? ( >=dev-libs/libxml2-2.6.19 )
+	doc? ( >=app-doc/doxygen-1.3.6 )"
+
+src_compile() {
+	use doc || \
+		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure
+
+	use xml && epatch ${FILESDIR}/ccext2-as-needed.diff
+
+	econf $(use_with xml) $(use_with ipv6 ) || die
+	emake || die
+}
+
+src_install () {
+	einstall || die
+
+	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/*
+}
+
diff --git a/dev-cpp/commoncpp2/files/ccext2-as-needed.diff b/dev-cpp/commoncpp2/files/ccext2-as-needed.diff
new file mode 100644
index 000000000000..e83b59509f83
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/ccext2-as-needed.diff
@@ -0,0 +1,22 @@
+--- src/Makefile.am.orig	2006-06-04 15:45:19.000000000 +0200
++++ src/Makefile.am	2006-06-04 15:46:10.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	private.h nat.h
+ 
+ if EXTRAS
+-libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
++libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ @XML_LIBS@
+ libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ 
+ if GETOPT_LONG
+--- src/Makefile.in.orig	2006-06-04 15:45:26.000000000 +0200
++++ src/Makefile.in	2006-06-04 15:46:36.000000000 +0200
+@@ -327,7 +327,7 @@
+ 	nat.cpp runlist.cpp assoc.cpp pointer.cpp linked.cpp map.cpp \
+ 	private.h nat.h
+ 
+-@EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@
++@EXTRAS_TRUE@libccext2_la_LIBADD = @BASE_LIB@ @THREAD_LIBS@ @XML_LIBS@
+ @EXTRAS_TRUE@libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ @EXTRAS_TRUE@@GETOPT_LONG_TRUE@optincludedir = $(includedir)/cc++2
+ @EXTRAS_TRUE@@GETOPT_LONG_TRUE@optinclude_HEADERS = getopt.h
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.4.1 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.4.1
new file mode 100644
index 000000000000..df32469b3c01
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.4.1
@@ -0,0 +1,3 @@
+MD5 4946d8c771f5f96d2951791e8ca76e23 commoncpp2-1.4.1.tar.gz 851308
+RMD160 d760f152ec16d8cb3940efadec79b3f03298cfb4 commoncpp2-1.4.1.tar.gz 851308
+SHA256 4aecbb568ec17da46306ea5f7e967a076b1af1c88414d4992bd7ee63022073de commoncpp2-1.4.1.tar.gz 851308