Security cleanup, bug #140528.

(Portage version: 2.1.2_pre3-r4)
 (Unsigned Manifest commit)

16 files changed, 4 insertions, 444 deletions

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 216412676400..6189b46fa65d 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,23 +1,3 @@
-AUX pcre-4.2-link.patch 717 RMD160 07cec0f1b44d92436c2b1bc7c1a12ee9cc0870b8 SHA1 3debf4c7a5ef4b9ae0ac25a5c123c75588169f8d SHA256 59541bf9b9a3bbffdb2d132b88fb54bc002534202a9a4048cb7ccfb710539c25
-MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717
-RMD160 07cec0f1b44d92436c2b1bc7c1a12ee9cc0870b8 files/pcre-4.2-link.patch 717
-SHA256 59541bf9b9a3bbffdb2d132b88fb54bc002534202a9a4048cb7ccfb710539c25 files/pcre-4.2-link.patch 717
-AUX pcre-4.2-macos.patch 1505 RMD160 41d7a2605b47e4a3b47d4be80e87661a41c8067e SHA1 e838242e12b9aa3d44bcd2a7d392d109df8e2dba SHA256 1513cabf74425cabcc33a80a30f3e751b607ada94373c7b6dd4138c92a4bfcd3
-MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
-RMD160 41d7a2605b47e4a3b47d4be80e87661a41c8067e files/pcre-4.2-macos.patch 1505
-SHA256 1513cabf74425cabcc33a80a30f3e751b607ada94373c7b6dd4138c92a4bfcd3 files/pcre-4.2-macos.patch 1505
-AUX pcre-4.4-uclibc-tuple.patch 1437 RMD160 3dc5d67daac4f0246951544ed122278059c2cd02 SHA1 adf48860423173b2c37d007f29209066c431c8f8 SHA256 16dfa3f7ff424d8c870b7f71948fc413190d0f8e6d42cb75cc244be3520b8717
-MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437
-RMD160 3dc5d67daac4f0246951544ed122278059c2cd02 files/pcre-4.4-uclibc-tuple.patch 1437
-SHA256 16dfa3f7ff424d8c870b7f71948fc413190d0f8e6d42cb75cc244be3520b8717 files/pcre-4.4-uclibc-tuple.patch 1437
-AUX pcre-5.0-uclibc-tuple.patch 1624 RMD160 eb8ef71f53b7be4c8194305ba666d9734e8f40ba SHA1 3d939d44e0eb8545477f7c73182f53492894c6b1 SHA256 6d503acf38b954a9075cd39d942346df4025d9a66131479e2b1be95e7edbfc87
-MD5 bf62625896b04a15d6ca53e66f2c3e1e files/pcre-5.0-uclibc-tuple.patch 1624
-RMD160 eb8ef71f53b7be4c8194305ba666d9734e8f40ba files/pcre-5.0-uclibc-tuple.patch 1624
-SHA256 6d503acf38b954a9075cd39d942346df4025d9a66131479e2b1be95e7edbfc87 files/pcre-5.0-uclibc-tuple.patch 1624
-AUX pcre-6.1-link.patch 832 RMD160 ab1816344913db8379a2aa9103e86083dc46856a SHA1 8605b7eca3c1d1d432e1794e01029a7ccace4845 SHA256 241673cc6f5e0a5b6ef7004a2b32d7c46f4fc5991eb572169450067e411f8dc5
-MD5 7b7690bbbf7e1c6881aae2bc50f4d4e7 files/pcre-6.1-link.patch 832
-RMD160 ab1816344913db8379a2aa9103e86083dc46856a files/pcre-6.1-link.patch 832
-SHA256 241673cc6f5e0a5b6ef7004a2b32d7c46f4fc5991eb572169450067e411f8dc5 files/pcre-6.1-link.patch 832
 AUX pcre-6.3-link.patch 1047 RMD160 68c0121acb27c01dc41914cdd40dc59fb4ece9c5 SHA1 162be1f5255362bb13ef4869ac0da41a2bd4f7ca SHA256 d7f253196480aab1646f14ac46a4e91349e528c4b8995cae2e84b5043eba14f7
 MD5 785165d99d81b52418a5dc2d7a2708fa files/pcre-6.3-link.patch 1047
 RMD160 68c0121acb27c01dc41914cdd40dc59fb4ece9c5 files/pcre-6.3-link.patch 1047
