Version bump for bug #167121. Does not use bundled jars any more besides jcalendar...

Package-Manager: portage-2.1.2.3

diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index a9ae128410750477bc3721d2e5649e534664167d..672c9d661297cfc7aaf2a4113a993c424cf41dc3 100644 (file)
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/borg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.7 2007/02/16 15:20:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.8 2007/04/11 16:22:12 betelgeuse Exp $
+
+*borg-1.5.2 (11 Apr 2007)
+
+  11 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> +borg-1.5.2.ebuild:
+  Version bump for bug #167121. Does not use bundled jars any more besides
+  jcalendar.jar (see bug #174173).
 
   16 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> -borg-1.4.ebuild:
   Removed old generation 1 revision.

diff --git a/app-office/borg/Manifest b/app-office/borg/Manifest
index 55f68dd0cebb7bb69226d283188e8237f1bf5410..8d91176dadb2f2931f7fccc5e15484eea43c9348 100644 (file)
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 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
 EBUILD borg-1.4-r1.ebuild 890 RMD160 b5b7e23b9ce91b27d1561d643c63ed411a855d45 SHA1 4cf32183d49a4f8ac988bb2feb479d8bc9c02ac6 SHA256 3785de617d9c8b1e9fd3c8614cde7af00c9a8710cb7097616f97a6711106e5a3
 MD5 1067c61ae2cafb8978cf4e2721680f03 borg-1.4-r1.ebuild 890
 RMD160 b5b7e23b9ce91b27d1561d643c63ed411a855d45 borg-1.4-r1.ebuild 890
 SHA256 3785de617d9c8b1e9fd3c8614cde7af00c9a8710cb7097616f97a6711106e5a3 borg-1.4-r1.ebuild 890
-MISC ChangeLog 968 RMD160 7fd968c6000f607e4e3ea75483782bf780e2ec1a SHA1 6d4802556f48ff65d9e4bbbdfac3d6e3fcdb70e3 SHA256 1f4057956688d901ecc4cccf1a686db0164467c56ecd28a5d03e07191dce82e2
-MD5 1d82198d1c6ffae2e0086751ab59392e ChangeLog 968
-RMD160 7fd968c6000f607e4e3ea75483782bf780e2ec1a ChangeLog 968
-SHA256 1f4057956688d901ecc4cccf1a686db0164467c56ecd28a5d03e07191dce82e2 ChangeLog 968
+EBUILD borg-1.5.2.ebuild 1577 RMD160 1fde918d9343a721b3eedcf6787f4e8e7c727852 SHA1 af76d7cc229fc243fd88d8055425d74708f20913 SHA256 c3d72a8776e20f00e5fb80e9432f0ad278cc09a4a1eb8d002cfafd43ad037e91
+MD5 5c589d83a30408e07ffd750617024a9b borg-1.5.2.ebuild 1577
+RMD160 1fde918d9343a721b3eedcf6787f4e8e7c727852 borg-1.5.2.ebuild 1577
+SHA256 c3d72a8776e20f00e5fb80e9432f0ad278cc09a4a1eb8d002cfafd43ad037e91 borg-1.5.2.ebuild 1577
+MISC ChangeLog 1179 RMD160 8615f6adf6d99b8f36911765adc9672c1b7e365b SHA1 f3368f7ab1d7098aba6cad93e041a4b6f2667027 SHA256 2983ad7f0bf75bbf1ca7bacd3f6d3f51e2a8f7e3bb955a029efbce888d64f56c
+MD5 9d7daaadb15f4b89daa0adba583856e2 ChangeLog 1179
+RMD160 8615f6adf6d99b8f36911765adc9672c1b7e365b ChangeLog 1179
+SHA256 2983ad7f0bf75bbf1ca7bacd3f6d3f51e2a8f7e3bb955a029efbce888d64f56c ChangeLog 1179
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -17,10 +22,13 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 e4bd4f7039a3e9b0488b5bfef2cd4f62 files/digest-borg-1.4-r1 232
 RMD160 b3702a136a282b1e75f5b0840603453413338f29 files/digest-borg-1.4-r1 232
 SHA256 ce5091cc9acef673f7ebb78bb9ed47a41bea67a4bedd285961ff9b16d0900c00 files/digest-borg-1.4-r1 232
+MD5 a9aa688a2dae400130b6a45e032f34de files/digest-borg-1.5.2 238
+RMD160 3bb14ef1212489d4816f09e31eedbf916df509ee files/digest-borg-1.5.2 238
+SHA256 80d2f7dd3a616645d13e2d909796df150a1d6a4cf01a6d64c28361c51bee88f5 files/digest-borg-1.5.2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF1cuxcxLzpIGCsLQRAjqFAJ9/xPbwpbxT8ECjQ/r1Kl7poXjadQCeMRyR
-JTizibZVdi36xy4NgiK2gYQ=
-=zF1a
+iD8DBQFGHQs4cxLzpIGCsLQRAlnwAJ9waMmf+sok1HPhElVIaQlpC4xclQCfUUNg
+4MdKPVgm+8D6/6kXuvGmK/Q=
+=AYtf
 -----END PGP SIGNATURE-----

diff --git a/app-office/borg/borg-1.5.2.ebuild b/app-office/borg/borg-1.5.2.ebuild
new file mode 100644 (file)
index 0000000..0fcd8b9
--- /dev/null
+++ b/app-office/borg/borg-1.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 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.1 2007/04/11 16:22:12 betelgeuse 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="~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
+}

diff --git a/app-office/borg/files/digest-borg-1.5.2 b/app-office/borg/files/digest-borg-1.5.2
new file mode 100644 (file)
index 0000000..392b53e
--- /dev/null
+++ b/app-office/borg/files/digest-borg-1.5.2
@@ -0,0 +1,3 @@
+MD5 b69efb5c7fd0d2b42d1bf141212ed2af borg_src_1_5_2.zip 4173264
+RMD160 c3a1b3eac1000b58c1722dd9d04270a743902a3d borg_src_1_5_2.zip 4173264
+SHA256 410060ff5e5b4fe3eef61d2b83b19ecc497084a465d72e72382f3a0844f65c0a borg_src_1_5_2.zip 4173264