Updated docs, added some extra check to avoid duplicates in generating site.cfg (bug #493318, thanks Olaf Leidinger)

Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 17 insertions, 21 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 3fe352648549..14f30ce0059d 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.213 2013/12/22 13:21:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.214 2013/12/22 18:27:15 bicatali Exp $
+
+  22 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.8.0.ebuild:
+  Updated docs, added some extra check to avoid duplicates in generating
+  site.cfg (bug #493318, thanks Olaf Leidinger)
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> numpy-1.7.1.ebuild:
   Stable for ppc64, wrt bug #487870
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4a79caabd571..59e336da0074 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX numpy-1.6.1-atlas.patch 829 SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d SHA512 84e5a820fad9bb2c97c866891b7e4cd5d025c21b4ccff2703b57eabdf3597cb9162d528d13863e1f6fa6b1e50281b2066f12b975feb88cc905b6da6cc60adde5 WHIRLPOOL 1f14425a1dd6717611a77693a90a94e60bde5ecfe82e5d26c0c38aa33e0374b363c135e906ec51c382bf62761d95aa9293d0f98ccf04e07544ad184d39e9d965
 AUX numpy-1.6.2-distutils.patch 20000 SHA256 779c0b03ee25b294f203729e954eed02022113ab18f4a1fbc20c36299dc5c1b8 SHA512 d47c2d4dab77c69fbad4b3a84df493e1e2a584b67d5832b3c11ca5d449935ca4ac5626d3616c8f612e74cb6503ddbf94a44fd1fda7b9aed5f20e8358aaa44c8a WHIRLPOOL bb876d24d56dd13409516e7de3dfce492fd4498ad186016be672b3ef613064c3c7f3fb8f62e0188277d2ea7191efb490e7482fd60413ce0f75df5052c8f8a828
@@ -14,27 +14,20 @@ DIST numpy-1.6.2.tar.gz 2585329 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba
 DIST numpy-1.7.1.tar.gz 2838240 SHA256 5525019a3085c3d860e6cfe4c0a30fb65d567626aafc50cf1252a641a418084a SHA512 d58177f3971b6d07baf6f81a2088ba371c7e43ea64ee7ada261da97c6d725b4bd4927122ac373c55383254e4e31691939276dab08a79a238bfa55172a3eff684 WHIRLPOOL 5374e619edbd3a3e7e478e1baf585d1868f832aa8864935e1498652e2128bf79284a25d5d0ac153c703e1a5d97f361081181eb3402f6e07141324d31eccf390a
 DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
 DIST numpy-html-1.7.0.zip 10831068 SHA256 469a8e6f21544204b6e338eb88519c04ed22a6b5e3f3b098f0cccf0ffe08c8b1 SHA512 b68b44102aa4d2996334adce3ddda090f373a4c5bd006daa9cf59f092445d5b768121afe4d10855058d6489ff52bf70a7645b7ff79555de709417f13568bfaac WHIRLPOOL f696258ebb7c78bdfee948bd9119d868b77048c73c805230f0f40d71be891cbfa5bccf21e714cc4389daf1792abb6aeaf3ae18e91889332b9aafa79c865f34a7
+DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15
 DIST numpy-ref-1.7.0.pdf 5161456 SHA256 0581709ef96441953404bc1369d70117b83359aff94f44779b960bed30a156d7 SHA512 9a80ab2b412aa34ce019454c438b129d1e94b2264306f3644e97c87f4f7b54317ee626274d865c04891005ca8e8f5e3773681a7af590dd89d64df9462d0f0004 WHIRLPOOL 0f10177fd24cfe93555f28440ddc3567a787f2cef336b2f2774b038caafb6807f738d1f3ee3d5a5f26883c567e4017f8365069f25ec7cba5234c537602351729
+DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68
 DIST numpy-user-1.7.0.pdf 404104 SHA256 0c8dc1d53cc057a66139039dbaaf65499687cf64e72af5852eb96d9c3cd3ab18 SHA512 20cec2f9742c0604d9db9f2e74e7c8fda1782c081c27437a07c2d8cb7f36be6df3e50e5ddf8cc10a076905b2be2b6927af15d0574e3bee2961cf14aaca55ad78 WHIRLPOOL 792c4ccd155ddbb82d8a93959c218bcc001532a6b3c42626bef64c96eb865601f5ee328d1a1627f1656e0b22085c89ede39d7f94183841e1069d183589542ffe
+DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335
 EBUILD numpy-1.6.2-r2.ebuild 4041 SHA256 a19790520f8f2e72424a19fcfb0eb6e6b92f824c65e5d0e0c4186c3623d4468c SHA512 63ebe9d2113905b9da0f567d29a607106ea34bd5bece980684be2cd4e7963af67c33d5e96be210fc5c2befbfcdc2e99358940e05b1c558ca068d6e5b41d5c2e9 WHIRLPOOL 188c736341018499da86161ac3f4dad5bd3387c385dd1fa5b27fd0b465f1ce8335079a305ce93932616bb41f1172721d9d97a7e2cab79cc2c7519cdec6774a7f
 EBUILD numpy-1.7.1.ebuild 4016 SHA256 f15927c772740443a2c6355bf86ca493f282444a82ebfe1f69e54c865e518932 SHA512 85d32cac38de7d8270d417c68c09789a2a42cce5b89df9dd83e4f7390479277f64e91074c2218ee93f1eb04c234e9dff28f27ba1f6cdfea965c3c82a59db5d89 WHIRLPOOL baf5951628818d8f2d3be38f8dc5efc9ebf36656074e30992ab81bcecf136295f73edc6bf269ddc2cd60d474048bc7df5333c355dda3744793ead1bd46103668
-EBUILD numpy-1.8.0.ebuild 3961 SHA256 827ee876840c39b753b251c246e7a1815f2207cfd36eb777bd3119c80201218c SHA512 32aa5326410c13175f725f704e0bf60d04a7e190f72683e1e37b9320cff874c9556d81020240844b8bf5b849201f37d796a666bb1c6d45ed05316a7eef81b635 WHIRLPOOL 575356d1a0bfcd9215ba6187c4cd4b8c2d445bdf23daf4b2e018f965daac5b8178dc6650ae2f3d6b37e2c63bf0720784fa507624e380e96159ef9efb2ef11b59
-MISC ChangeLog 29801 SHA256 b49a45b75fc3f1edf54f4c6476d6a43aad564bfae9addef47bd66b683954b672 SHA512 9c49e3b9955754f4c7fbfb3a1ac9658cd4c7388680de3d3d2d1c7eefd77c061963ea5fe61f2abf55f40fe86c5531484814131b5fe13dfa41acba546eae37832a WHIRLPOOL 143a41ce02bb398c1962e656741552aae283937365835a5114882dd15a8d52fa8f211112ea9254165031ace5593854dfb04575a569e6218a490a792d4235515b
+EBUILD numpy-1.8.0.ebuild 3950 SHA256 443002e59d0c402c8cb6e7fc0561ecb519ef3035c6107bf28c61d0d35718b007 SHA512 c70b30c2e4c2a9096f9f1a80be41a7b0327b7a66442d6e9870a7d73fee295b676268f859233b537813079067d48865db626f33671ee69bedb16e6db7c61157a1 WHIRLPOOL cd0c9be80e0858fb5e3737b00d6991872150b6693b1436c333c171b2f6f0766286343f251c72deeab3916eca41bcd097bed0918a5a3271ee0bb219a176fd678d
+MISC ChangeLog 30003 SHA256 fe018d6c4e9004598d1ed2ee2d763f958c21a1ab5a8dac09bfbddaf968b2707d SHA512 0d541e784a87d532c0dd687182a2c4944170572d675aa7a438c04fa62f68f994e7ac904ecb4981550f7b24474b6863be7feba385fd7ef213a095b1641f3b6c66 WHIRLPOOL c9918456767c1d27f37f0ccf4b45dedc1dbc422a31fb892d3920138d19ac103433ca73d1ae7b66fba2d8cb0e878443cb7e1371e8ad1e690d2eab6de55f37ba5d
 MISC metadata.xml 678 SHA256 184af17845835a595a8b2ee396a6f55baa7234a7b91ebddcf957a5d69c0b01d0 SHA512 6dbcd40d6722b481caf27183618012f3df43fd6fc22f8ddd6f1a3e9e42bc1240f56573616ef32fe8c3ea52addc42172940b3d7c5fa0938b854baeb96daa53d88 WHIRLPOOL e9b5f50c2b2d34745b255d05f65c6762c34fe34a2f097633621479ce909a1e120322cbcd0ded383fae6511240a14a7e9db4f47592715e2919d1c4d615f9bd24d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJStuZ0AAoJELp701BxlEWfXtkP/RXbDOFstsbe+quvc6nE0qlW
-febezTn4kFZTyWWbeGbkcZDhIg7Gyz/ibiIa5e0jybhv6ZrPJUMXDGP6EodGe8l4
-u15cP54C/Rxk6IMjCjmA5gzEnykbIl8bjcFQB00Cb0THaLQ1fe8vg2QQe13ViEia
-2ypLDvky3RnP1IO5KWwSPqcAcqnUKVe1TyPlX8qyj77s9bOTJJq9ea1KAG/dc1wj
-PoiU9PMR6A1tJ3s2tFc/DbpfnLvlJYS8uI6WlRN25vEYCGplt/piABsLf6bWkk6a
-RycTmmzMcWzCIUloIzzj4bU0AhZmYZMPHW4iCHKw/Yir5nLfY6TOM7v/7bWONket
-kTV0W2uUVa+iJEegHzULEg7j/rREDUoPf8ZSmbxs9sfnZXECxP9dTfmen74UC2Ap
-eSfiQSkj8XzztvkS+i11U9fEhs4pq/cWonArZhGJ9vZ8yfMtBlGNb97XvPi6C9UV
-ubx0UbbgbQMM4KLnfq+qeu5v5k3nqMOmIkOqkk4EYxQYOoP57lAsJZhH9Au3triS
-davcV/09hzpM7mnmbtJZ4RcU5OMYMj/+QvpGJ+SVJ7T0cMO0M+LPhhnRUeVeAbbA
-gDFB2ZnKKF6JXssUloaRBYw5frjVykmj8Ui/MzR+pWba46+U18WGJ/R6Ojp7upsm
-HzGB1paJMzhjQ2Wsv18G
-=fRx0
+iEYEAREIAAYFAlK3LwUACgkQ1ycZbhPLE2CJAACfVPF5i9DRfT0U7NK4sFdQMEEs
++pwAnj7QxWfTDWWNyrZruDzJS2fBeDKj
+=Bj6w
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.8.0.ebuild b/dev-python/numpy/numpy-1.8.0.ebuild
index 46866cd236c0..97ad5c2bff9f 100644
--- a/dev-python/numpy/numpy-1.8.0.ebuild
+++ b/dev-python/numpy/numpy-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0.ebuild,v 1.1 2013/11/26 04:32:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0.ebuild,v 1.2 2013/12/22 18:27:15 bicatali Exp $
 
 EAPI=5
 
@@ -11,8 +11,6 @@ FORTRAN_NEEDED=lapack
 inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
 
 DOC_PV="${PV}"
-# upstream is lagging on docs
-DOC_PV=1.7.0
 
 DESCRIPTION="Fast array and numerical python library"
 HOMEPAGE="http://numpy.scipy.org/"
@@ -59,7 +57,8 @@ pc_libdir() {
 pc_libs() {
 	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//'
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| sort | uniq | tr '\n' ','
 }
 
 python_prepare_all() {