commit:     a4a96bc66864e6aabbc1b2edcfee32e2bc9f5312
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 19:29:37 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 19:33:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a96bc6

sci-libs/plplot: Fix .pc file by using full paths

* Use CMAKE_INSTALL_LIBDIR with a full path
* java-pkg_regso is not EPREFIX aware

Bug: https://bugs.gentoo.org/show_bug.cgi?id=610066

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/plplot/{plplot-5.12.0.ebuild => plplot-5.12.0-r1.ebuild} | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-libs/plplot/plplot-5.12.0.ebuild 
b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
similarity index 96%
rename from sci-libs/plplot/plplot-5.12.0.ebuild
rename to sci-libs/plplot/plplot-5.12.0-r1.ebuild
index 9cf3d800c8..92a67705fb 100644
--- a/sci-libs/plplot/plplot-5.12.0.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
@@ -143,6 +143,10 @@ src_configure() {
        append-cxxflags -std=c++11
 
        local mycmakeargs=(
+               # The build system does not honour CMAKE_INSTALL_LIBDIR as a
+               # relative dir, which is against the spirit of GNUInstallDirs, 
#610066
+               -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+
                ## Features
                -DBUILD_DOC=OFF
                -DBUILD_DOX_DOC=OFF
@@ -268,6 +272,6 @@ src_install() {
 
        if use java; then
                java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-               java-pkg_regso /usr/$(get_libdir)/jni/plplotjavac_wrap.so
+               java-pkg_regso 
"${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
        fi
 }

Reply via email to