@@ -34,34 +14,9 @@ AUX pcre-6.6-parallel-build.patch 1150 RMD160 14713f33c3251334cfffd4578ff03a7763
 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-4.2.tar.bz2 335068
-DIST pcre-4.4.tar.bz2 341388
-DIST pcre-4.5.tar.bz2 349536 RMD160 693f1f661761dc2c9a6dd5dce08663e738dc419a SHA1 750c42a7a5b85237ea8398bcffa7cba73c0813db SHA256 2149cc922e26d53448e1e396e1a123925a1f1a83259a80f9bbe796807714c251
-DIST pcre-5.0.tar.bz2 465738 RMD160 bf0b384a6cbb6af3be34cde4e2725b33c17e424f SHA1 320841e705a5ae86a2df9cfadb387f09a731b88f SHA256 2d4d627028eb6dc6b86c85a9ac2a844427cfc93fd1cccaa30e794d693356a94f
-DIST pcre-6.1.tar.bz2 555109 RMD160 b8b5c4d813bdbc50317bd4ad3713c110393bb8aa SHA1 a82d82cbf88ef811e178d92f5f2fb1ba30324a33 SHA256 b319a6013db2c73766d4edd367605c60c56cda4edc2c4eae488020222fa22712
 DIST pcre-6.3.tar.bz2 565852 RMD160 1e571ebe69f43287e590cb7c49878fb9569b2b88 SHA1 b34d62f53e62fc1ad8cb9cc8ede28aeb169ed7d7 SHA256 dc3bff3879a59ccfa765c1ecde486ed823124e7c3aea2638e94d12303e320ee7
 DIST pcre-6.4.tar.bz2 566309 RMD160 c2e48a301fa08ce255aa60ecb5a8961a8266aa53 SHA1 778fb963b7ec24e0dce34c8e21b8633b32a02704 SHA256 5dba7b02576e4d795701dacce10788aebc915c5e7aea735dddf13014ca5785a2
 DIST pcre-6.6.tar.bz2 557269 RMD160 6a60356fb010c9c1c044b8f449d2305bdb8eab52 SHA1 aa6fc52f0e18b599297ae1c8f611a01a5c39dea7 SHA256 8f45c758a1a8f8c76ae0559535a5548859868673152c94c2328515ab8a778129
-EBUILD libpcre-4.2-r1.ebuild 850 RMD160 7ce10ba74b709da8a5516cded01906194d5fa607 SHA1 307c2469f19abe29c64b5da9da9f433507d3cfdc SHA256 32fd6b513a24f22137f9db546c891a0ba99d22d66e14fc1f01f278776797f840
-MD5 e5d902ff0549ed617dbf02f035cffd8d libpcre-4.2-r1.ebuild 850
-RMD160 7ce10ba74b709da8a5516cded01906194d5fa607 libpcre-4.2-r1.ebuild 850
-SHA256 32fd6b513a24f22137f9db546c891a0ba99d22d66e14fc1f01f278776797f840 libpcre-4.2-r1.ebuild 850
-EBUILD libpcre-4.4.ebuild 1006 RMD160 11a0d4f1de21c8ba40a7a6ca90b214e4b8a3cfdd SHA1 2f1af6abb4d58e041d80d0c0cb81ab7494760be1 SHA256 e0913db134f07507a55e0d28f9964a75c02f7f2249abe583f830abcb2bd11a80
-MD5 27bae09858aed9d8ee36baa5ccb4b1b5 libpcre-4.4.ebuild 1006
-RMD160 11a0d4f1de21c8ba40a7a6ca90b214e4b8a3cfdd libpcre-4.4.ebuild 1006
-SHA256 e0913db134f07507a55e0d28f9964a75c02f7f2249abe583f830abcb2bd11a80 libpcre-4.4.ebuild 1006
-EBUILD libpcre-4.5.ebuild 1105 RMD160 5b7f92864982b6751fe641b7f485d69e07e6a971 SHA1 6b43fc54c82143660424b38236146d00003da06f SHA256 7a907c98cd40f597fac03822fdafef6a57b370d2e3906bfd34c6b01c2b30bda6
-MD5 c1e9e2b84f297eb1afd58b37a24775c7 libpcre-4.5.ebuild 1105
-RMD160 5b7f92864982b6751fe641b7f485d69e07e6a971 libpcre-4.5.ebuild 1105
-SHA256 7a907c98cd40f597fac03822fdafef6a57b370d2e3906bfd34c6b01c2b30bda6 libpcre-4.5.ebuild 1105
-EBUILD libpcre-5.0.ebuild 1058 RMD160 23562375cfa0bfcf607a01c66525234b1f9b483a SHA1 8d878500833350ff10f23f5c1802c0e5ff15fd6f SHA256 ab379aa62d960724c07fa427235860b4bdbb3923172ac22caa169183e185b342
-MD5 ef58e7fadce18a055cb37c22127b12f8 libpcre-5.0.ebuild 1058
-RMD160 23562375cfa0bfcf607a01c66525234b1f9b483a libpcre-5.0.ebuild 1058
-SHA256 ab379aa62d960724c07fa427235860b4bdbb3923172ac22caa169183e185b342 libpcre-5.0.ebuild 1058
-EBUILD libpcre-6.1.ebuild 1295 RMD160 c278cc34100fc0e510490c32c1f941e33b037c7e SHA1 a77a017fe75bf4e4420f090093a9a403342c1960 SHA256 c5443f5684a7a3d626d84c285647c306308222547749d3903b59093929f311eb
-MD5 acc28a10697d492b6d16919d6815e33b libpcre-6.1.ebuild 1295
-RMD160 c278cc34100fc0e510490c32c1f941e33b037c7e libpcre-6.1.ebuild 1295
-SHA256 c5443f5684a7a3d626d84c285647c306308222547749d3903b59093929f311eb libpcre-6.1.ebuild 1295
 EBUILD libpcre-6.3.ebuild 1380 RMD160 d0c677c316f66008d8cc785bc33dea3f4d4b2554 SHA1 d9294345e1c99ed7b4f6536b054a759813ec795e SHA256 7670d7a192aac540c96ee727fac1ae530579db4f91f9adb6d9556bb1293416cf
 MD5 acba7edc9cd0bf44f84c44b6dc02be37 libpcre-6.3.ebuild 1380
 RMD160 d0c677c316f66008d8cc785bc33dea3f4d4b2554 libpcre-6.3.ebuild 1380
