summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-10-15 13:25:01 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-10-15 13:25:01 +0000
commitecfdc09a8106788f54e6da03f969c548795cdfdc (patch)
tree9acdf7aefff45b13f6ff8f5a34432a44a4ceb85f /app-admin
parentDisable parallel install (bug #341111). (diff)
downloadgentoo-2-ecfdc09a8106788f54e6da03f969c548795cdfdc.tar.gz
gentoo-2-ecfdc09a8106788f54e6da03f969c548795cdfdc.tar.bz2
gentoo-2-ecfdc09a8106788f54e6da03f969c548795cdfdc.zip
fix jar installation, make 389-console not crash, revision bump
(Portage version: 2.2_rc77/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild (renamed from app-admin/389-admin-console/389-admin-console-1.1.4.ebuild)13
-rw-r--r--app-admin/389-admin-console/ChangeLog8
2 files changed, 15 insertions, 6 deletions
diff --git a/app-admin/389-admin-console/389-admin-console-1.1.4.ebuild b/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild
index b0e00ff5f067..703570958ca5 100644
--- a/app-admin/389-admin-console/389-admin-console-1.1.4.ebuild
+++ b/app-admin/389-admin-console/389-admin-console-1.1.4-r1.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/app-admin/389-admin-console/389-admin-console-1.1.4.ebuild,v 1.2 2010/07/11 09:59:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/389-admin-console-1.1.4-r1.ebuild,v 1.1 2010/10/15 13:25:01 lxnay Exp $
EAPI="2"
@@ -53,11 +53,14 @@ src_compile() {
src_install() {
java-pkg_jarinto /usr/share/dirsrv/html/java
- java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}.jar 389-admin.jar
- java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}_en.jar 389-admin_en.jar
+ # have to install versioned jars, otherwise 389-console will crash
+ java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}.jar 389-admin-${MY_PV}.jar
+ java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}_en.jar 389-admin-${MY_PV}_en.jar
- dosym 389-admin.jar /usr/share/dirsrv/html/java/389-admin-${MY_PV}.jar
- dosym 389-admin_en.jar /usr/share/dirsrv/html/java/389-admin-${MY_PV}_en.jar
+ dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin.jar
+ dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}.jar
+ dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin_en.jar
+ dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}_en.jar
insinto /usr/share/dirsrv/manual/en/admin
doins "${S}"/help/en/*.html
diff --git a/app-admin/389-admin-console/ChangeLog b/app-admin/389-admin-console/ChangeLog
index c3d694c0eed1..1e809000d998 100644
--- a/app-admin/389-admin-console/ChangeLog
+++ b/app-admin/389-admin-console/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/389-admin-console
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.2 2010/07/11 09:59:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/389-admin-console/ChangeLog,v 1.3 2010/10/15 13:25:01 lxnay Exp $
+
+*389-admin-console-1.1.4-r1 (15 Oct 2010)
+
+ 15 Oct 2010; Fabio Erculiani <lxnay@gentoo.org>
+ -389-admin-console-1.1.4.ebuild, +389-admin-console-1.1.4-r1.ebuild:
+ fix jar installation, make 389-console not crash, revision bump
11 Jul 2010; Fabio Erculiani <lxnay@gentoo.org>
389-admin-console-1.1.4.ebuild: