new version

(Portage version: 2.0.53_rc6)

9 files changed, 27 insertions, 95 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index a76dd1345fd9..7b703c420d63 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/commoncpp2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.15 2005/09/20 18:30:29 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.16 2005/10/30 20:33:38 arj Exp $
+
+*commoncpp2-1.3.20 (30 Oct 2005)
+
+  30 Oct 2005; Anders Rune Jensen <arj@gentoo.org>
+  +commoncpp2-1.3.20.ebuild. -commoncpp2-1.3.0.ebuild,
+  -commoncpp2-1.2.5.ebuild, -commoncpp2-1.0.13.ebuild:
+  version bump and add doc flag; Closes #109145. Remove old versions.
 
   20 Sep 2005; Anders Rune Jensen <arj@gentoo.org> commoncpp2-1.3.13.ebuild,
   commoncpp2-1.3.1.ebuild:
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 96869063e2d4..449bbe3d0bef 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,12 +1,14 @@
-MD5 9b2404bcf93a0418e748ec611550b00f metadata.xml 245
+MD5 f25f230dcb501712ee807fd62e1e2be2 ChangeLog 2592
 MD5 439188ea7d940e87e9a73074fe677c7d commoncpp2-1.0.13.ebuild 1116
-MD5 48b3a9012a35172f62f97fd70398a25f commoncpp2-1.3.0.ebuild 1008
 MD5 436fda5fa8821aa716c0e7904a070a54 commoncpp2-1.2.5.ebuild 1007
+MD5 48b3a9012a35172f62f97fd70398a25f commoncpp2-1.3.0.ebuild 1008
 MD5 7a0c4df125348dd52f15164d617b639a commoncpp2-1.3.1.ebuild 1015
 MD5 80cb3c94e24416e019030be54bf3933b commoncpp2-1.3.13.ebuild 1026
-MD5 f25f230dcb501712ee807fd62e1e2be2 ChangeLog 2592
+MD5 bf15124cc0338f55fd9d0e395e70c052 commoncpp2-1.3.20.ebuild 968
 MD5 781ce9f97c4496dcb0ec078a74cba8d2 files/digest-commoncpp2-1.0.13 69
-MD5 24b577b86d1c3649917142f48079a7d9 files/digest-commoncpp2-1.3.13 69
 MD5 6990ef52b125e72e39312b276bb91b15 files/digest-commoncpp2-1.2.5 68
 MD5 a5251c2c33ea6e211308f6945cb2d4a6 files/digest-commoncpp2-1.3.0 68
 MD5 989863ac3c644b855628421d81012679 files/digest-commoncpp2-1.3.1 68
+MD5 24b577b86d1c3649917142f48079a7d9 files/digest-commoncpp2-1.3.13 69
+MD5 c895d9a7cdc2548a180bd0db5f02d1d7 files/digest-commoncpp2-1.3.20 69
+MD5 9b2404bcf93a0418e748ec611550b00f metadata.xml 245
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.0.13.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.0.13.ebuild
deleted file mode 100644
index 14e0d0455935..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.0.13.ebuild,v 1.7 2005/01/01 17:25:32 eradicator Exp $
-
-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/commonc++/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/commonc++/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc xml2"
-
-DEPEND="xml2? ( dev-libs/libxml2 )
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local myconf=
-
-	use xml2 \
-		&& myconf="${myconf} --with-xml" \
-		|| myconf="${myconf} --without-xml"
-
-	econf ${myconf} --with-ftp || die "./configure failed"
-
-	emake || die
-
-	# kdoc disabled for now, it errors out
-	use doc && make doxy
-}
-
-src_install () {
-	einstall || die
-
-	dodoc AUTHORS INSTALL NEWS ChangeLog README\
-		THANKS TODO COPYING 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.3.0.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.0.ebuild
deleted file mode 100644
index 3856fc1fc6be..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.0.ebuild,v 1.2 2005/01/01 17:25:32 eradicator Exp $
-
-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/cplusplus/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/commoncpp/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc xml2"
-
-DEPEND="xml2? ( dev-libs/libxml2 )"
-
-src_compile() {
-	use xml2 \
-		&& myconf="${myconf} --with-xml" \
-		|| myconf="${myconf} --without-xml"
-
-	econf ${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install () {
-	einstall || die
-
-	dodoc AUTHORS INSTALL NEWS ChangeLog README\
-		THANKS TODO COPYING 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.2.5.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild
index 32e9e7997264..5dba5bd11e91 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.2.5.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.2.5.ebuild,v 1.3 2005/01/01 17:25:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.3.20.ebuild,v 1.1 2005/10/30 20:33:38 arj Exp $
 
 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/cplusplus/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gnutelephony/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="doc xml2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xml2 doc"
 
-DEPEND="xml2? ( dev-libs/libxml2 )"
+DEPEND="xml2? ( >=dev-libs/libxml2-2.6.19 )
+	doc? ( >=app-doc/doxygen-1.3.6 )"
 
 src_compile() {
-	use xml2 \
-		&& myconf="${myconf} --with-xml" \
-		|| myconf="${myconf} --without-xml"
-
-	econf ${myconf} || die "./configure failed"
+	# Save some time
+	! use doc && \
+		sed "s/^DOXYGEN=.*/DOXYGEN=no/" <configure >tmp && \
+		cat tmp >configure
 
+	econf $(use_with xml2 xml) || die
 	emake || die
 }
 
 src_install () {
 	einstall || die
 
-	dodoc AUTHORS INSTALL NEWS ChangeLog README\
+	dodoc AUTHORS INSTALL NEWS ChangeLog README \
 		THANKS TODO COPYING COPYING.addendum
 
 	# Only install html docs
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.0.13 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.0.13
deleted file mode 100644
index 6fe2c805367e..000000000000
--- a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f1c5754ecd4a8c7524beb55b49a1fbf commoncpp2-1.0.13.tar.gz 830489
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.2.5 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.2.5
deleted file mode 100644
index 94cdc3d0d712..000000000000
--- a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33c1ddf5a24dd5e471b1199e92172b23 commoncpp2-1.2.5.tar.gz 799423
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.0 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.0
deleted file mode 100644
index 61d19c87c8ce..000000000000
--- a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84059a0869ed85513c54262c3db46ccc commoncpp2-1.3.0.tar.gz 805583
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.20 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.20
new file mode 100644
index 000000000000..6ef57b68e337
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.3.20
@@ -0,0 +1 @@
+MD5 5b8c1fd4a1703bb69f44a2e0f7142f66 commoncpp2-1.3.20.tar.gz 833647