media-libs/qhull: Drop pc support again as matplotlib works better without

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 25 insertions, 56 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index eb71d7894eb0..e383d64e204e 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/qhull
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.57 2014/09/17 08:33:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.58 2014/09/17 08:52:05 jlec Exp $
+
+*qhull-2012.1-r3 (17 Sep 2014)
+
+  17 Sep 2014; Justin Lecher <jlec@gentoo.org> -qhull-2012.1-r2.ebuild,
+  +qhull-2012.1-r3.ebuild, -files/qhull-2012.1-pc.patch, -files/qhull.pc.in:
+  Drop pc support again as matplotlib works better without
 
 *qhull-2012.1-r2 (17 Sep 2014)
 
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 2ef3d9ae8d8d..90f0c664893f 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -4,30 +4,28 @@ Hash: SHA512
 AUX qhull-2010.1-cmake-install.patch 3343 SHA256 865b27a10d878d7ded45446e7dffc9369fdafa021e49bafe5575a32fbed1e200 SHA512 20c1805287884f3a8de0924c4cb370110355c2c4804ecd8dfe58985a9751d7eddbcb911c4ea1104b3ab6aef17e5817381d679491ce1954dea8941f2200f16032 WHIRLPOOL ae3b2c5e8c998382dfee9a82f802eb2809ce0dc618b86092e344da2ce5880d517d304a71182837572f8cfabff41e6c90f407fd9ed8d3f7695fad29b85325efe3
 AUX qhull-2010.1-overflows.patch 1884 SHA256 8f49ad703f47467fd74d88614e1bbf7927b57c9c2af3c492fc2848f27a5f3181 SHA512 4246397abba98ea5163bca70ccf30575611d25c86d17172687b9adb7e5a6faeba2075f7e6a59ed86cb6d4b7507c694a4f6f4d4608e7bf13f93374f582a7abff1 WHIRLPOOL 1828f2b523090f309a1591fe16e70ddeb69cb8de5cd9f2af80d19779d1cc3a7485d158b8117c31590e756f2554383e1860b0afb7ed80cbfb27a06f0913cf8740
 AUX qhull-2012.1-64bit.patch 1509 SHA256 bafca6d2928ce2f057fb48e32b46131aacd1a1deb0f99e5ee70b758414e7fc88 SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5 WHIRLPOOL 5e3b1cef55885744d5991dc045ed900bed93f985d16aab271df5deb5e23a3fa3b4d588d1c5f7b268cb07b5d6114d5a357a5e16c351b4433863742accaf6a1adf
-AUX qhull-2012.1-pc.patch 680 SHA256 3b90d736ac395b3573ef09149da60652c718f5951c0115d2381348cb2f7c6051 SHA512 73e7211161519bc27906bc2024013c19f6ffef95efc6f2bb643e93e7813212a76a47d7eb6d94159aa101cedfd5936df90b131ccff901135a39fae82dfdc10cf4 WHIRLPOOL 05111e7a76713089be934b22d1854d0c9b1933c8dc2f2c2412b8d562ba2c310723c8145d1b766be7eccef4168c773b09ff96be1732441c6a0c2b8c2e69a4fe7b
 AUX qhull-3.1-makefile.patch 2516 SHA256 5685cad5fb45b05444ebb6c2867974aad3391a9936070f976a5b58aeb52c27a7 SHA512 9ca6be4d35deae3a77a18dd78c881f2e41886ef345207a46a2888fb503ee6e1c27da7146254ccc35bfa626e14e878cdbd9854e8da4e213a641266f54a6ed370a WHIRLPOOL dc555ee9ebc50a8db7a2524d1bfeb6e9088ee8beb2fe93ed06a35c1632de20f47c2cfe1f687c70f19b0f06598c42a1508fb034cc1f4f7e918afa0b458a1ac9a8
-AUX qhull.pc.in 278 SHA256 fcb88a5e34ab29c4842a4f08e204cba2f6060a46f3449157a42de3ea52647be1 SHA512 27a24b3a09f52ddaf1edee3d60236a0862175714d7683c288a0e75d58e7db5ab8ea72e0b6b71b79b7c2f185663321976b743431b74194aba7867e4be2b226bfb WHIRLPOOL 707e8975616052db1e0e384c7960cd48f538a1229892d8a22b7875fedb7c950e377a59109a69339ce3fa13b7b723b42bdf3748e399df2980a6235d3f4198d3a9
 DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 WHIRLPOOL 37704b3f94b6d20c02886598cc2e862f47feb910e0d3259d686b1356242206b77640871509818c56530161720954214d41c295dfe740faa4ed575379b05259f6
 EBUILD qhull-2012.1-r1.ebuild 1266 SHA256 995bb24b1c1faaff57e96e3fd0b367000d06f0d5746adc9d8484be20436b0a82 SHA512 358ace58eb4e3811e3b8583c3b412dfd9faff01914144de01221fdea76c98e0029f8db68b9815be11414199f47a4e6f9df605b07b00ae2e8e1a96cf29df1e044 WHIRLPOOL 0f45c9b8266997d496c26f7a82807424ccdb2ef8449bc5ce28a8ef1dde35c0ed916068f0bada7340b53d65e4445cda1ffdf9cd71e30627f059b7ad9dbae8e1eb
