Remove old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 13 insertions, 131 deletions

diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index f607787d1699..16368cfdc71c 100644
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/borg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.16 2015/08/06 15:34:10 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.17 2015/08/06 16:01:40 monsieurp Exp $
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> -borg-1.7.4-r1.ebuild,
+  -borg-1.7.4-r2.ebuild:
+  Remove old.
 
 *borg-1.7.4-r3 (06 Aug 2015)
 
diff --git a/app-office/borg/Manifest b/app-office/borg/Manifest
index 1bedb0d25fe7..9083ad265312 100644
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -2,19 +2,17 @@
 Hash: SHA256
 
 DIST borg_src_1_7_4.zip 4012440 SHA256 b27eb694987c25134d8381d70f4daeb13c6702f75887768e49c0746ad4fb0d1c SHA512 6b68826dbdf958089be2ecee3d05e10750ae3512a40409642ab37913351298f8c180632932a570c5b5ceb6a3f574ceb86fca889e213bf0deaaa787b35307923e WHIRLPOOL 787e8f379274099d93328c3ab9e1297402a1af1977bae29b1d4982e8b9eb8be8da63521192f025244137fdcd09bb2da69c4e08afd2a0622e00705ca5e1dd142a
-EBUILD borg-1.7.4-r1.ebuild 1544 SHA256 2b38d62ef2e68a3034d7bcd5158e7778fc04b0c31cde4632c5fe5d0730ba17a5 SHA512 35d33886eed3f5da9605a697b6d1b828181eb2304135b544960234b03c56238cf16a3b0c60bb473306c2a221ae2d40dd5ca1d6ed8d4b0b4c69c936c62d86176a WHIRLPOOL f12e50003b5bcde5cff3dde81b54962dd375619778b5f00106fda963cfae025548aee1f1922786760442ef9e3dee492a72f2686e85b76db2db9a37309e953a3e
-EBUILD borg-1.7.4-r2.ebuild 1547 SHA256 8e0f75f0f77cfb18bd83ecf5c6c7e13a7df95d321bdd0783d5083a1f1d2b5946 SHA512 ea5b3bad6024da914dc3df67ac298d67bf07df167388fb383633412a0f67f397bd7cdbf07a2eced2d897716d55f92d40dcff1095ef9897ca7f26283caa166c96 WHIRLPOOL 343cbb6e60b50556f4c1b6da3ed3d7a6272a43fcec5d8a63ad639f1c734047e8305063d38cbf43b0cab6b8002cd82c030ecea63509506e9a466487af199ebc59
 EBUILD borg-1.7.4-r3.ebuild 1547 SHA256 eac803120b4eef6091abccfd93c4729144bb6835427d1fddf2f7878f50a970d2 SHA512 eac5fb60b8663cbe27fda1d5b9271f430fd78488f4df358785b2873e902fc92b9a1d5d989b7ca840b8b0d89c4e92a4d23c6ac02c76461e0caefb875fefecd143 WHIRLPOOL b411763ac1b2eb0632b113184f920c166f1d8a4f63ec6f63c28a9d06762baa1e1f975a4328ba87739454e4bc69579301949c7353213be5ad12a31204552c733e
-MISC ChangeLog 2367 SHA256 a67344c0c3ea2d445d4bcd84cd29bb2601cf6b7ca837533dacbdaf218191274e SHA512 72b42ffdd648f21e79d7cb009329f05a993535c9fa636dc5ff0642080a28bd8f61e3634cb1f53a5e63856709d9ab7fd1b6a53a265aa1ba56a6c68cda3ca11f34 WHIRLPOOL 6a55aab24e6ba3ea1ed642948ab893b5d80342064d74b441cc7df9f8e297ae20a9bb982a83f2b1a7efac218156f550999e9511b232f39130588642ad0b47c4e6
+MISC ChangeLog 2484 SHA256 54516f231531f9a099c3ad65f36acfc86de96519a6e7121597bff9782142c761 SHA512 2ec940453f6b3f582432983485ba59ba1a1b4dbf51c1d63aa51e06f6333c56dd126fe34ffc2f6a7e41fd487bd75afc0987d5c267d7fd3c43580d86da6ed7b1d7 WHIRLPOOL 2b87c0a93c3b314e4e5b65369d415e68640c31e9f76ea6cb80ea29de4e399e0035eca2495f09b553e57ff9f550abe781d4324a54951ee4fc6e54e60809560e7e
 MISC metadata.xml 241 SHA256 90c252ebf16bd02e98dcc36ee8cf98008f6cddc757c654d817351217354890c9 SHA512 7574f76d1cbd843404064285cb5d2d10dbea5a8b19c6e1baada63fa1de25584a13bbf2317261f88cc491e4bf98fca57c829c2c156f8542c78e2d428cd20c2044 WHIRLPOOL 0129537fd23ff419c278a3d02e327bd41ec50fbc5f95d6c8266c86c67be713430214835c95553c41c027a47d3fade7a8d5199f9bc662ecdd0b16c17bca930e7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVw4ykAAoJEJGRpfGTSRu4ne8H/03Xjwr9zjRxqZbIDQO1Azt9
-W9P8m2waW5xQa8YeLeoAlBx4zDO+plajGrNydg6VIN/AAMXpNhSIO1sctjYzgSRx
-wjKzk6ywvu9X7v14CJ9g4lHsx20BlhqYHdC8fZooauHFBCO/Vci410JB3hSC+wZ3
-Do44EAZLBOgNO3HYeiBLwo4evdCVg/JpP13dul3OQIHTOZFV24ZGEvZ475S0s4ay
-90K9rNdnI+6AR3evXECY70ff94jkq8AEA0GB+PwBGEJZUIlozIKSlnb0Jv9IegEd
-HImVbFRLSmEdSE17eV6b9yy5JnirIPC+Vo5/DzjqkWDPYa6Fjy7B/7aK6VERpt0=
-=E41c
+iQEcBAEBCAAGBQJVw5MXAAoJEJGRpfGTSRu4gp4H/igyXmyWL/2B/x6ANT2wu8FN
+6JM48VGPhWDKcYhPHfA9XJJHsi6xcLILDT5zYQz/amsela2zVlmJ1yYgD3QBR+B+
+EmHsYwSEwpxYZ5CxiO4kosrVS/BdG5bVXSCpYZw8OR1oIqyHNKLEdcr3pjomQzcK
+OwxIrUIu3biIfcL0pnYlwdTe4QfG6IyUKZ/YglvZPyrRtdR42KWxqteOzvxht9iL
+Xsu+VY8EL2aYUxUoaNKOAr6TZK5yWlZnMamJQKcBPUu9N08RMqM08Uo4Ky8Xf9bC
+wz/1GLdFeE8sCFhxAGOdG0yotigp+oQ7hutnlALdMaBiRpnkW1jbN5+fSu37xUo=
+=U/56
 -----END PGP SIGNATURE-----
diff --git a/app-office/borg/borg-1.7.4-r1.ebuild b/app-office/borg/borg-1.7.4-r1.ebuild
deleted file mode 100644
index 55908958be2d..000000000000
--- a/app-office/borg/borg-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-r2.ebuild b/app-office/borg/borg-1.7.4-r2.ebuild
deleted file mode 100644
index 35fef727253a..000000000000
--- a/app-office/borg/borg-1.7.4-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/04/05 20:50:28 monsieurp Exp $
-
-EAPI=5
-
-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/*
-}