Dont use use in global scope. #433088

Use javamail virtual instead of hardcoding sun-javamail.
Fix installing docs and allow installing sources.
Major code cleanup.

(Portage version: 2.1.11.13/cvs/Linux x86_64)

3 files changed, 70 insertions, 58 deletions

diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index daf87e3421c3..784c2461e055 100644
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/borg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.12 2012/01/13 12:42:18 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.13 2012/09/29 08:27:26 sera Exp $
+
+*borg-1.7.4-r1 (29 Sep 2012)
+
+  29 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -borg-1.7.4.ebuild,
+  +borg-1.7.4-r1.ebuild:
+  Dont use use in global scope. #433088
+  Use javamail virtual instead of hardcoding sun-javamail.
+  Fix installing docs and allow installing sources.
+  Major code cleanup.
 
   13 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -borg-1.4-r1.ebuild,
   -borg-1.5.2.ebuild:
diff --git a/app-office/borg/borg-1.7.4-r1.ebuild b/app-office/borg/borg-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..55908958be2d
--- /dev/null
+++ b/app-office/borg/borg-1.7.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.7.4-r1.ebuild,v 1.1 2012/09/29 08:27:25 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PN="${PN}_src"
+MY_PV="$(replace_all_version_separators _ )"
+
+DESCRIPTION="Calendar and task tracker, written in Java"
+HOMEPAGE="http://borg-calendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/borg-calendar/borg%201.7/BORG%20${PV}/${MY_PN}_${MY_PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/javahelp:0
+	java-virtuals/javamail:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5
+	dev-db/hsqldb:0
+	dev-java/jgoodies-looks:2.0"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}/BORGCalendar"
+
+java_prepare() {
+	# Upstream is dead and we already have dev-java/jcalendar
+	# but it's not the same thing.
+	find -name '*.jar' -! -name 'jcalendar.jar' \
+		-exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="borg-jar help-jar"
+EANT_GENTOO_CLASSPATH="javahelp javamail"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar build/lib/${PN}help.jar
+	java-pkg_dojar lib/jcalendar.jar
+	java-pkg_register-dependency hsqldb,jgoodies-looks-2.0
+
+	java-pkg_dolauncher ${PN} --main net.sf.borg.control.Borg
+
+	use doc && java-pkg_dojavadoc docs
+	use doc && java-pkg_dosrc src/*
+}
diff --git a/app-office/borg/borg-1.7.4.ebuild b/app-office/borg/borg-1.7.4.ebuild
deleted file mode 100644
index b88197b30f02..000000000000
--- a/app-office/borg/borg-1.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.7.4.ebuild,v 1.1 2011/01/18 16:51:44 fordfrog Exp $
-
-EAPI="3"
-inherit versionator java-pkg-2 java-ant-2
-
-DESCRIPTION="Calendar and task tracker, written in Java"
-HOMEPAGE="http://borg-calendar.sourceforge.net/"
-MY_PN="${PN}_src"
-MY_PV="$(replace_all_version_separators _ )"
-SRC_URI="mirror://sourceforge/borg-calendar/${MY_PN}_${MY_PV}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-COMMON_DEP="
-	dev-java/sun-javamail:0
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}
-	dev-db/hsqldb:0
-	dev-java/jgoodies-looks:2.0"
-
-S="${WORKDIR}/${MY_PN}"
-SUBDIR="${S}/BORGCalendar"
-
-EANT_BUILD_XML="${SUBDIR}/ant/build.xml"
-EANT_BUILD_TARGET="borg-jar help-jar $(use_doc javadoc)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream is dead and we already have dev-java/jcalendar
-	# but it's not the same thing
-	mv "${SUBDIR}"/lib/jcalendar.jar "${T}"
-	find -name "*.jar" | xargs rm -fv
-
-	pushd "${SUBDIR}"/lib >/dev/null
-	java-pkg_jar-from javahelp
-	java-pkg_jar-from sun-javamail
-	mv "${T}/jcalendar.jar" . || die
-	popd >/dev/null
-}
-
-src_install() {
-	java-pkg_dojar "${SUBDIR}"/dist/${PN}.jar
-	java-pkg_dojar "${SUBDIR}"/build/lib/${PN}help.jar
-	java-pkg_dojar "${SUBDIR}"/lib/jcalendar.jar
-	java-pkg_register-dependency hsqldb,jgoodies-looks-2.0
-
-	java-pkg_dolauncher ${PN} --main net.sf.borg.control.Borg
-}