1 |
commit: eda32ae006e68b6ce6b5f2b83de2f832db56dd55 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 18 06:34:17 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 18 06:34:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda32ae0 |
7 |
|
8 |
app-admin/389-console: fix warnings and improve ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-admin/389-console/389-console-1.1.7-r1.ebuild | 31 +++++++++++------------ |
13 |
1 file changed, 15 insertions(+), 16 deletions(-) |
14 |
|
15 |
diff --git a/app-admin/389-console/389-console-1.1.7-r1.ebuild b/app-admin/389-console/389-console-1.1.7-r1.ebuild |
16 |
index 79245f19325..25ca62955f9 100644 |
17 |
--- a/app-admin/389-console/389-console-1.1.7-r1.ebuild |
18 |
+++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild |
19 |
@@ -1,11 +1,9 @@ |
20 |
-# Copyright 1999-2014 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI=5 |
25 |
|
26 |
-JAVA_PKG_IUSE="" |
27 |
- |
28 |
-inherit java-pkg-2 eutils java-ant-2 |
29 |
+inherit eutils java-pkg-2 java-ant-2 |
30 |
|
31 |
DESCRIPTION="A Java based console for remote management 389 server" |
32 |
HOMEPAGE="http://port389.org/" |
33 |
@@ -15,17 +13,19 @@ SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2 |
34 |
LICENSE="LGPL-2.1" |
35 |
SLOT="1.1" |
36 |
KEYWORDS="~amd64 ~x86" |
37 |
-IUSE="" |
38 |
|
39 |
-COMMON_DEP="dev-java/jss:3.4 |
40 |
+CDEPEND=" |
41 |
+ dev-java/jss:3.4 |
42 |
dev-java/ldapsdk:4.1 |
43 |
>=dev-java/idm-console-framework-1.1" |
44 |
|
45 |
-RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) |
46 |
- ${COMMON_DEP}" |
47 |
+RDEPEND=" |
48 |
+ ${CDEPEND} |
49 |
+ >=virtual/jre-1.6" |
50 |
|
51 |
-DEPEND=">=virtual/jdk-1.6 |
52 |
- ${COMMON_DEP}" |
53 |
+DEPEND=" |
54 |
+ ${CDEPEND} |
55 |
+ >=virtual/jdk-1.6" |
56 |
|
57 |
src_prepare() { |
58 |
java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar |
59 |
@@ -37,17 +37,16 @@ src_compile() { |
60 |
eant -Dbuilt.dir="${S}"/build \ |
61 |
-Dldapjdk.local.location="${S}" \ |
62 |
-Djss.local.location="${S}" \ |
63 |
- -Dconsole.local.location="${S}" ${antflags} \ |
64 |
- || die "eant failed" |
65 |
+ -Dconsole.local.location="${S}" ${antflags} |
66 |
} |
67 |
|
68 |
src_install() { |
69 |
java-pkg_newjar "${S}"/build/389-console-${PV}_en.jar 389-console_en.jar |
70 |
- java-pkg_dolauncher ${PN} --main com.netscape.management.client.console.Console \ |
71 |
+ java-pkg_dolauncher ${PN} \ |
72 |
+ --main com.netscape.management.client.console.Console \ |
73 |
--pwd "/usr/share/dirsrv/html/java/" \ |
74 |
- --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" \ |
75 |
- || die |
76 |
+ --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" |
77 |
|
78 |
- doicon "${DISTDIR}"/fedora.png || die "doicon failed" |
79 |
+ doicon "${DISTDIR}"/fedora.png |
80 |
make_desktop_entry ${PN} "Port389 Management Console" fedora System |
81 |
} |