[gentoo-commits] repo/gentoo:master commit in: app-office/hourglass/
commit: 71fef35624c8707bc5f2a43b84a39078dec1e6f7
Author: Patrice Clement gentoo org>
AuthorDate: Wed May 17 15:02:46 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed May 17 15:09:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fef356
app-office/hourglass: stable for amd64+x86.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
app-office/hourglass/hourglass-0.7.2-r1.ebuild | 33 ++
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/app-office/hourglass/hourglass-0.7.2-r1.ebuild
b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
index a492e7f058f..b096765f5c8 100644
--- 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"
[gentoo-commits] repo/gentoo:master commit in: app-office/hourglass/
commit: 096336ba38d040bcc3a5568445a9c51fb9027761
Author: Patrice Clement gentoo org>
AuthorDate: Wed May 17 15:03:04 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed May 17 15:10:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096336ba
app-office/hourglass: clean up old.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
app-office/hourglass/hourglass-0.7.2.ebuild | 52 -
1 file changed, 52 deletions(-)
diff --git a/app-office/hourglass/hourglass-0.7.2.ebuild
b/app-office/hourglass/hourglass-0.7.2.ebuild
deleted file mode 100644
index a1e30082279..000
--- a/app-office/hourglass/hourglass-0.7.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A PSP (personal software process) time tracking utility written
in Java"
-HOMEPAGE="http://hourglass.wiki.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/log4j
- dev-java/jcommon:1.0
- dev-java/jdom:1.0"
-
-DEPEND=">=virtual/jdk-1.5
- dev-java/ant-core
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-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:1.0 jdom.jar)" >>
conf/local.properties
- echo "jar.ant=$(java-pkg_getjar --build-only ant-core ant.jar)" >>
conf/local.properties
-}
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="javadoc"
-
-src_install() {
- java-pkg_dojar "dist/${P}/lib/${PN}.jar"
-
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/*
-
- java-pkg_dolauncher "${PN}" \
- --main "net.sourceforge.hourglass.swingui.Main"
-
- make_desktop_entry "${PN}" "Hourglass" "appointment-new" "Office"
-
- dodoc README ChangeLog AUTHORS
-}
[gentoo-commits] repo/gentoo:master commit in: app-office/hourglass/
commit: 0b5df6c8cee467fcfcf405504d74559b81e23980
Author: William L. Thomson Jr o-sinc com>
AuthorDate: Thu Sep 17 23:46:11 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Sep 29 21:19:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5df6c8
app-office/hourglass: Updated dev-java/jdom slot from 1.0 -> 0 for v1
app-office/hourglass/hourglass-0.7.2-r1.ebuild | 53 ++
1 file changed, 53 insertions(+)
diff --git a/app-office/hourglass/hourglass-0.7.2-r1.ebuild
b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
new file mode 100644
index 000..eae8b3b
--- /dev/null
+++ b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A PSP (personal software process) time tracking utility written
in Java"
+HOMEPAGE="http://hourglass.wiki.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/log4j
+ dev-java/jcommon:1.0
+ dev-java/jdom:0"
+
+DEPEND=">=virtual/jdk-1.5
+ dev-java/ant-core
+ ${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.5
+ ${COMMON_DEPEND}"
+
+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
+}
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="javadoc"
+
+src_install() {
+ java-pkg_dojar "dist/${P}/lib/${PN}.jar"
+
+ use doc && java-pkg_dojavadoc build/doc/api
+ use source && java-pkg_dosrc src/*
+
+ java-pkg_dolauncher "${PN}" \
+ --main "net.sourceforge.hourglass.swingui.Main"
+
+ make_desktop_entry "${PN}" "Hourglass" "appointment-new" "Office"
+
+ dodoc README ChangeLog AUTHORS
+}
