Error in previous patch, now installs all qhull headers to allow reverse dependencies to be compatible

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 21 insertions, 13 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index bddfab9a054a..32956ca52cc3 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/qhull
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.37 2010/10/03 21:55:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.38 2010/10/03 23:42:49 bicatali Exp $
+
+*qhull-2010.1-r2 (03 Oct 2010)
+
+  03 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -qhull-2010.1-r1.ebuild, +qhull-2010.1-r2.ebuild,
+  files/qhull-2010.1-cmake-install.patch:
+  Error in previous patch, now installs all qhull headers to allow reverse
+  dependencies to be compatible
 
 *qhull-2010.1-r1 (03 Oct 2010)
 
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index e815f5f2a2b4..e1f261db0fcf 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -2,21 +2,21 @@
 Hash: SHA1
 
 AUX qhull-2003.1-makefile.patch 2105 RMD160 7f5d07d24c391660321e8a16ff80e1943f130337 SHA1 a871c5bf98c97e5f0f27e23175db7c9b4ad459c6 SHA256 a3003fdd083bf47c04b3ac346b3f64888fcf947f0141db00e01a382bccf54e82
-AUX qhull-2010.1-cmake-install.patch 3335 RMD160 4272ca26206c88694d8cefd5e73821c09f1c13a2 SHA1 ddb9402441f21a2eadd2b8c23eda74c060fa1aab SHA256 2f1a89bcf09cdc26b97fcf89d899b554dde4905166feef45acbfa03032e2ea3b
+AUX qhull-2010.1-cmake-install.patch 3343 RMD160 05f37393716a696c0bbe45bde0232295f5c84382 SHA1 0a7747eb13c2e07c25882c1f0f5c0dfb4ef1c8c0 SHA256 865b27a10d878d7ded45446e7dffc9369fdafa021e49bafe5575a32fbed1e200
 AUX qhull-2010.1-overflows.patch 1884 RMD160 2f8648009b4f72f8143caf16267d579e567805dd SHA1 21295d57af2f8cdfc775512fa44fe90f49d89c41 SHA256 8f49ad703f47467fd74d88614e1bbf7927b57c9c2af3c492fc2848f27a5f3181
 AUX qhull-3.1-makefile.patch 2516 RMD160 539e9ca64a8fc8e7a8af9525c11cd3e2e09ea6f7 SHA1 016009629a0b174384a4f805d894bb0dd9e69d1e SHA256 5685cad5fb45b05444ebb6c2867974aad3391a9936070f976a5b58aeb52c27a7
 DIST qhull-2003.1.tar.gz 724313 RMD160 6c82ad27601f9aa12498e3bc08f06c7b777a5f4d SHA1 2e783b5e45cecc053b1dc08c682b871dfbb59dd2 SHA256 68725c96603a426da748d38d0f83e7a9dd6a0bfc483525debe04001846475b0b
 DIST qhull-2010.1-src.tgz 674457 RMD160 840530f0d103cfa0bd86d0226a41084866dd5ca2 SHA1 ed480912e03efdd767195c06c7e8c252c78112b1 SHA256 557085fb441b9b5a24589e08d7b1ae71ecd234fcb43ef4f8ffde141d22e316be
 DIST qhull3.1.tgz 442679 RMD160 11cad251d238725589fa0ec454caf714a98e3840 SHA1 598a297105199efd69799941acf154f69adc0607 SHA256 c4bf2035b2bdc86094b244fbe5a9ae0df9fdc2af4d96a4d0ba93a7060af2b30e
 EBUILD qhull-2003.1-r1.ebuild 776 RMD160 5aa1f847685166a03b2373ed94b18c89f1b7e198 SHA1 77215a4cd5ba736e7ba696940ee084eece425501 SHA256 4721a67ef34b75fd453042b76d8d9c63c4941e7e164f8b485aeca537217f840b
-EBUILD qhull-2010.1-r1.ebuild 930 RMD160 84b0d8b8cc0b26262cbdfbdfe29f6c3e5d6a2b37 SHA1 918a4b5f76549dbeea4209fde73d1941704efa27 SHA256 dda9077b53c2d9a5d699ad61847e7b89de6930f9196915853ea535d1828bf2b9
+EBUILD qhull-2010.1-r2.ebuild 930 RMD160 1b610ab66ba0dec6c9d5b6c4ff6beb2c992a2231 SHA1 9414a36c1b4c57ef1450d3c71f9a40afa4b2ce24 SHA256 854279ac3d1e730f2810b781e875d708556c157caaab05b9174d2190f34ba6a8
 EBUILD qhull-3.1-r1.ebuild 1190 RMD160 e1a85bc57b69072b408e7efd95fc4073eb281f6d SHA1 89d5fd2a8a18401335021f141492f8265aa6cd1c SHA256 6b6c6a8dfe431c074063e597ed27a10a5f317ef07ecc32fba2bb67e26d91183b
