Fix bug 278370. Remove old.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

5 files changed, 11 insertions, 115 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 479f205ed19d..06c6cc4abe47 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.162 2009/10/20 23:02:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.163 2009/10/21 08:56:24 loki_val Exp $
+
+  21 Oct 2009; Peter Alfredsen <loki_val@gentoo.org> -libpcre-7.8.ebuild,
+  -libpcre-7.8-r2.ebuild, libpcre-7.9-r1.ebuild, libpcre-8.00.ebuild:
+  Fix bug 278370. Remove old.
 
   20 Oct 2009; Peter Alfredsen <loki_val@gentoo.org> libpcre-8.00.ebuild:
   Re-add keywords.
diff --git a/dev-libs/libpcre/libpcre-7.8-r2.ebuild b/dev-libs/libpcre/libpcre-7.8-r2.ebuild
deleted file mode 100644
index 1fedc9fb5a04..000000000000
--- a/dev-libs/libpcre/libpcre-7.8-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8-r2.ebuild,v 1.2 2009/05/18 21:51:16 loki_val Exp $
-
-EAPI=2
-
-inherit libtool eutils toolchain-funcs autotools
-
-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 doc unicode zlib static-libs"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e "s:libdir=@libdir@:libdir=/$(get_libdir):" libpcre.pc.in || die "Fixing libpcre pkgconfig files failed"
-	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
-	echo "Requires: libpcre = @PACKAGE_VERSION@" >> libpcrecpp.pc.in
-	epatch "${FILESDIR}"/libpcre-7.9-pkg-config.patch
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf --with-match-limit-recursion=8192 \
-		$(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
-
-	dodoc doc/*.txt AUTHORS
-	use doc && dohtml doc/html/*
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/dev-libs/libpcre/libpcre-7.8.ebuild b/dev-libs/libpcre/libpcre-7.8.ebuild
deleted file mode 100644
index acfb3f44eb93..000000000000
--- a/dev-libs/libpcre/libpcre-7.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.8.ebuild,v 1.7 2008/11/05 00:33:31 vapier Exp $
-
-EAPI=1
-
-inherit libtool eutils
-
-MY_P="pcre-${PV}"
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-
-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 doc unicode zlib"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
-}
-
-src_compile() {
-	# Enable building of static libs too - grep and others
-	# depend on them being built: bug 164099
-	econf --with-match-limit-recursion=8192 \
-		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
-		$(use_enable cxx cpp) \
-		$(use_enable zlib pcregrep-libz) \
-		$(use_enable bzip2 pcregrep-libbz2) \
-		--enable-static \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt AUTHORS
-	use doc && dohtml doc/html/*
-}
diff --git a/dev-libs/libpcre/libpcre-7.9-r1.ebuild b/dev-libs/libpcre/libpcre-7.9-r1.ebuild
index fbbc04850162..4cd911a239ba 100644
--- a/dev-libs/libpcre/libpcre-7.9-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-7.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9-r1.ebuild,v 1.11 2009/09/11 20:42:14 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9-r1.ebuild,v 1.12 2009/10/21 08:56:24 loki_val Exp $
 
 EAPI=2
 
@@ -24,7 +24,8 @@ IUSE="bzip2 +cxx doc unicode zlib static-libs"
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-libs/libpcre/libpcre-8.00.ebuild b/dev-libs/libpcre/libpcre-8.00.ebuild
index 788fb37b3b3f..27f94d24e0ae 100644
--- a/dev-libs/libpcre/libpcre-8.00.ebuild
+++ b/dev-libs/libpcre/libpcre-8.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.00.ebuild,v 1.2 2009/10/20 23:02:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.00.ebuild,v 1.3 2009/10/21 08:56:24 loki_val Exp $
 
 EAPI=2
 
@@ -24,7 +24,8 @@ IUSE="bzip2 +cxx unicode zlib static-libs"
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
 S=${WORKDIR}/${MY_P}