Revbump to add preserve old lib support and remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 17 insertions, 62 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 752002d71cb6..780d487f5d56 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.190 2012/02/05 23:06:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.191 2012/02/05 23:57:46 radhermit Exp $
+
+*libpcre-8.30-r2 (05 Feb 2012)
+
+  05 Feb 2012; Tim Harder <radhermit@gentoo.org> -libpcre-8.30.ebuild,
+  -libpcre-8.30-r1.ebuild, +libpcre-8.30-r2.ebuild:
+  Revbump to add preserve old lib support and remove old.
 
 *libpcre-8.30-r1 (05 Feb 2012)
 
diff --git a/dev-libs/libpcre/libpcre-8.30-r1.ebuild b/dev-libs/libpcre/libpcre-8.30-r2.ebuild
index 60eca1a2e763..7beb05fd9ae2 100644
--- a/dev-libs/libpcre/libpcre-8.30-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.30-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r1.ebuild,v 1.1 2012/02/05 23:06:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r2.ebuild,v 1.1 2012/02/05 23:57:46 radhermit Exp $
 
 EAPI="4"
 
-inherit libtool flag-o-matic
+inherit eutils multilib libtool flag-o-matic
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -59,3 +59,11 @@ src_install() {
 	gen_usr_ldscript -a pcre
 	find "${D}" -type f -name '*.la' -exec rm -f {} +
 }
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
diff --git a/dev-libs/libpcre/libpcre-8.30.ebuild b/dev-libs/libpcre/libpcre-8.30.ebuild
deleted file mode 100644
index 8bb49f7cfd0e..000000000000
--- a/dev-libs/libpcre/libpcre-8.30.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30.ebuild,v 1.1 2012/02/05 21:44:07 radhermit Exp $
-
-EAPI="4"
-
-inherit libtool flag-o-matic
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# 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
-	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 ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +cxx +jit +readline +recursion-limit static-libs unicode zlib"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline )"
-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
-	elibtoolize
-}
-
-src_configure() {
-	[[ ${CHOST} == *-mint* ]] && append-flags -D_GNU_SOURCE
-	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) \
-		$(use_enable jit) $(use_enable jit pcregrep-jit) \
-		$(use_enable readline pcretest-libreadline) \
-		--enable-shared \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	gen_usr_ldscript -a pcre
-	find "${D}" -type f -name '*.la' -exec rm -f {} +
-}