bump to 7.2, closes bug #182654

Package-Manager: portage-2.1.3_rc3

5 files changed, 26 insertions, 25 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index d6d5a5b964fc..dfa8273535a4 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.96 2007/06/16 10:58:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.97 2007/06/22 20:33:15 anant Exp $
+
+*libpcre-7.2 (22 Jun 2007)
+
+  22 Jun 2007; Anant Narayanan <anant@gentoo.org> -libpcre-7.0.ebuild,
+  +libpcre-7.2.ebuild:
+  bump to 7.2, closes bug #182654
 
   16 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> libpcre-7.1.ebuild:
   Added ~ppc, bug #181670
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 36e167c9eba5..dcc786feda75 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -15,24 +15,24 @@ MD5 2624830d0a69103fdc7f95d2fd5596e6 files/pcre-6.6-parallel-build.patch 1150
 RMD160 14713f33c3251334cfffd4578ff03a7763257112 files/pcre-6.6-parallel-build.patch 1150
 SHA256 a7a15a750f29632e9e412c2dde45c0186c27bf8c8580b2e111379ee64d15ba95 files/pcre-6.6-parallel-build.patch 1150
 DIST pcre-6.6.tar.bz2 557269 RMD160 6a60356fb010c9c1c044b8f449d2305bdb8eab52 SHA1 aa6fc52f0e18b599297ae1c8f611a01a5c39dea7 SHA256 8f45c758a1a8f8c76ae0559535a5548859868673152c94c2328515ab8a778129
-DIST pcre-7.0.tar.bz2 607541 RMD160 086a55134324f177973bb04ca160f9ddc33fa1db SHA1 dc216fc717aca2ab2f7844d97adee6f6f3a6657c SHA256 27265b2eb2c2e8026e02df7fbdc30eec05f00b9a1e7f9e652a0258d4888f0bbe
 DIST pcre-7.1.tar.bz2 729915 RMD160 1df0f1e86435a7f77c694472bb23bc71433a60be SHA1 1bc54556368165e7ce5f59ac2a60aba7dec6365c SHA256 9182500abc517c833f054ad38e146776d5cc7e8976a8ad0c77432b790067f366
+DIST pcre-7.2.tar.bz2 738540 RMD160 eee4b9f40bc04c05546f1b426e0398e77dd7b123 SHA1 fd4f69a66d0202504a831f8668a170b57bd5d1ec SHA256 e10ace2d0361f74f759b52534f05872d93ccce10b5efe7eec73dd39dc0ac52f4
 EBUILD libpcre-6.6.ebuild 1472 RMD160 bc6d5ba4bdc0ae89e8d2b3bba5dac0e9cdea7b95 SHA1 742086d2e469085034fee5f6fd81257753193c49 SHA256 fba67e6562882d96af55f8f6a0226fd65db501dd37b571dbc92274346ab7faaf
 MD5 57ebccf5a59f90bb7f01dc2c663dc109 libpcre-6.6.ebuild 1472
 RMD160 bc6d5ba4bdc0ae89e8d2b3bba5dac0e9cdea7b95 libpcre-6.6.ebuild 1472
 SHA256 fba67e6562882d96af55f8f6a0226fd65db501dd37b571dbc92274346ab7faaf libpcre-6.6.ebuild 1472
-EBUILD libpcre-7.0.ebuild 1256 RMD160 12d5b6ff71b62223ca7417f2730d2606a25688b9 SHA1 b44373ffa619960a0b56b9c173e3fbc20441698c SHA256 bdba7243ac34c53c3123b40e47951ca052d8e790fc4a808cccb302937ff6037f
-MD5 1200d6f78d6652745759c887b2060ba9 libpcre-7.0.ebuild 1256
-RMD160 12d5b6ff71b62223ca7417f2730d2606a25688b9 libpcre-7.0.ebuild 1256
-SHA256 bdba7243ac34c53c3123b40e47951ca052d8e790fc4a808cccb302937ff6037f libpcre-7.0.ebuild 1256
 EBUILD libpcre-7.1.ebuild 1135 RMD160 46e0b1edab1482079dd2b413fb444c6947fad63b SHA1 af4c074990fa567093988f3391fbd40583740bd1 SHA256 bea7a59bd12fd81ecfb27bc92af31c8104f3d0219d01b002073acb7b8a4489e4
 MD5 275173a7301cc66571560ab558c109c8 libpcre-7.1.ebuild 1135
 RMD160 46e0b1edab1482079dd2b413fb444c6947fad63b libpcre-7.1.ebuild 1135
 SHA256 bea7a59bd12fd81ecfb27bc92af31c8104f3d0219d01b002073acb7b8a4489e4 libpcre-7.1.ebuild 1135
