app-office/hourglass: stable for amd64+x86.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

diff --git a/app-office/hourglass/hourglass-0.7.2-r1.ebuild b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
index a492e7f058fa5a12d2d01324f0001f127f654bb0..b096765f5c80d1979e5e1ebf2e84955232e17401 100644 (file)
--- a/app-office/hourglass/hourglass-0.7.2-r1.ebuild
+++ b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,26 +12,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-COMMON_DEPEND="dev-java/log4j
-               dev-java/jcommon:1.0
-               dev-java/jdom:0"
+CDEPEND="
+       dev-java/jdom:0
+       dev-java/log4j:0
+       dev-java/ant-core:0
+       dev-java/jcommon:1.0"
 
-DEPEND=">=virtual/jdk-1.5
-       dev-java/ant-core
-       ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
-       ${COMMON_DEPEND}"
+DEPEND="
+       >=virtual/jdk-1.5
+       ${CDEPEND}"
+
+RDEPEND="
+       >=virtual/jre-1.5
+       ${CDEPEND}"
 
 S="${WORKDIR}/${P}-src"
 
 java_prepare() {
-       echo "jar.log4j=$(java-pkg_getjar log4j log4j.jar)" > conf/local.properties
-       echo "jar.jcommon=$(java-pkg_getjar jcommon:1.0 jcommon.jar)" >> conf/local.properties
-       echo "jar.jdom=$(java-pkg_getjar jdom jdom.jar)" >> conf/local.properties
-       echo "jar.ant=$(java-pkg_getjar --build-only ant-core ant.jar)" >> conf/local.properties
+       echo "jar.log4j=$(java-pkg_getjar log4j log4j.jar)" > conf/local.properties || die
+       echo "jar.jcommon=$(java-pkg_getjar jcommon:1.0 jcommon.jar)" >> conf/local.properties || die
+       echo "jar.jdom=$(java-pkg_getjar jdom jdom.jar)" >> conf/local.properties || die
+       echo "jar.ant=$(java-pkg_getjar --build-only ant-core ant.jar)" >> conf/local.properties || die
 }
 
 EANT_BUILD_TARGET="dist"