Version bump, remove old 8.1x series ebuilds as 8.12 is the next stable candidate instead.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 13 insertions, 72 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index f0ec7ed11e14..9b22085f1a69 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.172 2011/01/18 05:44:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.173 2011/01/31 19:52:03 flameeyes Exp $
+
+*libpcre-8.12 (31 Jan 2011)
+
+  31 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -libpcre-8.10.ebuild,
+  -libpcre-8.11.ebuild, +libpcre-8.12.ebuild:
+  Version bump, remove old 8.1x series ebuilds as 8.12 is the next stable
+  candidate instead.
 
   18 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> libpcre-8.02.ebuild:
   ppc64 stable wrt #348487
diff --git a/dev-libs/libpcre/libpcre-8.11.ebuild b/dev-libs/libpcre/libpcre-8.11.ebuild
deleted file mode 100644
index c24024ab5214..000000000000
--- a/dev-libs/libpcre/libpcre-8.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.11.ebuild,v 1.1 2010/12/14 23:23:14 flameeyes Exp $
-
-EAPI=2
-
-inherit libtool eutils toolchain-funcs
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-if [[ ${PV} == ${PV/_rc} ]]
-then
-	MY_P="pcre-${PV}"
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	MY_P="pcre-${PV/_rc/-RC}"
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 +cxx unicode zlib static-libs +recursion-limit"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
-	elibtoolize
-}
-
-src_configure() {
-	econf --with-match-limit-recursion=$(use recursion-limit && echo 8192 || echo MATCH_LIMIT) \
-		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
-		$(use_enable cxx cpp) \
-		$(use_enable zlib pcregrep-libz) \
-		$(use_enable bzip2 pcregrep-libbz2) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	gen_usr_ldscript -a pcre
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
-
-pkg_postinst() {
-	elog "This version of ${PN} has stopped installing .la files. This may"
-	elog "cause compilation failures in other packages. To fix this problem,"
-	elog "install dev-util/lafilefixer and run:"
-	elog "lafilefixer --justfixit"
-}
diff --git a/dev-libs/libpcre/libpcre-8.10.ebuild b/dev-libs/libpcre/libpcre-8.12.ebuild
index a69f3ba5d8c2..124d31f10046 100644
--- a/dev-libs/libpcre/libpcre-8.10.ebuild
+++ b/dev-libs/libpcre/libpcre-8.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.10.ebuild,v 1.1 2010/12/12 09:35:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.12.ebuild,v 1.1 2011/01/31 19:52:03 flameeyes Exp $
 
 EAPI=2
 
@@ -11,7 +11,9 @@ HOMEPAGE="http://www.pcre.org/"
 if [[ ${PV} == ${PV/_rc} ]]
 then
 	MY_P="pcre-${PV}"
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
 else
 	MY_P="pcre-${PV/_rc/-RC}"
 	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
@@ -52,10 +54,3 @@ src_install() {
 	gen_usr_ldscript -a pcre
 	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
-
-pkg_postinst() {
-	elog "This version of ${PN} has stopped installing .la files. This may"
-	elog "cause compilation failures in other packages. To fix this problem,"
-	elog "install dev-util/lafilefixer and run:"
-	elog "lafilefixer --justfixit"
-}