Version bump (fixes bug #179520)

Package-Manager: portage-2.1.2.10

8 files changed, 161 insertions, 62 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 7edb412bdf8d..96576be11ca1 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.29 2007/02/22 00:59:22 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.30 2007/06/16 14:02:24 dev-zero Exp $
+
+*commoncpp2-1.5.7 (16 Jun 2007)
+
+  16 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.5.7-as-needed.patch, +files/1.5.7-ssl_config.patch,
+  -commoncpp2-1.5.1.ebuild, +commoncpp2-1.5.7.ebuild:
+  Version bump (fixes bug #179520)
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 2416e945b959..92b4c18d4ddb 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -2,6 +2,14 @@ AUX 1.5.1-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 S
 MD5 19e8c5d30a29269e4a3b5a0f5f6a927b files/1.5.1-ssl_config.patch 958
 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 files/1.5.1-ssl_config.patch 958
 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4 files/1.5.1-ssl_config.patch 958
+AUX 1.5.7-as-needed.patch 1239 RMD160 d14377eeab863f860b9a5e745967179f0f69614f SHA1 0dd6fa600100d99fffd3e37e1dcf14c19d77866a SHA256 1e432c954cc1b6283f087c990ddab74c92d74631608039b1c8f9bd6b4a4827ec
+MD5 02c2f29f4ff2386757fb2f98270078a5 files/1.5.7-as-needed.patch 1239
+RMD160 d14377eeab863f860b9a5e745967179f0f69614f files/1.5.7-as-needed.patch 1239
+SHA256 1e432c954cc1b6283f087c990ddab74c92d74631608039b1c8f9bd6b4a4827ec files/1.5.7-as-needed.patch 1239
+AUX 1.5.7-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 SHA1 b762f044b3ea612b9ec6afc08d96b486646be221 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4
+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 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
@@ -12,6 +20,7 @@ RMD160 b692d7e5fcac388b54a7b178c552e3a3321408a3 files/ccgnu2-as-needed.diff 456
 SHA256 234b12b446c22c0fe85971e76b267fa6eb92222f5df90fd935be3a219b83b63d files/ccgnu2-as-needed.diff 456
 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
 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
@@ -20,14 +29,14 @@ EBUILD commoncpp2-1.5.1-r1.ebuild 1670 RMD160 cc1d5c1d5d8ab685a16f5f82b33dd1e421
 MD5 0ea8eccc031091dba97d54a032bc41ac commoncpp2-1.5.1-r1.ebuild 1670
 RMD160 cc1d5c1d5d8ab685a16f5f82b33dd1e4210f573c commoncpp2-1.5.1-r1.ebuild 1670
 SHA256 45a6931f86fc3434e7a55478650e7e1383231b3ea58271afe37cbe46739cb59c commoncpp2-1.5.1-r1.ebuild 1670
-EBUILD commoncpp2-1.5.1.ebuild 1207 RMD160 e998ab44e071ca3c9e7420f03201334cf98785e8 SHA1 b6697ca5b57c881ba8c8d4efac8e0170bd8f0448 SHA256 abf00f4601126d97219e13e2dd5a7e15e547cfc12d9803ce7ee642ee408ea6fd
-MD5 4ac68638bd5381561b1ff3a5c0787b48 commoncpp2-1.5.1.ebuild 1207
-RMD160 e998ab44e071ca3c9e7420f03201334cf98785e8 commoncpp2-1.5.1.ebuild 1207
-SHA256 abf00f4601126d97219e13e2dd5a7e15e547cfc12d9803ce7ee642ee408ea6fd commoncpp2-1.5.1.ebuild 1207
-MISC ChangeLog 4964 RMD160 e249255669d132354458d22f06b7bc74531a1cbe SHA1 b136a60e16716ab3f8e60728aa945687444a6c0f SHA256 53cfd33552492a7f10c515cb6d2c009e06ebe48494addc176aea97a6ffc9ae0c
-MD5 afd183455275e5deca04b9bdb129026c ChangeLog 4964
-RMD160 e249255669d132354458d22f06b7bc74531a1cbe ChangeLog 4964
-SHA256 53cfd33552492a7f10c515cb6d2c009e06ebe48494addc176aea97a6ffc9ae0c ChangeLog 4964
+EBUILD commoncpp2-1.5.7.ebuild 1708 RMD160 871bffe4184a2528df33333f80ce2333126dc7bc SHA1 44ade2400438fcf0affa63c3b16c1a90f4f0c596 SHA256 49d6104a3ae92dc916ad5831e5e9893cb69b22e2fe983b7c899ea1ba2593bf5a
+MD5 7d0884733d04ab893bfdfbee8cc7054b commoncpp2-1.5.7.ebuild 1708
+RMD160 871bffe4184a2528df33333f80ce2333126dc7bc commoncpp2-1.5.7.ebuild 1708
+SHA256 49d6104a3ae92dc916ad5831e5e9893cb69b22e2fe983b7c899ea1ba2593bf5a commoncpp2-1.5.7.ebuild 1708
+MISC ChangeLog 5206 RMD160 9b7a050e9574db34989429daac0fc9a96072a72f SHA1 7c03502876aa22e8cd26b3f797d9f6e633718b90 SHA256 a0ec8bf534e93940f64f9cd16472943013fc1f747f3df57ea69b4e174628801f
+MD5 4a1b240359b05286828fd65617b3f0a9 ChangeLog 5206
+RMD160 9b7a050e9574db34989429daac0fc9a96072a72f ChangeLog 5206
+SHA256 a0ec8bf534e93940f64f9cd16472943013fc1f747f3df57ea69b4e174628801f ChangeLog 5206
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
 RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
@@ -35,9 +44,9 @@ SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata
 MD5 2f0c778fb7fec6e4e538f8395f95ff91 files/digest-commoncpp2-1.3.1 250
 RMD160 abf89ac0d6aece786bd715eff3b2094760a3afdb files/digest-commoncpp2-1.3.1 250
 SHA256 f17d9d90e3f5677942ef25d8f701aa06b8a3031a8bd95e6ef7f34d10bd91d331 files/digest-commoncpp2-1.3.1 250
-MD5 5d6a772e03afdb3dc41fe2c8ec747b31 files/digest-commoncpp2-1.5.1 250
-RMD160 7f28bb839f6aeb315a0d4f1aea4325dedf048d3a files/digest-commoncpp2-1.5.1 250
-SHA256 48506e0f2c47f9b6af57dfd91706babf2826751c01afb2f41f2ed629be007e99 files/digest-commoncpp2-1.5.1 250
 MD5 5d6a772e03afdb3dc41fe2c8ec747b31 files/digest-commoncpp2-1.5.1-r1 250
 RMD160 7f28bb839f6aeb315a0d4f1aea4325dedf048d3a files/digest-commoncpp2-1.5.1-r1 250
 SHA256 48506e0f2c47f9b6af57dfd91706babf2826751c01afb2f41f2ed629be007e99 files/digest-commoncpp2-1.5.1-r1 250
+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
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.5.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.5.1.ebuild
deleted file mode 100644
index 463648f30479..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.5.1.ebuild,v 1.1 2006/10/21 20:52:02 genstef 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="doc ipv6"
-
-DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
-	dev-libs/libgcrypt
-	net-libs/gnutls"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/ccext2-as-needed.diff
-}
-
-src_compile() {
-	use doc \
-		|| sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure
-	econf \
-		$(use_with ipv6) \
-		|| die "econf failed"
-
-	emake || 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/*
-}
-
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild
new file mode 100644
index 000000000000..0a164087aca8
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.5.7.ebuild
@@ -0,0 +1,66 @@
+# 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.5.7.ebuild,v 1.1 2007/06/16 14:02:24 dev-zero Exp $
+
+inherit autotools 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://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}-as-needed.patch"
+	epatch "${FILESDIR}/${PV}-ssl_config.patch"
+	AT_M4DIR="m4"
+	eautoreconf
+}
+
+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 || 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
+}
+
+# Don't work...
+#src_test() {
+#	cd "${S}/tests"
+#	emake || die "emake tests failed"
+#	./test.sh || die "tests failed"
+#}
diff --git a/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
new file mode 100644
index 000000000000..a1d20c610198
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
@@ -0,0 +1,35 @@
+diff -Naur commoncpp2-1.5.7.orig/configure.ac commoncpp2-1.5.7/configure.ac
+--- commoncpp2-1.5.7.orig/configure.ac	2007-06-16 15:23:05.000000000 +0200
++++ commoncpp2-1.5.7/configure.ac	2007-06-16 15:24:39.000000000 +0200
+@@ -357,6 +357,9 @@
+ darwin*)
+ 	MODULE_FLAGS="-dynamic -bundle -undefined suppress -flat_namespace -read_only_relocs suppress"
+ 	;;
++linux*)
++	BASE_LIB="../src/libccgnu2.la"
++	;;
+ esac
+ 
+ AC_SUBST(COMMON_FLAGS)
+diff -Naur commoncpp2-1.5.7.orig/src/Makefile.am commoncpp2-1.5.7/src/Makefile.am
+--- commoncpp2-1.5.7.orig/src/Makefile.am	2007-06-16 15:23:05.000000000 +0200
++++ commoncpp2-1.5.7/src/Makefile.am	2007-06-16 15:23:32.000000000 +0200
+@@ -32,7 +32,7 @@
+ scriptdir = $(bindir)
+ script_DATA = ccgnu2-config
+ 
+-libccgnu2_la_LIBADD = @THREAD_LIBS@
++libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@
+ libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ noinst_DATA = @STAGE2@
+ 
+@@ -45,7 +45,8 @@
+ 	cidr.cpp private.h nat.h
+ 
+ if EXTRAS
+-libccext2_la_LDFLAGS = @BASE_LIB@ @THREAD_LIBS@ @SSL_LIBS@ @ZSTREAM_LIBS@ $(RELEASE) $(SHARED_FLAGS)
++libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
++libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ 
+ if GETOPT_LONG
+ optincludedir=$(includedir)/cc++2
diff --git a/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch b/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch
new file mode 100644
index 000000000000..675e99960721
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2006-10-22 18:02:57.000000000 +0200
++++ configure.ac	2006-10-22 18:06:17.000000000 +0200
+@@ -247,6 +247,7 @@
+ 	ost_cv_extras=yes
+ 	AC_DEFINE(HAVE_EXTRAS, [1], [Enable extras])
+ 
++	AC_ARG_WITH(gnutls, [  --with-gnutls         Enable gnutls support], [
+ 	AC_CHECK_HEADER(gnutls/gnutls.h,[
+ 		AC_CHECK_LIB(gnutls, gnutls_init, [
+                         SSL_LIBS="-lgnutls -lgcrypt"
+@@ -254,13 +255,12 @@
+                         AC_DEFINE(CCXX_SSL, [GNUTLS], [defines ssl])
+                         AC_DEFINE(CCXX_GNUTLS, [1], [define gnutls])
+ 		])
+-
+-	],[
+-		AC_ARG_WITH(openssl, [  --with-openssl       Enable openssl support],
+-			[OST_LIB_SSL],
+-			[OST_LIB_NOSSL])
++	],[])
++	], [
++	AC_ARG_WITH(openssl, [  --with-openssl       Enable openssl support],
++		[OST_LIB_SSL],
++		[OST_LIB_NOSSL])
+ 	])
+-
+ 	AC_ARG_WITH(compression, [  --without-compression   Disable libz compression],
+         	[OST_LIB_NOZLIB],
+         	[OST_LIB_ZLIB])
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1
deleted file mode 100644
index d9c6b02e1e54..000000000000
--- a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2b1f011029de128496c33424f145864 commoncpp2-1.5.1.tar.gz 862555
-RMD160 ebfc941ea65bbf10f8d6485945748066280719b9 commoncpp2-1.5.1.tar.gz 862555
-SHA256 32e37df5f089c63d95a150b465d925ea33609c1fe3de952efbdca91add8c45d0 commoncpp2-1.5.1.tar.gz 862555
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7
new file mode 100644
index 000000000000..e4388dad2c83
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7
@@ -0,0 +1,3 @@
+MD5 bd85e157e1f4f457e9137c59d40a13fb commoncpp2-1.5.7.tar.gz 858598
+RMD160 897076e80a9d6acca1c7f11dd1dc94c3a32fc73b commoncpp2-1.5.7.tar.gz 858598
+SHA256 95b0e86c27db1ec0b79abe4097f4449f1e15dde1870202ead0551c506269a504 commoncpp2-1.5.7.tar.gz 858598