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

(Portage version: 2.1.4)

5 files changed, 79 insertions, 38 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/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