@@ -74,29 +29,14 @@ EBUILD libpcre-6.6.ebuild 1486 RMD160 a5354000949c43f19033279fc3bdbbec77fa160c S
 MD5 69e6a667ee1b75587551f99b65aa79cc libpcre-6.6.ebuild 1486
 RMD160 a5354000949c43f19033279fc3bdbbec77fa160c libpcre-6.6.ebuild 1486
 SHA256 9d45ce9ccd27ace7b9ded9f9e0b2a65cd32a0f7454132659cb3741f1005d32c9 libpcre-6.6.ebuild 1486
-MISC ChangeLog 10025 RMD160 9e38b5f6fb37f0c0429d538d7c1fff418f5b6dbc SHA1 43d902aa2b293eeac43fbee02da1b14f696cd5c5 SHA256 dc49e3cbabb50d17e6ecd25cc46807436447df52ba2ca49a903642630a4deff4
-MD5 bb7e87de99feb70d4f03ac868772d6cb ChangeLog 10025
-RMD160 9e38b5f6fb37f0c0429d538d7c1fff418f5b6dbc ChangeLog 10025
-SHA256 dc49e3cbabb50d17e6ecd25cc46807436447df52ba2ca49a903642630a4deff4 ChangeLog 10025
+MISC ChangeLog 10378 RMD160 c7ed0fde1ee04fd3ef575d9cc2e75a3213366058 SHA1 913c360c778e4a40b10bd500630372f8ea058469 SHA256 200bff3d962aa8223ed8cfb94e565691d72a98199a5ad73215c8f79372a8e33b
+MD5 6f7be794f9b96f966c98f43b00dddaa8 ChangeLog 10378
+RMD160 c7ed0fde1ee04fd3ef575d9cc2e75a3213366058 ChangeLog 10378
+SHA256 200bff3d962aa8223ed8cfb94e565691d72a98199a5ad73215c8f79372a8e33b ChangeLog 10378
 MISC metadata.xml 221 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a SHA1 083b4c4186b97766a77a282179eb387403ffbd71 SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f
 MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a metadata.xml 221
 SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f metadata.xml 221
-MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61
-RMD160 fc60dbf0b1698e3d039a48b1573593a19bef6bcb files/digest-libpcre-4.2-r1 61
-SHA256 8bc8edd3c6aa68cad0f00a885649d7a32967bd843f07409c9abd927704c10f52 files/digest-libpcre-4.2-r1 61
-MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
-RMD160 4124c5e9ee12f65385529f1bd9266bca90ddd70b files/digest-libpcre-4.4 61
-SHA256 7e35eb80b4e263481e7cfae95c35f573acf0afe93cbc2df08bead10924ab1c4e files/digest-libpcre-4.4 61
-MD5 7e77c246449e052be161ca52eeb89918 files/digest-libpcre-4.5 229
-RMD160 07330b343bdac13eb44d98c452294125741d9c3c files/digest-libpcre-4.5 229
-SHA256 7c5b4b5a7ca6994edc6eb2a8e6863bed3e543c02d55eec2a3d2e62750931cc29 files/digest-libpcre-4.5 229
-MD5 ce2ecfb6daf25e627282de399514e49a files/digest-libpcre-5.0 229
-RMD160 83f26b7949446326d8ccbac2c90d20a6e2e9fb45 files/digest-libpcre-5.0 229
-SHA256 d2264e9aed7946b16fbcbbdf1b3e39c92e1c08a2ee705b094dfe31bea662cb23 files/digest-libpcre-5.0 229
-MD5 9262dc57062669736fa22c28d2ad03dd files/digest-libpcre-6.1 229
-RMD160 94ddd46a88633dc38b6915cfbf5eae466837db62 files/digest-libpcre-6.1 229
-SHA256 8200988f20324f8d8896217a164c52a8b044ae223787a65df0be31c9162c3e9f files/digest-libpcre-6.1 229
 MD5 1367689ab207e224c5401bc87f758d9a files/digest-libpcre-6.3 229
 RMD160 c1605c8a2da0fa2bcecda8e48b9212e45a7030b5 files/digest-libpcre-6.3 229
 SHA256 9bea7d64cff29657551afc7ef444cdc6448a4f8bf66a93ed25b9fc2b21f86deb files/digest-libpcre-6.3 229