-MISC ChangeLog 5536 RMD160 1405445363a96dc659aca1279cf786a964d204e3 SHA1 8e50f91663eea28a7af4e08986c9e4c3616a463e SHA256 398163aae981e3d7d516eb7154b8d7fe655225bbc3dd8aa167946abcbdb411b7
+MISC ChangeLog 5825 RMD160 f180b449171a4e93c4724f02335e90bbe41cd589 SHA1 6aeb54a2dc85df49ea3bc2109563704c8e3fdced SHA256 28a3ba5c35f5df5792b7483c3b2c991de80c4ca21362650d12d0a424230e5ffe
 MISC metadata.xml 868 RMD160 2a19303a67c0fa027b2184f9c69cfcba97ef898b SHA1 c7c349b68ed3ca785b2cdd9c69e2986d3dd58eed SHA256 70f5b10b77085086e04610e478a4c3dc68af409f0fb5ceafdd5076c8d054fe8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyo+/AACgkQ1ycZbhPLE2DemwCfScSRnUGaAb6OBmWmICN75DJz
-jJAAnRZdNd6O/ORLpOZk8SEHBVkbmajS
-=6pgb
+iEYEARECAAYFAkypFQIACgkQ1ycZbhPLE2AXTQCeIMcxqvvp2s8tvOYzPURgcVaG
+f/0An2qZAgKLpyuwtkIfE2n4UJ3hPRpA
+=0WXv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/qhull/files/qhull-2010.1-cmake-install.patch b/media-libs/qhull/files/qhull-2010.1-cmake-install.patch
index 2a110a6ee7e2..9e1914d13d29 100644
--- a/media-libs/qhull/files/qhull-2010.1-cmake-install.patch
+++ b/media-libs/qhull/files/qhull-2010.1-cmake-install.patch
@@ -1,6 +1,6 @@
 diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt
---- qhull-2010.1.orig/CMakeLists.txt	2010-01-10 00:07:32.000000000 +0000
-+++ qhull-2010.1/CMakeLists.txt	2010-10-03 22:16:50.000000000 +0100
+--- qhull-2010.1.orig/CMakeLists.txt	2010-10-03 23:04:04.000000000 +0100
++++ qhull-2010.1/CMakeLists.txt	2010-10-03 23:26:54.000000000 +0100
 @@ -1,8 +1,44 @@
  project(qhull)
 -cmake_minimum_required(VERSION 2.4)
@@ -51,8 +51,8 @@ diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt
 +install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
 +endif (WITH_DOCS)
 diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt
---- qhull-2010.1.orig/src/CMakeLists.txt	2010-01-10 00:07:32.000000000 +0000
-+++ qhull-2010.1/src/CMakeLists.txt	2010-10-03 22:21:34.000000000 +0100
+--- qhull-2010.1.orig/src/CMakeLists.txt	2010-10-03 23:04:04.000000000 +0100
++++ qhull-2010.1/src/CMakeLists.txt	2010-10-04 00:23:47.000000000 +0100
 @@ -23,8 +23,25 @@
  
  file(GLOB qhull_hdr *.h)
@@ -95,4 +95,4 @@ diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt
 +install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
 +	RUNTIME DESTINATION ${BIN_INSTALL_DIR} 
 +	LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-+install(FILES libqhull.h DESTINATION ${INCLUDE_INSTALL_DIR})
++install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull)
diff --git a/media-libs/qhull/qhull-2010.1-r1.ebuild b/media-libs/qhull/qhull-2010.1-r2.ebuild
index 0c5636f42871..1f89c91fac4c 100644
--- a/media-libs/qhull/qhull-2010.1-r1.ebuild
+++ b/media-libs/qhull/qhull-2010.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r1.ebuild,v 1.1 2010/10/03 21:55:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.1 2010/10/03 23:42:49 bicatali Exp $
 
 EAPI=3