diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-10-03 23:42:49 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-10-03 23:42:49 +0000 |
| commit | 71cac8e04ff30e58e0b1ca34fbcc15740c770327 (patch) | |
| tree | ad09cb41a8a3305781c2d739f19360c53495bc65 /media-libs/qhull | |
| parent | old (diff) | |
| download | gentoo-2-71cac8e04ff30e58e0b1ca34fbcc15740c770327.tar.gz gentoo-2-71cac8e04ff30e58e0b1ca34fbcc15740c770327.tar.bz2 gentoo-2-71cac8e04ff30e58e0b1ca34fbcc15740c770327.zip | |
Error in previous patch, now installs all qhull headers to allow reverse dependencies to be compatible
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/qhull')
| -rw-r--r-- | media-libs/qhull/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/qhull/files/qhull-2010.1-cmake-install.patch | 10 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2010.1-r2.ebuild (renamed from media-libs/qhull/qhull-2010.1-r1.ebuild) | 2 |
3 files changed, 15 insertions, 7 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/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 |