[gentoo-commits] proj/kde:master commit in: kde-base/krossjava/

[Johannes Huber]

commit:     0d2f40f6931c75ed9c93d0108f97a6cfa526610b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 18:00:25 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 18:00:25 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d2f40f6

[kde-base/krossjava] Fix symlink generation in src_install, bug #502190.

Package-Manager: portage-2.2.8-r1

---
 kde-base/krossjava/krossjava-4.12.49.9999.ebuild                        | 2 +-
 .../krossjava/{krossjava-4.12.80.ebuild => krossjava-4.12.80-r1.ebuild} | 2 +-
 kde-base/krossjava/krossjava-4.13.49.9999.ebuild                        | 2 +-
 kde-base/krossjava/krossjava-9999.ebuild                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-base/krossjava/krossjava-4.12.49.9999.ebuild 
b/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.12.49.9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
        kde4-meta_src_install
        java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-       dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+       dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
                /usr/$(get_libdir)/kde4/kross/kross.jar
        java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-4.12.80.ebuild 
b/kde-base/krossjava/krossjava-4.12.80-r1.ebuild
similarity index 93%
rename from kde-base/krossjava/krossjava-4.12.80.ebuild
rename to kde-base/krossjava/krossjava-4.12.80-r1.ebuild
index e6ce24f..9cda464 100644
--- a/kde-base/krossjava/krossjava-4.12.80.ebuild
+++ b/kde-base/krossjava/krossjava-4.12.80-r1.ebuild
@@ -45,7 +45,7 @@ src_install() {
        kde4-meta_src_install
        java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-       dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+       dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
                /usr/$(get_libdir)/kde4/kross/kross.jar
        java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-4.13.49.9999.ebuild 
b/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.13.49.9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
        kde4-meta_src_install
        java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-       dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+       dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
                /usr/$(get_libdir)/kde4/kross/kross.jar
        java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }

diff --git a/kde-base/krossjava/krossjava-9999.ebuild 
b/kde-base/krossjava/krossjava-9999.ebuild
index 1b4ac21..42c4eec 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -45,7 +45,7 @@ src_install() {
        kde4-meta_src_install
        java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
 
-       dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+       dosym ../../../share/${PN}-$(get_major_version ${SLOT})/lib/kross.jar \
                /usr/$(get_libdir)/kde4/kross/kross.jar
        java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
 }