Apply EAPI=5 fixes from 0.7.1. Cleanup old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 10 insertions, 77 deletions

diff --git a/app-office/hourglass/ChangeLog b/app-office/hourglass/ChangeLog
index e9162772a37e..5c19a540ab47 100644
--- a/app-office/hourglass/ChangeLog
+++ b/app-office/hourglass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/hourglass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/hourglass/ChangeLog,v 1.8 2014/05/14 16:06:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/hourglass/ChangeLog,v 1.9 2014/07/26 18:51:36 mrueg Exp $
+
+  26 Jul 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/hourglass-0.7.1-build.xml.patch, -hourglass-0.7.1.ebuild,
+  hourglass-0.7.2.ebuild:
+  Apply EAPI=5 fixes from 0.7.1. Cleanup old.
 
   14 May 2014; Tom Wijsman <TomWij@gentoo.org> hourglass-0.7.1.ebuild:
   [QA] EAPI 1 -> 5. Make use of java_prepare.
diff --git a/app-office/hourglass/files/hourglass-0.7.1-build.xml.patch b/app-office/hourglass/files/hourglass-0.7.1-build.xml.patch
deleted file mode 100644
index 384c754b1e8a..000000000000
--- a/app-office/hourglass/files/hourglass-0.7.1-build.xml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml.old	2009-01-02 13:22:01.000000000 +1300
-+++ build.xml	2009-01-02 13:23:52.000000000 +1300
-@@ -105,7 +105,9 @@
-   </target>

-   

-   <target name="taskdef" depends="init">

--    <ant inheritall="false" antfile="${dir.tools}/build/build.xml" target="export" />

-+    <ant inheritall="false" antfile="${dir.tools}/build/build.xml" target="export" >

-+	<property name="jar.ant" value="${jar.ant}" />

-+    </ant>

-     <taskdef classpathref="classpath.taskdef"

-     	resource="net/sourceforge/hourglass/build/hourglass-ant.properties" />

-   </target>

diff --git a/app-office/hourglass/hourglass-0.7.1.ebuild b/app-office/hourglass/hourglass-0.7.1.ebuild
deleted file mode 100644
index 7afed207c892..000000000000
--- a/app-office/hourglass/hourglass-0.7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/hourglass/hourglass-0.7.1.ebuild,v 1.3 2014/05/14 16:06:54 tomwij Exp $
-
-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"
-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() {
-	#Remove in next release, already upstream.
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	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
-}
diff --git a/app-office/hourglass/hourglass-0.7.2.ebuild b/app-office/hourglass/hourglass-0.7.2.ebuild
index d1916402ee6f..c2c3a4054eec 100644
--- a/app-office/hourglass/hourglass-0.7.2.ebuild
+++ b/app-office/hourglass/hourglass-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/hourglass/hourglass-0.7.2.ebuild,v 1.4 2012/04/13 17:52:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/hourglass/hourglass-0.7.2.ebuild,v 1.5 2014/07/26 18:51:36 mrueg Exp $
 
-EAPI="1"
+EAPI=5
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -28,10 +28,7 @@ RDEPEND=">=virtual/jre-1.5
 
 S="${WORKDIR}/${P}-src"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+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