Version bump (bug #208091, general cleanup of the ebuild concerning style and correctness, license changed). Dropped old version.

Package-Manager: portage-2.1.4

6 files changed, 91 insertions, 50 deletions

diff --git a/dev-libs/cgicc/ChangeLog b/dev-libs/cgicc/ChangeLog
index b4e21594bc29..f1dc44b83ff5 100644
--- a/dev-libs/cgicc/ChangeLog
+++ b/dev-libs/cgicc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cgicc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/ChangeLog,v 1.11 2007/02/22 00:30:22 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/ChangeLog,v 1.12 2008/01/30 11:23:26 dev-zero Exp $
+
+*cgicc-3.2.5 (30 Jan 2008)
+
+  30 Jan 2008; Tiziano Müller <dev-zero@gentoo.org> -cgicc-3.2.1.ebuild,
+  +cgicc-3.2.5.ebuild:
+  Version bump (bug #208091, general cleanup of the ebuild concerning style
+  and correctness, license changed). Dropped old version.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index 57e2ac8fbebd..47bb1b293a43 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -1,24 +1,24 @@
-DIST cgicc-3.2.1.tar.bz2 404447 RMD160 cd7cd15056c161d43e49f6eae60dc89a621bac7d SHA1 118764acc9d8cc9800930e73e8bd0afbaafb3c35 SHA256 461ea385ba20bea32a0d73cb6dc75e55b792b7a8a43301e0c6d54b58a2da882b
 DIST cgicc-3.2.3.tar.bz2 445393 RMD160 c1da8be93801344bc4c6338e2547788eb4de217d SHA1 0d49c933a77d5a917ebf761f416fe1f0140e7664 SHA256 88fc878aa30d9529d3599891732143c5ac602f4d863126ca2a51d7f7692b7b2d
-EBUILD cgicc-3.2.1.ebuild 1060 RMD160 cef1c598033d4495f8cb6547ac7c79135c523f10 SHA1 7c87f63afdc9e7d71d4113b3f70bf94e059fde61 SHA256 c768abfba3340718740e56992b45809a0567aab44aa5c18032b4fe6c4afb9ed3
-MD5 91316e42579a2c0769ce9611fc0819cb cgicc-3.2.1.ebuild 1060
-RMD160 cef1c598033d4495f8cb6547ac7c79135c523f10 cgicc-3.2.1.ebuild 1060
-SHA256 c768abfba3340718740e56992b45809a0567aab44aa5c18032b4fe6c4afb9ed3 cgicc-3.2.1.ebuild 1060
+DIST cgicc-3.2.5.tar.gz 1857935 RMD160 058623d8fde2eabd58c86156e92bf13d832de6ec SHA1 0aedf7723169a23078ef4cae06df8699ab22445c SHA256 fba029ec25c53f32f13ffccd8ff5521111cd05bdbcb96b9b5bcadea6e2d5f46b
 EBUILD cgicc-3.2.3.ebuild 1249 RMD160 4c4ac317c929726794cbb1bed7723e0177f5a249 SHA1 325a74445a1d5004a65816fbffd393c5b456864f SHA256 8755b9c808106a14c0a43c24aadcc6571863cf5fd93079a1f7b7be2831a1a184
 MD5 6d729dfa8d78a73a35d43c4112ed4989 cgicc-3.2.3.ebuild 1249
 RMD160 4c4ac317c929726794cbb1bed7723e0177f5a249 cgicc-3.2.3.ebuild 1249
 SHA256 8755b9c808106a14c0a43c24aadcc6571863cf5fd93079a1f7b7be2831a1a184 cgicc-3.2.3.ebuild 1249
-MISC ChangeLog 1186 RMD160 ca6ce3fcc3fa2615509c6264a6205fd7668c484b SHA1 28a7245f5e73e158bce880941716ea223ed603e4 SHA256 0f473958be0a6aeb6ed6b1260f0725cc73ba7ae0f76e81b10cd2a31295075eb3
-MD5 879cb43049fc5dd37f565e7e70b73149 ChangeLog 1186
-RMD160 ca6ce3fcc3fa2615509c6264a6205fd7668c484b ChangeLog 1186
-SHA256 0f473958be0a6aeb6ed6b1260f0725cc73ba7ae0f76e81b10cd2a31295075eb3 ChangeLog 1186
+EBUILD cgicc-3.2.5.ebuild 1598 RMD160 baf09d340802c53773aa4401b10a954e51e86a4f SHA1 c51e542ae5525f4ba83aa86ed932de8cc8c3ed82 SHA256 822da2318e8389c6b6da5a46e836c11017c84fd1f0e0fc90ce66c7b7a7e684bc
+MD5 7c6ed24fa4b6b1aeed176fc5412c41ef cgicc-3.2.5.ebuild 1598
+RMD160 baf09d340802c53773aa4401b10a954e51e86a4f cgicc-3.2.5.ebuild 1598
+SHA256 822da2318e8389c6b6da5a46e836c11017c84fd1f0e0fc90ce66c7b7a7e684bc cgicc-3.2.5.ebuild 1598
+MISC ChangeLog 1449 RMD160 e717b78b37003be380107621e2c02da84fe1240e SHA1 c2de5e9697bca4c1c60187b7be01dea671037588 SHA256 a0438384295a5af6654b70753e28b1c5f66b5895e89a64bdc5bcaa647dec0346
+MD5 589532c9dfdce4595a5ff78ad6532013 ChangeLog 1449
+RMD160 e717b78b37003be380107621e2c02da84fe1240e ChangeLog 1449
+SHA256 a0438384295a5af6654b70753e28b1c5f66b5895e89a64bdc5bcaa647dec0346 ChangeLog 1449
 MISC metadata.xml 784 RMD160 cfe7cf3fa1dd175345231125f4201d0b209dcfcf SHA1 4d598d7d298b426c66c6b0b8a6a12277ba677ea0 SHA256 4789427922c77ada8215965261bf671160836be79fde7963ca3db10e3131dd2a
 MD5 d1b04666f5c7158758b2528ced09b983 metadata.xml 784
 RMD160 cfe7cf3fa1dd175345231125f4201d0b209dcfcf metadata.xml 784
 SHA256 4789427922c77ada8215965261bf671160836be79fde7963ca3db10e3131dd2a metadata.xml 784
-MD5 0950b30c40f30a49f2b4b8914d276907 files/digest-cgicc-3.2.1 238
-RMD160 91fdfed48bf64972fa21bd2304f89f153f4e1abe files/digest-cgicc-3.2.1 238
-SHA256 087643b567cd1b5aa3b68ffc672b5728f5ef318d5dbf761102010967e4136c04 files/digest-cgicc-3.2.1 238
 MD5 2baa16043bdd3ff0f5676556d3d61d19 files/digest-cgicc-3.2.3 238
 RMD160 30ee1ec835f6c31f94536119f72aded2bf1b7cb2 files/digest-cgicc-3.2.3 238
 SHA256 6c0d318042a9232ca60b51a779306d68efa5b88f706f3342a52b48b41b91fe04 files/digest-cgicc-3.2.3 238
+MD5 0494352d79f5feb0417d0bb013823b4a files/digest-cgicc-3.2.5 238
+RMD160 87c063b4c67201b06f1be2e5735786f7bb49f396 files/digest-cgicc-3.2.5 238
+SHA256 4e9b3002dc08170c633d2d8707afe1b16175b3a204e6ac1458bae65f255512ff files/digest-cgicc-3.2.5 238
diff --git a/dev-libs/cgicc/cgicc-3.2.1.ebuild b/dev-libs/cgicc/cgicc-3.2.1.ebuild
deleted file mode 100644
index 0d67b2d19c67..000000000000
--- a/dev-libs/cgicc/cgicc-3.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/cgicc-3.2.1.ebuild,v 1.6 2005/02/11 11:43:54 ka0ttic Exp $
-
-DESCRIPTION="A C++ class library for writing CGI applications"
-HOMEPAGE="http://www.cgicc.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	# docs are included in html form, no need to depend on doxygen and regenerate them
-	sed -i \
-		-e 's|^\(SUBDIRS = cgicc\) doc\( support $(DEMO)\)|\1\2|' \
-		-e 's|^\(DIST_SUBDIRS = cgicc\) doc\(support demo contrib\)|\1\2|' \
-		-e 's|\($(mkdir_p) $(distdir)/cgicc\) $(distdir)/doc\( $(distdir)/support\)|\1\2|' \
-		${S}/Makefile.in || die "sed Makefile.in failed"
-}
-
-src_install() {
-	dohtml -r doc/html/*
-	rm -rf doc
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING COPYING.DOC COPYING.LIB INSTALL NEWS \
-		README README.WIN THANKS
-}
diff --git a/dev-libs/cgicc/cgicc-3.2.5.ebuild b/dev-libs/cgicc/cgicc-3.2.5.ebuild
new file mode 100644
index 000000000000..6b5002f5f7a3
--- /dev/null
+++ b/dev-libs/cgicc/cgicc-3.2.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cgicc/cgicc-3.2.5.ebuild,v 1.1 2008/01/30 11:23:26 dev-zero Exp $
+
+DESCRIPTION="A C++ class library for writing CGI applications"
+HOMEPAGE="http://www.cgicc.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+LICENSE="LGPL-3 doc? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove stray GNUCAP_LDFLAGS
+	# upstream bug: #22176
+	sed -i \
+		-e 's/@GNUCAP_LDFLAGS@//' \
+		cgicc/Makefile.in || die "sed failed"
+
+	# Fix docdir/htmldir paths in doc/Makefile.in
+	# upstream bug: #6385
+	sed -i \
+		-e 's|$(docdir)|@htmldir@|g' \
+		-e 's|$(prefix)/doc/\$(PACKAGE)-\$(VERSION)|@docdir@|' \
+		doc/Makefile.in || die "sed failed"
+}
+
+src_compile() {
+
+	if ! use doc ; then
+		sed -i \
+			-e 's/^\(SUBDIRS = .*\) doc \(.*\)/\1 \2/' \
+			Makefile.in || die "sed failed"
+	fi
+
+	econf \
+		--disable-demos \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable debug debug-logging) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README* THANKS
+
+	# Manually install the m4-file
+	# upstream bug: #22177
+	insinto /usr/share/aclocal
+	doins example/cgicc.m4
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/contrib
+		doins contrib/*.cpp contrib/README
+
+		insinto /usr/share/doc/${PF}/demo
+		doins -r demo/*.{h,cpp} demo/images demo/README
+	fi
+}
diff --git a/dev-libs/cgicc/files/digest-cgicc-3.2.1 b/dev-libs/cgicc/files/digest-cgicc-3.2.1
deleted file mode 100644
index 02bbc32e434a..000000000000
--- a/dev-libs/cgicc/files/digest-cgicc-3.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7080f3030b4d926eed25a5f3445ebbe4 cgicc-3.2.1.tar.bz2 404447
-RMD160 cd7cd15056c161d43e49f6eae60dc89a621bac7d cgicc-3.2.1.tar.bz2 404447
-SHA256 461ea385ba20bea32a0d73cb6dc75e55b792b7a8a43301e0c6d54b58a2da882b cgicc-3.2.1.tar.bz2 404447
diff --git a/dev-libs/cgicc/files/digest-cgicc-3.2.5 b/dev-libs/cgicc/files/digest-cgicc-3.2.5
new file mode 100644
index 000000000000..2203e3992138
--- /dev/null
+++ b/dev-libs/cgicc/files/digest-cgicc-3.2.5
@@ -0,0 +1,3 @@
+MD5 ed72d282688d1e2a74e58dd6e5eb4a04 cgicc-3.2.5.tar.gz 1857935
+RMD160 058623d8fde2eabd58c86156e92bf13d832de6ec cgicc-3.2.5.tar.gz 1857935
+SHA256 fba029ec25c53f32f13ffccd8ff5521111cd05bdbcb96b9b5bcadea6e2d5f46b cgicc-3.2.5.tar.gz 1857935