*** empty log message ***

7 files changed, 14 insertions, 56 deletions

diff --git a/dev-libs/commonc++/Manifest b/dev-libs/commonc++/Manifest
index f50534140e4a..55c56e4ef8ea 100644
--- a/dev-libs/commonc++/Manifest
+++ b/dev-libs/commonc++/Manifest
@@ -1,6 +1,6 @@
-MD5 d04fc1ab3ad7facab6efc89e0e9b9b6a ChangeLog 1453
-MD5 6b2f74a265c2980e7c02fa7c4eb8758c commonc++-1.9.7-r2.ebuild 963
-MD5 9b2f719e78913dfbf40f47e4287f57a8 commonc++-1.9.7-r3.ebuild 1078
+MD5 fe3a043a43f1cf6d02d72eaf46fa7733 ChangeLog 1662
+MD5 172d9495ca3752f102cfe232383543cb commonc++-1.9.7-r2.ebuild 966
+MD5 6405b8842c74637880470c0645e0cfd9 commonc++-1.9.7-r3.ebuild 1099
 MD5 16ba4310d3fa123d0ca7d2b55df578ce files/digest-commonc++-1.9.7-r3 137
 MD5 842f230232ae0fe20184980e5bf4752d files/digest-commonc++-1.9.7-r2 67
 MD5 07a83437693f9b8fd53e47af2d00b136 files/commonc++-0.1.patch 363
diff --git a/dev-libs/commonc++/commonc++-1.9.7-r1.ebuild b/dev-libs/commonc++/commonc++-1.9.7-r1.ebuild
deleted file mode 100644
index 98d1568d7661..000000000000
--- a/dev-libs/commonc++/commonc++-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/commonc++/commonc++-1.9.7-r1.ebuild,v 1.10 2003/10/23 14:42:35 aliz Exp $
-
-S=${WORKDIR}/CommonC++-1.9.7
-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++/"
-
-DEPEND="sys-libs/zlib
-	dev-libs/libxml2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/commmonc++-0.1.patch || die
-
-}
-src_compile() {
-
-	econf || die "./configure failed"
-	emake || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS INSTALL NEWS OVERVIEW.TXT ChangeLog\
-		  README THANKS TODO COPYING COPYING.addendum
-	dohtml doc/*
-}
diff --git a/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild b/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild
index b7c643e4e112..97668564f2f5 100644
--- a/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild
+++ b/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild,v 1.7 2003/10/23 14:42:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/commonc++/commonc++-1.9.7-r2.ebuild,v 1.8 2003/10/28 13:07:48 mholzer Exp $
 
 S=${WORKDIR}/CommonC++-1.9.7
 DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for\
@@ -20,7 +20,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/commmonc++-0.1.patch || die
+	epatch ${FILESDIR}/${PN}-0.1.patch || die
 
 }
 src_compile() {
diff --git a/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild b/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild
index 32e03553a649..92be9ffc7dea 100644
--- a/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild
+++ b/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild,v 1.6 2003/10/23 14:42:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/commonc++/commonc++-1.9.7-r3.ebuild,v 1.7 2003/10/28 13:07:48 mholzer Exp $
 
 S=${WORKDIR}/${P/commonc/CommonC}
 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
-		mirror://gentoo/${PN}_${PV}-1.diff.gz"
+		mirror://gentoo/${P}-1.diff.gz"
 HOMEPAGE="http://www.gnu.org/software/commonc++/"
 
 DEPEND="sys-libs/zlib
@@ -18,23 +18,21 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~ppc"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/commmonc++-0.1.patch || die "patch1 failed"
-	use ppc && epatch ${DISTDIR}/commonc++_1.9.7-1.diff.gz || die "patch2 failed"
+	epatch ${FILESDIR}/${PN}-0.1.patch || die "patch1 failed"
+	if [ `use ppc` ]; then
+		epatch ${DISTDIR}/${P}-1.diff.gz || die "patch2 failed"
+	fi
 }
 src_compile() {
-
 	econf || die "./configure failed"
 	make DESTDIR=${D} || die
-
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS INSTALL NEWS OVERVIEW.TXT ChangeLog\
-		  README THANKS TODO COPYING COPYING.addendum
+	dodoc AUTHORS INSTALL NEWS OVERVIEW.TXT ChangeLog \
+		README THANKS TODO COPYING*
 	dohtml doc/*
 }
diff --git a/dev-libs/commonc++/files/commmonc++-0.1.patch b/dev-libs/commonc++/files/commonc++-0.1.patch
index 2a3ed79956a1..2a3ed79956a1 100644
--- a/dev-libs/commonc++/files/commmonc++-0.1.patch
+++ b/dev-libs/commonc++/files/commonc++-0.1.patch
diff --git a/dev-libs/commonc++/files/digest-commonc++-1.9.7-r1 b/dev-libs/commonc++/files/digest-commonc++-1.9.7-r1
deleted file mode 100644
index a29592b05c0d..000000000000
--- a/dev-libs/commonc++/files/digest-commonc++-1.9.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1e9f2d5db4a3c667c08d36a0d261d74 commonc++-1.9.7.tar.gz 741527
diff --git a/dev-libs/commonc++/files/digest-commonc++-1.9.7-r3 b/dev-libs/commonc++/files/digest-commonc++-1.9.7-r3
index dbc9cfdc677e..998c05ef6f7f 100644
--- a/dev-libs/commonc++/files/digest-commonc++-1.9.7-r3
+++ b/dev-libs/commonc++/files/digest-commonc++-1.9.7-r3
@@ -1,2 +1,2 @@
 MD5 d1e9f2d5db4a3c667c08d36a0d261d74 commonc++-1.9.7.tar.gz 741527
-MD5 aad6e92209756a6fb85733e3b547ed6d commonc++_1.9.7-1.diff.gz 188198
+MD5 aad6e92209756a6fb85733e3b547ed6d commonc++-1.9.7-1.diff.gz 188198