Remove old. Gets rid of dependency dev-java/servletapi. #Bug 398689

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 21 insertions, 101 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/Manifest b/app-office/borg/Manifest
index 6ea8aef37b64..871683ec7ca9 100644
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -1,8 +1,18 @@
-DIST borg_src_1.4.zip 1205432 RMD160 7dede3d37db1c12d5f4415fba86a09e37afe37e0 SHA1 44ec2153d796d144ac0aa741b99876e70d55c479 SHA256 f832654ad6acbe54593cf326cd483044de8cd0d23d75e272d61dfa4aaa4e0dad
-DIST borg_src_1_5_2.zip 4173264 RMD160 c3a1b3eac1000b58c1722dd9d04270a743902a3d SHA1 40819e73062c1a485362aafc605a448843628e57 SHA256 410060ff5e5b4fe3eef61d2b83b19ecc497084a465d72e72382f3a0844f65c0a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST borg_src_1_7_4.zip 4012440 RMD160 a425cefee55f10d5fbc1a32ec60979e8b19aa53b SHA1 9961530ae6e6d3249a3755500832e10592005454 SHA256 b27eb694987c25134d8381d70f4daeb13c6702f75887768e49c0746ad4fb0d1c
-EBUILD borg-1.4-r1.ebuild 890 RMD160 b5b7e23b9ce91b27d1561d643c63ed411a855d45 SHA1 4cf32183d49a4f8ac988bb2feb479d8bc9c02ac6 SHA256 3785de617d9c8b1e9fd3c8614cde7af00c9a8710cb7097616f97a6711106e5a3
-EBUILD borg-1.5.2.ebuild 1584 RMD160 09d14336a78330e4ad7cc6f202c397052b6f238f SHA1 2508fd10ff5a3a0eeb6de46e0749c55879c16215 SHA256 bc4cce59ef4348a5bee1e324fc02ab13913b0dee627db1099d90efb6f63b2592
 EBUILD borg-1.7.4.ebuild 1559 RMD160 1b1fe0bd63612036533bc2cee94698d1496a3d9a SHA1 5f4497404afaed8daa5d1c0f6906cf0216b6c6a0 SHA256 69d737e20e221fea81bbd213e29f46083b36f46bbca9a1e5d8dce991d797d868
-MISC ChangeLog 1469 RMD160 ec0f337c83e664832e7e0990cd41894ce01360b0 SHA1 311b62049e34797833cba47acf7042cf4fb9dee5 SHA256 79445b1de96bd869b60626b5eafec751a349ff7e960af912b0d4a18a2d5e17e9
+MISC ChangeLog 1629 RMD160 10cdc54e54350e920cb7f7f2ca0a722aace1b567 SHA1 c10290fff5092d444d5390712ccf32d10873b13f SHA256 78e2d5134caf6c7fa75f1b7be3af3cd499753d8ebbb53b344067a59a16b7911d
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPECa4AAoJEIUJ+svaV163WsMH/0WcrLgasfRPkf3hlzqrXQ8C
+MK34n8uCp1xxBVbOM5WCjxzY2S2Ew8jG+LEXkpIw7GXBSlV1S5ZVEkTwUhZl1Aoy
+ZdQsqKA1EH9PfGngNoKBMxs3NBeovcJ0N3XM9tkj+bOGMkLIOK118LN8nbXtNlAX
+00Smiy5Zob0faTm0LZLpR9b6Dgs5pauhrHlq2XoTZf6CTIad8doVR3gBsSOblVhD
+tfYM+tX8QPZ+5yamm0OAN3mbNxuaw8iZOcC52/yeLMRoo9hc72RMz1MnqJBJo1+l
+vHbtnrBcBPdHzk5+f4B2A9SKOj9p1I64fjIHeNPZjUjbG2Ox3LOKL4fBOwMKl6o=
+=wrEA
+-----END PGP SIGNATURE-----
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
-}