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
commit11b9dcd9649c0853232d598c107abbd8761c599d (patch)
treee2248d962c85e00f1aefb6b1bea2689cff4ad2c4 /app-admin/389-admin-console
parentDisable parallel install (bug #341111). (diff)
downloadhistorical-11b9dcd9649c0853232d598c107abbd8761c599d.tar.gz
historical-11b9dcd9649c0853232d598c107abbd8761c599d.tar.bz2
historical-11b9dcd9649c0853232d598c107abbd8761c599d.zip
fix jar installation, make 389-console not crash, revision bump
Package-Manager: portage-2.2_rc77/cvs/Linux x86_64
Diffstat (limited to 'app-admin/389-admin-console')
-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
-rw-r--r--app-admin/389-admin-console/Manifest4
3 files changed, 17 insertions, 8 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:
diff --git a/app-admin/389-admin-console/Manifest b/app-admin/389-admin-console/Manifest
index 1099902ca61b..75929e05dc9f 100644
--- a/app-admin/389-admin-console/Manifest
+++ b/app-admin/389-admin-console/Manifest
@@ -1,4 +1,4 @@
DIST 389-admin-console-1.1.4.tar.bz2 125613 RMD160 8913f073c18bad77c148e7b304e1c145126b3ce2 SHA1 29a4ba674b4f532c67ed1303162e5b232bcf9821 SHA256 bf57f4dcd6f41d195ca7fff2f71663b8c394edf6c95d5778f78a0569436c5be4
-EBUILD 389-admin-console-1.1.4.ebuild 2042 RMD160 e47e2d8d15bca9a57161e8bf530e7d7b76ec7fb2 SHA1 0d3274fa15cc1f5dbcfb51ebb11ca6dc092acfd9 SHA256 8eb299a3cef007034d963dbb12848b005bfa6f6180a98753ec50938619ad4893
-MISC ChangeLog 581 RMD160 a1836c491966acd8fd2f03f1ba7a4320851e318b SHA1 f53eefd943b13b7e844d94f14eb9d66384ab69e5 SHA256 373304f93a04d13a19ceaa1feeddf805647bc0ac9c79cf722a9bb1d730c19397
+EBUILD 389-admin-console-1.1.4-r1.ebuild 2297 RMD160 5a31bb8c2c224eace8b73fec53997593c8821fa4 SHA1 064b01c91e780b29cfc1a8435a0afd06a20a8efd SHA256 e1112c0e13ea2ad8eab6d717552bd664bb4715e019e127ca9f3842fc4463d454
+MISC ChangeLog 812 RMD160 119722c39a624bba9eceb86f93df7683e87e80f6 SHA1 cc4f3fe11454b9bc23d552ceeb4271b374cff511 SHA256 05b81aa706683e5b3eb2a13a426b52639dbb240cd382436378b61d7bc0b3bb59
MISC metadata.xml 1675 RMD160 bfbf38bb6cd7d354d5477c1a72c31f49b5573eb6 SHA1 6c46939d3c00aaef72128db92f19939fe13f4284 SHA256 f5c0a5568ad1122307f093d645f6b9d03676f004253292e39c8cfc799ab8c518