diff --git a/dev-libs/libpcre/files/digest-libpcre-4.2-r1 b/dev-libs/libpcre/files/digest-libpcre-4.2-r1
deleted file mode 100644
index 62df32541ef2..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a11a3f26e7689f5e70f9baad0813e7c pcre-4.2.tar.bz2 335068
diff --git a/dev-libs/libpcre/files/digest-libpcre-4.4 b/dev-libs/libpcre/files/digest-libpcre-4.4
deleted file mode 100644
index 632c5ae6d4c0..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89fc389191d9611b314c3fc23235377b pcre-4.4.tar.bz2 341388
diff --git a/dev-libs/libpcre/files/digest-libpcre-4.5 b/dev-libs/libpcre/files/digest-libpcre-4.5
deleted file mode 100644
index f6fd54a19ee2..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-4.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c51bd34197008b128046f0799d2242e4 pcre-4.5.tar.bz2 349536
-RMD160 693f1f661761dc2c9a6dd5dce08663e738dc419a pcre-4.5.tar.bz2 349536
-SHA256 2149cc922e26d53448e1e396e1a123925a1f1a83259a80f9bbe796807714c251 pcre-4.5.tar.bz2 349536
diff --git a/dev-libs/libpcre/files/digest-libpcre-5.0 b/dev-libs/libpcre/files/digest-libpcre-5.0
deleted file mode 100644
index 927d6cb77759..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 813850808894d99fb5b1c41ec6335d4f pcre-5.0.tar.bz2 465738
-RMD160 bf0b384a6cbb6af3be34cde4e2725b33c17e424f pcre-5.0.tar.bz2 465738
-SHA256 2d4d627028eb6dc6b86c85a9ac2a844427cfc93fd1cccaa30e794d693356a94f pcre-5.0.tar.bz2 465738
diff --git a/dev-libs/libpcre/files/digest-libpcre-6.1 b/dev-libs/libpcre/files/digest-libpcre-6.1
deleted file mode 100644
index da7c6eeb8673..000000000000
--- a/dev-libs/libpcre/files/digest-libpcre-6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 069a8c34df7ec4bd0dad8f26c64c9dd3 pcre-6.1.tar.bz2 555109
-RMD160 b8b5c4d813bdbc50317bd4ad3713c110393bb8aa pcre-6.1.tar.bz2 555109
-SHA256 b319a6013db2c73766d4edd367605c60c56cda4edc2c4eae488020222fa22712 pcre-6.1.tar.bz2 555109
diff --git a/dev-libs/libpcre/files/pcre-4.2-link.patch b/dev-libs/libpcre/files/pcre-4.2-link.patch
deleted file mode 100644
index a2d154d75c84..000000000000
--- a/dev-libs/libpcre/files/pcre-4.2-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcre-4.2/Makefile.in.mps	2003-05-20 18:10:34.000000000 +0200
-+++ pcre-4.2/Makefile.in	2003-05-20 18:11:10.000000000 +0200
-@@ -89,7 +89,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT)
- @ON_WINDOWS@LINK = $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L.libs
- @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
--LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
-+LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L. -L.libs
- LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
- 
- # These are the version numbers for the shared libraries
diff --git a/dev-libs/libpcre/files/pcre-4.2-macos.patch b/dev-libs/libpcre/files/pcre-4.2-macos.patch
deleted file mode 100644
index 64675604d68b..000000000000
--- a/dev-libs/libpcre/files/pcre-4.2-macos.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN pcre-4.5.orig/configure pcre-4.5/configure
---- pcre-4.5.orig/configure	Sun Aug 15 15:29:25 2004
-+++ pcre-4.5/configure	Sun Aug 15 15:26:54 2004
-@@ -5122,11 +5122,11 @@
-     # FIXME: Relying on posixy $() will cause problems for
-     #        cross-compilation, but unfortunately the echo tests do not
-     #        yet detect zsh echo's removal of \ escapes.
--    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
-+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
-     # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
-+    hardcode_direct=no
-+    hardcode_shlibpath_var=yes
-     whole_archive_flag_spec='-all_load $convenience'
-     ;;
-
-diff -urN pcre-4.5.orig/ltmain.sh pcre-4.5/ltmain.sh
---- pcre-4.5.orig/ltmain.sh	Sun Aug 15 15:30:00 2004
-+++ pcre-4.5/ltmain.sh	Sun Aug 15 15:32:43 2004
-@@ -2990,6 +2990,11 @@
- 	    done
- 	    deplibs="$tmp_deplibs"
- 	  done
-+	  if test "x$verstring" = "x0.0"; then
-+	    tmp_verstring=
-+	  else
-+	    tmp_verstring="$verstring"
-+	  fi
- 	  eval cmds=\"$archive_cmds\"
- 	  deplibs="$save_deplibs"
- 	fi
diff --git a/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch b/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch
deleted file mode 100644
index 21c83b2caa83..000000000000
--- a/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- pcre-4.4/configure.mps	Wed Jan 28 15:58:44 2004
-+++ pcre-4.4/configure	Wed Jan 28 16:11:17 2004
-@@ -2811,6 +2811,11 @@
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/uClibc-*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -4148,6 +4153,7 @@
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
- linux-gnu*) ;;
-+linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -5663,6 +5669,23 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker is in use.
-+  dynamic_linker='uClibc ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
diff --git a/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch b/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch
deleted file mode 100644
index 7be77b9fe6db..000000000000
--- a/dev-libs/libpcre/files/pcre-5.0-uclibc-tuple.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur pcre-5.0.orig/configure pcre-5.0/configure
---- pcre-5.0.orig/configure	2004-09-13 07:20:00.000000000 -0700
-+++ pcre-5.0/configure	2004-12-28 09:24:34.707790654 -0800
-@@ -3047,7 +3047,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux-gnu*)
-   case $host_cpu in
-   alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
-     lt_cv_deplibs_check_method=pass_all ;;
-@@ -3060,6 +3060,11 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/uClibc-*.so`
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -7554,7 +7559,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux-gnu*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -7583,6 +7588,23 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker is in use.
-+  dynamic_linker='uClibc ld.so'
-+  ;;
-+
- knetbsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
diff --git a/dev-libs/libpcre/files/pcre-6.1-link.patch b/dev-libs/libpcre/files/pcre-6.1-link.patch
deleted file mode 100644
index 312180d5a109..000000000000
--- a/dev-libs/libpcre/files/pcre-6.1-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2005-06-27 20:35:39.000000000 +0200
-+++ Makefile.in	2005-06-27 20:36:18.000000000 +0200
-@@ -99,7 +99,7 @@
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
- @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
- @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -I. -I$(top_srcdir)
--LINKLIB = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -I. -I$(top_srcdir)
-+LINKLIB = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L. -L.libs
- LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
- @ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
- @NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
diff --git a/dev-libs/libpcre/libpcre-4.2-r1.ebuild b/dev-libs/libpcre/libpcre-4.2-r1.ebuild
deleted file mode 100644
index 72ae70121201..000000000000
--- a/dev-libs/libpcre/libpcre-4.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.2-r1.ebuild,v 1.17 2006/10/13 19:39:27 wormo Exp $
-
-inherit libtool flag-o-matic
-
-IUSE=""
-
-S=${WORKDIR}/pcre-${PV}
-DESCRIPTION="Perl-compatible regular expression library"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-HOMEPAGE="http://www.pcre.org/"
-
-SLOT="3"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	if [ "${ARCH}" = "amd64" ]
-	then
-		append-flags -fPIC
-	fi
-	elibtoolize
-	econf --enable-utf8 || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING INSTALL LICENCE NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml -r doc
-}
diff --git a/dev-libs/libpcre/libpcre-4.4.ebuild b/dev-libs/libpcre/libpcre-4.4.ebuild
deleted file mode 100644
index 6c4dd104c1a1..000000000000
--- a/dev-libs/libpcre/libpcre-4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.4.ebuild,v 1.17 2006/10/13 19:39:27 wormo Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="x86 ~ppc sparc alpha arm hppa amd64 ~ia64 ppc64 s390 mips"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/pcre-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/pcre-4.4-uclibc-tuple.patch
-	epatch ${FILESDIR}/pcre-4.2-link.patch
-}
-
-src_compile() {
-	# position-independent code must used for all shared objects.
-	append-flags -fPIC
-	elibtoolize
-	econf --enable-utf8 || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml -r doc
-}
diff --git a/dev-libs/libpcre/libpcre-4.5.ebuild b/dev-libs/libpcre/libpcre-4.5.ebuild
deleted file mode 100644
index d0862f245ab8..000000000000
--- a/dev-libs/libpcre/libpcre-4.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.5.ebuild,v 1.12 2006/10/13 19:39:27 wormo Exp $
-
-inherit libtool flag-o-matic eutils gnuconfig
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="x86 ~ppc sparc alpha arm hppa amd64 ia64 ~ppc64 s390 mips ppc-macos sh"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/pcre-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/pcre-4.4-uclibc-tuple.patch
-	epatch ${FILESDIR}/pcre-4.2-link.patch
-	use ppc-macos && epatch ${FILESDIR}/pcre-4.2-macos.patch
-	# position-independent code must used for all shared objects.
-	append-flags -fPIC
-	elibtoolize
-	gnuconfig_update
-}
-
-src_compile() {
-	econf --enable-utf8 || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NON-UNIX-USE
-	dodoc doc/*.txt
-	dodoc doc/Tech.Notes
-	dohtml -r doc
-}
diff --git a/dev-libs/libpcre/libpcre-5.0.ebuild b/dev-libs/libpcre/libpcre-5.0.ebuild
deleted file mode 100644
index f35a59c3968e..000000000000
--- a/dev-libs/libpcre/libpcre-5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.14 2006/10/13 19:39:27 wormo Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/pcre-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/pcre-5.0-uclibc-tuple.patch
-	use ppc-macos || epatch "${FILESDIR}"/pcre-4.2-link.patch
-
-	# position-independent code must used for all shared objects.
-	append-flags -fPIC
-	use ppc-macos || elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	econf --enable-utf8 || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS INSTALL NON-UNIX-USE
-	dodoc doc/*.txt doc/Tech.Notes
-	dohtml -r doc/*
-}
diff --git a/dev-libs/libpcre/libpcre-6.1.ebuild b/dev-libs/libpcre/libpcre-6.1.ebuild
deleted file mode 100644
index 606c37896720..000000000000
--- a/dev-libs/libpcre/libpcre-6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-6.1.ebuild,v 1.3 2006/10/13 19:39:27 wormo Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="dev-util/pkgconfig"
-
-S="${WORKDIR}/pcre-${PV}"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}"/pcre-5.0-uclibc-tuple.patch
-	use ppc-macos || epatch "${FILESDIR}"/pcre-6.1-link.patch
-
-	# position-independent code must used for all shared objects.
-	append-flags -fPIC
-	use ppc-macos || elibtoolize
-}
-
-src_compile() {
-	# How about the following flags?
-	# --enable-unicode-properties  enable Unicode properties support
-	# --disable-stack-for-recursion  disable use of stack recursion when matching
-	econf --enable-utf8 || die
-	emake all libpcrecpp.la || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS INSTALL NON-UNIX-USE
-	dodoc doc/*.txt doc/Tech.Notes
-	use doc && dohtml doc/html/*
-}