summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-17 19:24:38 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-17 19:24:38 +0000
commite1b00f0f1079e77be977f7f5cce62237eda01e17 (patch)
treebfc96a0fa5a2d2ba09877bfb675d1b19d0c04463 /sci-libs/neartree
parentDrop oss and mtp USE flags as the plugins were dropped upstream. (diff)
downloadgentoo-2-e1b00f0f1079e77be977f7f5cce62237eda01e17.tar.gz
gentoo-2-e1b00f0f1079e77be977f7f5cce62237eda01e17.tar.bz2
gentoo-2-e1b00f0f1079e77be977f7f5cce62237eda01e17.zip
sci-libs/neartree: Install docs into $PF, #421629
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/neartree')
-rw-r--r--sci-libs/neartree/ChangeLog8
-rw-r--r--sci-libs/neartree/files/CMakeLists.txt4
-rw-r--r--sci-libs/neartree/neartree-3.1.1-r3.ebuild (renamed from sci-libs/neartree/neartree-3.1.1-r2.ebuild)7
3 files changed, 15 insertions, 4 deletions
diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 01fc1f36bec8..c4e628a81696 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/neartree
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.21 2012/05/30 19:04:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.22 2012/06/17 19:24:38 jlec Exp $
+
+*neartree-3.1.1-r3 (17 Jun 2012)
+
+ 17 Jun 2012; Justin Lecher <jlec@gentoo.org> -neartree-3.1.1-r2.ebuild,
+ +neartree-3.1.1-r3.ebuild, files/CMakeLists.txt:
+ Install docs into $PF, #421629
*neartree-3.1.1-r2 (30 May 2012)
diff --git a/sci-libs/neartree/files/CMakeLists.txt b/sci-libs/neartree/files/CMakeLists.txt
index fe112be9a4d4..cb4375da7964 100644
--- a/sci-libs/neartree/files/CMakeLists.txt
+++ b/sci-libs/neartree/files/CMakeLists.txt
@@ -17,5 +17,5 @@ set_target_properties(CNearTree PROPERTIES SOVERSION ${LIB_MAJOR} VERSION ${_sov
INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
install(FILES CNearTree.h rhrand.h TNear.h triple.h
DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-install(FILES README_NearTree.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/neartree-${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
-install(FILES README_NearTree.html index.html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/neartree-${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE}/html)
+install(FILES README_NearTree.txt DESTINATION ${DOC_DIR})
+install(FILES README_NearTree.html index.html DESTINATION ${DOC_DIR}/html)
diff --git a/sci-libs/neartree/neartree-3.1.1-r2.ebuild b/sci-libs/neartree/neartree-3.1.1-r3.ebuild
index c38190ed5e06..4a1059c848c9 100644
--- a/sci-libs/neartree/neartree-3.1.1-r2.ebuild
+++ b/sci-libs/neartree/neartree-3.1.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1-r2.ebuild,v 1.1 2012/05/30 19:04:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1-r3.ebuild,v 1.1 2012/06/17 19:24:38 jlec Exp $
EAPI=4
@@ -26,3 +26,8 @@ S="${WORKDIR}"/${MY_P}
src_prepare() {
cp "${FILESDIR}"/CMakeLists.txt . || die
}
+
+src_configure() {
+ local mycmakeargs=( -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" )
+ cmake-utils_src_configure
+}