-EBUILD qhull-2012.1-r2.ebuild 1514 SHA256 7f722e31283bc234836b37dc921c779da4fa0a7710911d78a8396deb17a272b9 SHA512 8b86a1e7eb12b16ef7dc5f28153621a6c8c137334d3710568b5099b31a2f3efc77e84a7fa08dd49c7423033e2e42b7f2a390bdb482bed36371072dc4dd314b07 WHIRLPOOL 1f33c3ca7315c7750345d4b3e17ebcf5f6d5333a97d75a67c70f3718ceb37dd74642b433caa253a3ceea7356782a8d823a9a6661794c6e505818d85ac8e95d76
-MISC ChangeLog 8368 SHA256 70137d48b2749ed4d7b4cb6eee50fe14087a42666a430a35e40dfd9647107a77 SHA512 3e3a3a777dc2a991347bafe88fa34d0b0dbab8cf337928d95b7782a0bfd9389468c44a41c8eac8bb027dd81706a7a212e3ac59babccb37a2edbae30c14637986 WHIRLPOOL b76163e251b981afaa9facaac9f55d79d76fb6aee92da8de5852ae04f48e079b41c8a6d63fed6760df1d9b0fdbbce0b04d1cdd50a9fdc952f181583c4affa9be
+EBUILD qhull-2012.1-r3.ebuild 1359 SHA256 1686ad086d568b48521b2c707aed5bca199d1e2b45eef3bf544b5a64a465a592 SHA512 e8959d933f4011152df8b844676fa7959f66ec604c7466601e43a20f2171075698bedcc828849989828a67e7db54f1773c37c245430a6426113552066b8ae369 WHIRLPOOL 1f8522fe50abd7539dddc0a15a32412a297995502a50df7d27592dfbaf25aa73b298113dee379f551658494b33daa055788945224c4f36c77df0af7a4876ddb4
+MISC ChangeLog 8609 SHA256 c51a2a488c2d6a9557108097feec7f1ddb1da0ea39e12e475df458ff7c7f3fba SHA512 cc099be9aa483f17f9bfecdb763e8113f96dfaf4d1d6eb0959c702dc6dee348d9ac908ffab6c0303625a868de9e9495f5eca32f4df33ffe84095110eb0841929 WHIRLPOOL 87a02129c9fe8b6602d77564818ae1584100d1882c879ea992da5d359f1f030f978fc78211e5e3d04a68c05a04734a8af55e60051fe795e88dfc1f4fc640e04c
 MISC metadata.xml 872 SHA256 7a1e40294785164f8a50596502300b2d1dfb11c0e5a1193d06153fe63036c7d9 SHA512 eab5b032478f15c0b7611dbed0237694e43ef875a14681bae48ddd3a1e6d05e196f76d2120d66e40225a8e3d4b7a8ca3572ca1372c2c851b86aff075a2a93574 WHIRLPOOL eadfed324da921a89f182304a523f992f66c07aa18e0b4bbcb8bc8fdd8806f517bea4e1cd0260e5b24d7e2444f2832a780f4bb5362bd7c56446bf957abbbb10c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUGUd1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUGUu2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrooP/iF2QbD859tyaO4dtAWSXRh0
-LhR7FvsU9EI4rmHTieTXK5g/wBZn21aUAJpgfHtocHDbpfpLKLcOYgQOLsiCBu6e
-h2xC2ax62ZtVCrNIeOYpwv4JRkqQS6jO0nwMWNgZkxelUI6gSmyjol300SzuX5Xv
-MSUFgTIYpejTm/d75HqQb68Uqaa2YJ3uPsGjGBbame4URLFh0ripKeIMomcpIfXw
-atWQN/o/jNVqOJBuq/ITgdxnZMAE5Lwa14+gtCnugtamGjl0XItUcD2k1770G9uB
-lrIsCED3v4zKF9UTv+4cMBXkobwnzVN7d0od+B+HIdvgtdBrLnrgHR5TncqIv6l+
-xNW8kIaTurylFD72KyaC+lsINBXaAtE1+aD0QuRNUZzSGX5x8RndK7BTmy14WlOu
-v32nEBsRr39aWVvTvz4TIRyHifSuw1ivBfizN72Gh/iiOc64JQbKsUvh29nBhaE1
-Z0hu22RJhA+5c43NrjRror2zHPcUF+/oo7kop3qeTRyiNtvovRF5iYQl+Wvn89I/
-F93Pqzl2u3dBfjpVI61cfnVh9JHsi+AEcmOUG0OAHsFHXF9S7/ywD1dsKmV3jPWm
-KWNXmV4IWssoObjDQ3rsldmUeZe/QBYmkMGEn+wa0VAxlWBmjT1TUCXJNRaWUs//
-IFSjBaxS+2HO4DcxATDM
-=UlC9
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6wYP/1sZiAepKJld6/O/wkXFp8bJ
+AT7A+4iAdzcyTtzCUh+dIU3a08/KqtEPeWgczWWNJQQWjBhgtOCKd/iPUyWT7Wuy
+3Bjm7pEZwursMCCFlaRmBETdZnMeED2FRJ9PJUUYBAatdgxhJYXT9ffBdoOSMv7X
+Va6GukM70gpuOl4grIOG5hlR5/O3BJSO+Ih9qIfTPnF8JG07W/De8N2u6RcfZuO/
+1uTlhhyW10eRGCODDYFtjkzDgb/MyajBpEcz50U9wB+wHuoQsTP9ZFieM2anqyVv
+D4bpnvA3TN7XKqiTpPPzwdRNZxR7fwV3gp5ZejLmjlVfuvEWO5P0P1kB31Ek6Yul
+uXxGYu55ZVHGc2EjkNJn1it0zc4jDq+Q1qt6LnkAJHS1ACFUvYCX4HbIWdmX6fw5
+cRAFb07FKpio8VIGq1owX2B6S6uGiPqK8qXVl97I4OPZHcP3QFrSdh2ni+Y9MEMU
+c+CYTqmA/RcJiVQVOAoxklQWjHWEOVZvqDl2BqWkjbR44a8wMwV4HzG32+XuEwMo
+dpZW5bxVjflFBi2VA5s26T2ba4m2PEToKBR5ZNV4+EgWwPx0c+RBcPWLeGdGudJw
+8IdVNBZEfbIJ6Hi9uxJMsYLJqWyY8FKzxFCqa05b85bqKmRgZXrRAPaJYVZghG54
+D0gLrs8Ct1q2YcrzQFdv
+=hS3F
 -----END PGP SIGNATURE-----
diff --git a/media-libs/qhull/files/qhull-2012.1-pc.patch b/media-libs/qhull/files/qhull-2012.1-pc.patch
deleted file mode 100644
index d609e8962f19..000000000000
--- a/media-libs/qhull/files/qhull-2012.1-pc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98dbc70..b323e10 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -430,3 +430,7 @@ install(FILES html/qhull.man         DESTINATION ${MAN_INSTALL_DIR} RENAME qhull
- install(FILES html/rbox.man          DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
- install(FILES ${doc_FILES}           DESTINATION ${DOC_INSTALL_DIR})
- install(DIRECTORY html/              DESTINATION ${DOC_INSTALL_DIR})
-+
-+
-+configure_file("qhull.pc.in" "qhull.pc" @ONLY)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qhull.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/media-libs/qhull/files/qhull.pc.in b/media-libs/qhull/files/qhull.pc.in
deleted file mode 100644
index 2bb503b24e88..000000000000
--- a/media-libs/qhull/files/qhull.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-includedir=${exec_prefix}/include
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-
-Name: qhull
-Description: General dimension convex hull library
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lqhull -lm
-Cflags: -I${includedir}
diff --git a/media-libs/qhull/qhull-2012.1-r2.ebuild b/media-libs/qhull/qhull-2012.1-r3.ebuild
index 5aafccb4d2cf..04ef8932877c 100644
--- a/media-libs/qhull/qhull-2012.1-r2.ebuild
+++ b/media-libs/qhull/qhull-2012.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r2.ebuild,v 1.1 2014/09/17 08:33:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r3.ebuild,v 1.1 2014/09/17 08:52:05 jlec Exp $
 
 EAPI=5
 
@@ -19,16 +19,7 @@ IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-64bit.patch
-	"${FILESDIR}"/${P}-pc.patch
-	)
-
-src_prepare() {
-	# From fedora, matplotlib depends on it
-	cp "${FILESDIR}"/${PN}.pc.in . || die
-	cmake-utils_src_prepare
-}
+PATCHES=( "${FILESDIR}"/${P}-64bit.patch )
 
 src_configure() {
 	append-flags -fno-strict-aliasing