3 files changed, 6 insertions, 96 deletions
diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index 5ca75bf1282a..daf87e3421c3 100644
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/borg
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.11 2011/01/18 16:51:43 fordfrog Exp $
+# 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 $
+
+  13 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -borg-1.4-r1.ebuild,
+  -borg-1.5.2.ebuild:
+  Remove old. Gets rid of dependency dev-java/servletapi. #Bug 398689
 
 *borg-1.7.4 (18 Jan 2011)
 
diff --git a/app-office/borg/borg-1.4-r1.ebuild b/app-office/borg/borg-1.4-r1.ebuild
deleted file mode 100644
index 4a53fe9341e9..000000000000
--- a/app-office/borg/borg-1.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.4-r1.ebuild,v 1.1 2006/09/12 19:54:03 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Calendar and task tracker, written in Java"
-HOMEPAGE="http://borg-calendar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/borg-calendar/borg_src_${PV}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/borg_src/BORG Calendar Common/"
-
-src_compile() {
-
-	cd ant
-	eant borg-jar || die "compile problem"
-
-}
-
-src_install() {
-
-	java-pkg_dojar dist/${PN}.jar
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /usr/share/${PN}" >> ${PN}
-	echo "\${JAVA_HOME}/bin/java -jar \$(java-config -p borg) \$*" >> ${PN}
-
-	dobin ${PN}
-
-}
diff --git a/app-office/borg/borg-1.5.2.ebuild b/app-office/borg/borg-1.5.2.ebuild
deleted file mode 100644
index fd2f236a6dea..000000000000
--- a/app-office/borg/borg-1.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.5.2.ebuild,v 1.4 2009/12/17 10:49:53 ssuominen Exp $
-
-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=""
-COMMON_DEP="
-	=dev-java/commons-httpclient-3*
-	dev-java/sun-javamail
-	dev-java/ical4j
-	dev-java/javahelp
-	dev-java/jdictrayapi
-	=dev-java/servletapi-2.4*"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Upstream is dead and we already have dev-java/jcalendar
-	# but it's not the same thing
-	mv BORGCalendarCommon/lib/jcalendar.jar "${T}"
-	rm -v */lib/*.jar || die
-	rm -v */*/lib/*.jar || die
-	cd BORGCalendarCommon/lib/ || die
-	java-pkg_jar-from sun-javamail
-	java-pkg_jar-from commons-httpclient-3
-	java-pkg_jar-from ical4j
-	java-pkg_jar-from javahelp
-	java-pkg_jar-from jdictrayapi
-	java-pkg_jar-from servletapi-2.4
-	mv "${T}/jcalendar.jar" . || die
-}
-
-EANT_BUILD_XML="BORGCalendarCommon/ant/build.xml"
-EANT_BUILD_TARGET=" "
-
-src_install() {
-	java-pkg_dojar ./BORGCalendarCommon/dist/*.jar
-	java-pkg_dojar BORGCalendarCommon/lib/jcalendar.jar
-	java-pkg_dolauncher ${PN} --main net.sf.borg.control.Borg
-}