commit: eda32ae006e68b6ce6b5f2b83de2f832db56dd55 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Tue Jul 18 06:34:17 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Jul 18 06:34:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda32ae0
app-admin/389-console: fix warnings and improve ebuild. Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-admin/389-console/389-console-1.1.7-r1.ebuild | 31 +++++++++++------------ 1 file changed, 15 insertions(+), 16 deletions(-) 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 index 79245f19325..25ca62955f9 100644 --- a/app-admin/389-console/389-console-1.1.7-r1.ebuild +++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -JAVA_PKG_IUSE="" - -inherit java-pkg-2 eutils java-ant-2 +inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="A Java based console for remote management 389 server" HOMEPAGE="http://port389.org/"; @@ -15,17 +13,19 @@ SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2 LICENSE="LGPL-2.1" SLOT="1.1" KEYWORDS="~amd64 ~x86" -IUSE="" -COMMON_DEP="dev-java/jss:3.4 +CDEPEND=" + dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1" -RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) - ${COMMON_DEP}" +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.6 - ${COMMON_DEP}" +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" src_prepare() { java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar @@ -37,17 +37,16 @@ src_compile() { eant -Dbuilt.dir="${S}"/build \ -Dldapjdk.local.location="${S}" \ -Djss.local.location="${S}" \ - -Dconsole.local.location="${S}" ${antflags} \ - || die "eant failed" + -Dconsole.local.location="${S}" ${antflags} } src_install() { java-pkg_newjar "${S}"/build/389-console-${PV}_en.jar 389-console_en.jar - java-pkg_dolauncher ${PN} --main com.netscape.management.client.console.Console \ + java-pkg_dolauncher ${PN} \ + --main com.netscape.management.client.console.Console \ --pwd "/usr/share/dirsrv/html/java/" \ - --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" \ - || die + --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" - doicon "${DISTDIR}"/fedora.png || die "doicon failed" + doicon "${DISTDIR}"/fedora.png make_desktop_entry ${PN} "Port389 Management Console" fedora System }
