[gentoo-commits] repo/gentoo:master commit in: dev-libs/pcre++/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/pcre++/

[Mike Frysinger]

commit:     f8e11d10f7cf30db86807eecbc4103d9b391648f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 20:53:52 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 20:55:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e11d10

dev-libs/pcre++: update to EAPI=5

 dev-libs/pcre++/pcre++-0.9.5-r1.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
index 8a8b374..751000a 100644
--- a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
+++ b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 inherit eutils autotools
 
 DESCRIPTION="A C++ support library for libpcre"
@@ -17,10 +19,7 @@ IUSE=""
 DEPEND="dev-libs/libpcre"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_SOURCE="${WORKDIR}/${P}-patches" \
 	EPATCH_FORCE="yes" \
@@ -30,11 +29,10 @@ src_unpack() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 
 	dohtml -r doc/html/.
 	doman doc/man/man3/Pcre.3
 
-	rm -rf "${D}/usr/doc"
+	rm -rf "${ED}/usr/doc"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/pcre++/

[Mike Frysinger]

commit:     3da173897a05735b80c9cf62bbd9d9966d92288c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 20:54:15 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 20:55:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da17389

dev-libs/pcre++: add USE=static-libs support

 dev-libs/pcre++/pcre++-0.9.5-r1.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
index 751000a..0003bf2 100644
--- a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
+++ b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/${PN}/${P}.ta
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="dev-libs/libpcre"
 RDEPEND="${DEPEND}"
@@ -25,11 +25,19 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch
 
+	# Disable examples which we never run/install.
+	echo > examples/Makefile.am || die
+
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
 	default
+	use static-libs || find "${ED}"/usr -name 'lib*.la' -delete
 
 	dohtml -r doc/html/.
 	doman doc/man/man3/Pcre.3

[gentoo-commits] repo/gentoo:master commit in: dev-libs/pcre++/

[Mike Frysinger]

commit:     95affb357393c7d75b7ccc3a982f1869a2ccd859
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 20:54:59 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 20:55:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95affb35

dev-libs/pcre++: clean up build w/newer autotools #467670

 dev-libs/pcre++/pcre++-0.9.5-r1.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
index 0003bf2..c3a4f6c 100644
--- a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
+++ b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
@@ -25,6 +25,11 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch
 
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #467670
+
+	# Upstream is kind of dead, so handle the rename ourselves.
+	mv configure.{in,ac} || die
+
 	# Disable examples which we never run/install.
 	echo > examples/Makefile.am || die