'debug' and 'gnutls' USE-flags added. Dependencies corrected.

Package-Manager: portage-2.1.2_pre3-r3

5 files changed, 107 insertions, 5 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 80f462729059..5201b6e83f93 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,9 @@
 # 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.22 2006/10/21 20:52:02 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.23 2006/10/22 15:59:12 dev-zero Exp $
+
+  22 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  'debug' and 'gnutls' USE-flags added. Dependencies corrected.
 
 *commoncpp2-1.5.1 (21 Oct 2006)
 
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index ce316ddae0d5..bf9b8d819d28 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,3 +1,7 @@
+AUX 1.5.1-ssl_config.patch 958 RMD160 9b367fc6ed6a49b41637706d79df44b2f62ce013 SHA1 b762f044b3ea612b9ec6afc08d96b486646be221 SHA256 f01447668daaa9f04f44a394a180b0964197f03753246065fbc62acecb78adc4
+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 ccext2-as-needed.diff 893 RMD160 9dc93f507cdba56606a68a47e890e60e77d96d17 SHA1 507af93d22d6042c0257887ea6a2383f9219b65d SHA256 62c807469a4deff1a2fbee11b4e0b92598377ebf75c607688c9add6c10a29497
 MD5 98f84e33428afb50ec8f62f093af919e files/ccext2-as-needed.diff 893
 RMD160 9dc93f507cdba56606a68a47e890e60e77d96d17 files/ccext2-as-needed.diff 893
@@ -8,14 +12,18 @@ EBUILD commoncpp2-1.3.1.ebuild 935 RMD160 cd7e96c746c44e285f066e7185434e0675b594
 MD5 f04993d53175cb214cf534ebf12e9dd9 commoncpp2-1.3.1.ebuild 935
 RMD160 cd7e96c746c44e285f066e7185434e0675b59448 commoncpp2-1.3.1.ebuild 935
 SHA256 cd802a616b0e65f8860ad4f38233d97ad6142aaf23caca91f87dcf76273f8fa7 commoncpp2-1.3.1.ebuild 935
+EBUILD commoncpp2-1.5.1-r1.ebuild 1511 RMD160 159f6859cf6b63bac56616edda378c4d44cc869a SHA1 5a2e817fa227e45d80f50d997c32c3531e1a8be5 SHA256 d959511b09d4cbe5d62303ab8b3213e1195a1d7c243802b382cdb87687166781
+MD5 ba4beb988f480d2507a0072ff4955588 commoncpp2-1.5.1-r1.ebuild 1511
+RMD160 159f6859cf6b63bac56616edda378c4d44cc869a commoncpp2-1.5.1-r1.ebuild 1511
+SHA256 d959511b09d4cbe5d62303ab8b3213e1195a1d7c243802b382cdb87687166781 commoncpp2-1.5.1-r1.ebuild 1511
 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 4090 RMD160 c93647ce7d18bbf86af19bedee2c231140718d3a SHA1 db8fa05598bff1d112f41bc53d6457644800ff37 SHA256 e5f88632b5982aaa5eeea33203a0c9f30b3ed23f15e5567a1a7ba1e41d45bf80
-MD5 41b4aefad9840724474b325c9558649e ChangeLog 4090
-RMD160 c93647ce7d18bbf86af19bedee2c231140718d3a ChangeLog 4090
-SHA256 e5f88632b5982aaa5eeea33203a0c9f30b3ed23f15e5567a1a7ba1e41d45bf80 ChangeLog 4090
+MISC ChangeLog 4220 RMD160 574ef3dc956631d954f43af809e26fb3a7cf950b SHA1 2fe6c09929c0d49fc1c522d7ae61693c310cb053 SHA256 4550835252dd22d47d42a020684a39f80dfba36dd8891ff8d7b869815fce2ee8
+MD5 2fb41a75d8c861893be81cb89249dce4 ChangeLog 4220
+RMD160 574ef3dc956631d954f43af809e26fb3a7cf950b ChangeLog 4220
+SHA256 4550835252dd22d47d42a020684a39f80dfba36dd8891ff8d7b869815fce2ee8 ChangeLog 4220
 MISC metadata.xml 245 RMD160 c63236f59109c6458b9a353b8b87d9ec99f4b8e1 SHA1 c877c9970ddb3d273e263d0f577e297717d98d37 SHA256 06519db08956741c3a6707ffe4d20a36de8cd559fdec316e08904a03193f8098
 MD5 9b2404bcf93a0418e748ec611550b00f metadata.xml 245
 RMD160 c63236f59109c6458b9a353b8b87d9ec99f4b8e1 metadata.xml 245
@@ -26,3 +34,6 @@ SHA256 f17d9d90e3f5677942ef25d8f701aa06b8a3031a8bd95e6ef7f34d10bd91d331 files/di
 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
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.5.1-r1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..38116e2b89b0
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.5.1-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2006/10/22 15:59:12 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://sourceforge/gnutelephony/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/commoncpp/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc ipv6 gnutls"
+
+RDEPEND="gnutls? ( dev-libs/libgcrypt
+		net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/ccext2-as-needed.diff"
+	epatch "${FILESDIR}/${PV}-ssl_config.patch"
+	eautoconf
+}
+
+src_compile() {
+	use doc || \
+		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
+
+	local myconf
+	if use gnutls ; then
+		myconf="--with-gnutls"
+	else
+		myconf="--with-openssl"
+	fi
+	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/*
+}
diff --git a/dev-cpp/commoncpp2/files/1.5.1-ssl_config.patch b/dev-cpp/commoncpp2/files/1.5.1-ssl_config.patch
new file mode 100644
index 000000000000..675e99960721
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.5.1-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-r1 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1-r1
new file mode 100644
index 000000000000..d9c6b02e1e54
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1-r1
@@ -0,0 +1,3 @@
+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