-MISC ChangeLog 11908 RMD160 3ff5f20c9f1a0905d3de46e62c3ac2d8473ab598 SHA1 4b9870e07aef3f7bd353eca85784baa610234669 SHA256 d82bfaca8fcd0f3e277316466ce984163537a82b3c781a4cd017ac2a5afe8119
-MD5 051a1e61231636c8870f0c175a866eb6 ChangeLog 11908
-RMD160 3ff5f20c9f1a0905d3de46e62c3ac2d8473ab598 ChangeLog 11908
-SHA256 d82bfaca8fcd0f3e277316466ce984163537a82b3c781a4cd017ac2a5afe8119 ChangeLog 11908
+EBUILD libpcre-7.2.ebuild 1130 RMD160 eaee51f8314d2fbf1923248ce5f4be3f74f4ada9 SHA1 aecc495aca3bdcf59ee07695b3761f9860d8e523 SHA256 60d7fbc1504f02c1be01276d0a5cb052ca3d42a77320153526d6ab07aba97822
+MD5 58e7b96f92361adb3f36f46de5466c77 libpcre-7.2.ebuild 1130
+RMD160 eaee51f8314d2fbf1923248ce5f4be3f74f4ada9 libpcre-7.2.ebuild 1130
+SHA256 60d7fbc1504f02c1be01276d0a5cb052ca3d42a77320153526d6ab07aba97822 libpcre-7.2.ebuild 1130
+MISC ChangeLog 12060 RMD160 97ccaf9a79be611e8bbd41802608e350ede6ff8d SHA1 5b79a55373ec4049cc081681e1dce8ed124ce3a8 SHA256 8e973bde5fb9312ba06c5e74ba3efedb54412e32abea4e9be3e4a298f044799e
+MD5 ba273ff4fbf29f176e426d9ea417d287 ChangeLog 12060
+RMD160 97ccaf9a79be611e8bbd41802608e350ede6ff8d ChangeLog 12060
+SHA256 8e973bde5fb9312ba06c5e74ba3efedb54412e32abea4e9be3e4a298f044799e ChangeLog 12060
 MISC metadata.xml 221 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a SHA1 083b4c4186b97766a77a282179eb387403ffbd71 SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f
 MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a metadata.xml 221
@@ -40,9 +40,9 @@ SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f metadata
 MD5 3fbf9c1040e2edfd3d54f50cac6eb784 files/digest-libpcre-6.6 229
 RMD160 d5ccd545a0ca58194d051402b870ccec81c931f7 files/digest-libpcre-6.6 229
 SHA256 1fc5b103bc6a0fb64b72089480ff84f418e3b83aeb0a5da97d9cc4e78b95d112 files/digest-libpcre-6.6 229
-MD5 a9d9b77ec01305b92954d8ad82c98ac3 files/digest-libpcre-7.0 229
-RMD160 5bc9cb389abc8c26df96ab32c24092ddfa04d5b2 files/digest-libpcre-7.0 229
-SHA256 9f32e4266b42b01d2cf74776336ce1943b3d6155b4d5f71cee423ceb20258d7e files/digest-libpcre-7.0 229
 MD5 aa028179d9d32e77599ad392b2904e43 files/digest-libpcre-7.1 229
 RMD160 12e66c03d53798e42784e1e6b558fe0b3a6553c0 files/digest-libpcre-7.1 229
 SHA256 658a8f9bdc9e604d873b4e6510f14721b4a5cf9c9d0a0451f1ab1699419be79a files/digest-libpcre-7.1 229
+MD5 41edfc447451d8a4e82342c659721001 files/digest-libpcre-7.2 229
+RMD160 e99a4f00e9deef3b25ef17766ee0825129c99e85 files/digest-libpcre-7.2 229
+SHA256 55f8a9ae83f1c1e2d243682b490fa20109a5c806859fa05c17dc554b804506f7 files/digest-libpcre-7.2 229
diff --git a/dev-libs/libpcre/files/digest-libpcre-7.0 b/dev-libs/libpcre/files/digest-libpcre-7.0
deleted file mode 100644
index a0e8aa4b0b21..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-7.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b97e3bb84bd665e0fbb7a90344d65a43 pcre-7.0.tar.bz2 607541
-RMD160 086a55134324f177973bb04ca160f9ddc33fa1db pcre-7.0.tar.bz2 607541
-SHA256 27265b2eb2c2e8026e02df7fbdc30eec05f00b9a1e7f9e652a0258d4888f0bbe pcre-7.0.tar.bz2 607541
diff --git a/dev-libs/libpcre/files/digest-libpcre-7.2 b/dev-libs/libpcre/files/digest-libpcre-7.2
new file mode 100644
index 000000000000..cd6f75dd3ce8
--- /dev/null
+++ b/dev-libs/libpcre/files/digest-libpcre-7.2
@@ -0,0 +1,3 @@
+MD5 53305db73855f1ff155dcd2c05d448d3 pcre-7.2.tar.bz2 738540
+RMD160 eee4b9f40bc04c05546f1b426e0398e77dd7b123 pcre-7.2.tar.bz2 738540
+SHA256 e10ace2d0361f74f759b52534f05872d93ccce10b5efe7eec73dd39dc0ac52f4 pcre-7.2.tar.bz2 738540
diff --git a/dev-libs/libpcre/libpcre-7.0.ebuild b/dev-libs/libpcre/libpcre-7.2.ebuild
index 1d9d1298bc0c..273d77990f44 100644
--- a/dev-libs/libpcre/libpcre-7.0.ebuild
+++ b/dev-libs/libpcre/libpcre-7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.0.ebuild,v 1.2 2007/01/27 20:03:36 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.2.ebuild,v 1.1 2007/06/22 20:33:15 anant Exp $
 
 inherit libtool eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc unicode"
 
 DEPEND="dev-util/pkgconfig"
@@ -24,11 +24,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/pcre-6.3-uclibc-tuple.patch"
-	epatch "${FILESDIR}/pcre-6.4-link.patch"
-
-	# Added for bug #130668 -- fix parallel builds
-	epatch "${FILESDIR}/pcre-6.6-parallel-build.patch"
-
 	elibtoolize
 }
 
@@ -40,12 +35,12 @@ src_compile() {
 	# Enable building of static libs too - grep and others
 	# depend on them being built: bug 164099
 	econf ${myconf} --enable-static || die "econf failed"
-	emake all libpcrecpp.la || die "emake failed"
+	emake all || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	dodoc doc/*.txt doc/Tech.Notes AUTHORS
+	dodoc doc/*.txt AUTHORS
 	use doc && dohtml doc/html/*
 }