[gentoo-commits] repo/gentoo:master commit in: dev-libs/cgicc/, dev-libs/cgicc/files/

[David Seifert]

commit:     5c854a32112756c930aea240450b34676087f474
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 21:04:15 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 21:04:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c854a32

dev-libs/cgicc: Version bump to 3.2.16

Gentoo-bug: 594704
* EAPI=6
* Add USE=doc for proper generation of documentation

Package-Manager: portage-2.3.1

 dev-libs/cgicc/Manifest                            |  1 +
 dev-libs/cgicc/cgicc-3.2.16.ebuild                 | 49 ++++++++++++++++++++++
 .../files/cgicc-3.2.16-fix-doc-building.patch      | 34 +++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index b559105..243fd3a 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -1,2 +1,3 @@
 DIST cgicc-3.2.10.tar.gz 2385130 SHA256 87680cb303e65bee2816b9f0e3d0a3c3258efc4f908ec3cad620d01f0b597ce0 SHA512 78a62b7af9d8bee1b7bf278a0596151733af2adca8bdf6c7b752cebcffb330a5211cc9190a2e29d053afecca076bddb06ecb510caafd51b51d7d29199b06dc19 WHIRLPOOL 1fd73ce034ebaf3b481f30078ae9995dc9feb0e64dc52f963aeb7322e71d69dd8ffee59c8706a877ea8c986ebd1ce16de375e322c146c0f087e2c6ffcc11c442
+DIST cgicc-3.2.16.tar.gz 1409037 SHA256 9dceb36d2da52791ee11f2fb5bb6435c22e69ef50f38073c4329386b883d5aaa SHA512 3334777204f3de57e80f759503db08076fe8e7a12cf779bb50345e7d06c6be4cc612b473bd74eded5debd79684b49c5bb79bcfff1b631a815c7fe9d14960d537 WHIRLPOOL d55900ff650c5f42ec385eb4b20d41b8ee131ecd1ba3e1a27dc21326633281651e5ea4e0e7bde71f11ed2440282e7f1d52bbe9e1cae754f5afa2de358a38bdc5
 DIST cgicc-3.2.9.tar.gz 2087796 SHA256 7bf392da75787e848ddf04395a5ed08fc472411deaa07cbae2c3edbea8fbeed4 SHA512 bd02750a0ad81a64c017e8ccf6cee0c6801506bdc00ea4b0a5e4ea28e35e453122e3e25b3578cb1cb7b22011d5147b99ed79bf7c4702d4c7ab404096aabca623 WHIRLPOOL 01f0da6ca0c28415ed44ab37f3ea56892d18c1dd57a9724bbc0c86bac20e6954bb29b826c96a72cbe8ea99bddcba12b18f9d21c17e5216a20406d931224b6a07

diff --git a/dev-libs/cgicc/cgicc-3.2.16.ebuild b/dev-libs/cgicc/cgicc-3.2.16.ebuild
new file mode 100644
index 00000000..ca2cbc0
--- /dev/null
+++ b/dev-libs/cgicc/cgicc-3.2.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A C++ class library for writing CGI applications"
+HOMEPAGE="https://www.gnu.org/software/cgicc/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 doc? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/3.2.10-fix-pkgconfig.patch"
+	"${FILESDIR}/${PN}-3.2.16-fix-doc-building.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable examples demos) \
+		$(use_enable doc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc {contrib,demo}/{*.{cpp,h},*.cgi,README}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}

diff --git a/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch b/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch
new file mode 100644
index 00000000..4430ffa
--- /dev/null
+++ b/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch
@@ -0,0 +1,34 @@
+Fix build system properly, such that hacking the Makefile.in's
+is not required anymore.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,6 +77,13 @@
+ AC_MSG_RESULT($cgicc_demos)
+ AM_CONDITIONAL(DEMOS, test "$cgicc_demos" = yes)
+ 
++dnl enable/disable the docs, if specified
++AC_ARG_ENABLE([doc],
++    AS_HELP_STRING([--disable-doc], [Disable building documentation]))
++AC_MSG_CHECKING([whether to build the cgicc docs])
++AC_MSG_RESULT([$enable_doc])
++AM_CONDITIONAL([DOCS], [test "x$enable_doc" != "xno"])
++
+ if test "$cgicc_demos" = yes; then
+   AC_CONFIG_FILES(demo/Makefile)
+   AC_CHECK_FUNCS([gethostbyaddr])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,7 +10,11 @@
+ 
+ ACLOCAL_AMFLAGS= 
+ 
+-SUBDIRS = cgicc doc support $(DEMO)
++SUBDIRS = cgicc support $(DEMO)
++
++if DOCS
++SUBDIRS += doc
++endif
+ 
+ CLEANFILES = *~
+