Version bump, bugfixes.

Package-Manager: portage-2.1.2.9

4 files changed, 104 insertions, 5 deletions

diff --git a/dev-util/deskzilla/ChangeLog b/dev-util/deskzilla/ChangeLog
index b5e0673258fa..26ae5ff89e90 100644
--- a/dev-util/deskzilla/ChangeLog
+++ b/dev-util/deskzilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/deskzilla
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.3 2007/05/27 12:05:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.4 2007/06/09 11:16:21 caster Exp $
+
+*deskzilla-1.4_beta2 (09 Jun 2007)
+
+  09 Jun 2007; Vlastimil Babka <caster@gentoo.org>
+  +deskzilla-1.4_beta2.ebuild:
+  Version bump, bugfixes.
 
 *deskzilla-1.4_beta1 (27 May 2007)
 
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
index 85c247898c2b..cd199c8755ec 100644
--- a/dev-util/deskzilla/Manifest
+++ b/dev-util/deskzilla/Manifest
@@ -4,6 +4,7 @@ RMD160 35699d15d07c5b8a29e8f06d0233f9b7014abd97 files/deskzilla_gentoo.license 1
 SHA256 a11b89eedf8211d50ca13177b7d8d1fc59645a5c9faa13761525c24a9ae84a74 files/deskzilla_gentoo.license 1584
 DIST deskzilla-1_3_without_jre.tar.gz 6882713 RMD160 25070a37c7660c9b48a6ada1e108944c268a8298 SHA1 528fd05d61fa502a86402425d63c356d19fcabe3 SHA256 d96905cd50ad943a65b39789cd658c00d51f61404eb8ecc7c700561a4af2e289
 DIST deskzilla-1_4_b1_without_jre.tar.gz 6922854 RMD160 7f82ad3fd49a817f4b127fc2f5e48e5e009cf7d7 SHA1 fe4fe06d241075b5bf698b1c93c4d0cfc72a9aaf SHA256 048aa9700fc60f1bd6b1f757cb95f0955326be9536ec688160b2930cdabae52e
+DIST deskzilla-1_4_b2_without_jre.tar.gz 6927082 RMD160 fcdda56a433d3b10cb4ea8d0d38cd789c8395e7b SHA1 a16bae309e4d0a8c6baf46396c449090ef6e7454 SHA256 30e0fbfca2d6ccd8e538aa7babf45f5880fc17abbd5273eac1d200b93eff8e6f
 EBUILD deskzilla-1.3.ebuild 2503 RMD160 79ad7151a150746d24326434befb54d027fd3341 SHA1 d01144851c469dbbae08f163e6b924e4d717c0cd SHA256 2bbb4d1450e86dde8cd12a3cef077ca004a31994367e7cb6a54b229005faf8a4
 MD5 b589ac3eba91c6e160a781b6bf6891d2 deskzilla-1.3.ebuild 2503
 RMD160 79ad7151a150746d24326434befb54d027fd3341 deskzilla-1.3.ebuild 2503
@@ -12,10 +13,14 @@ EBUILD deskzilla-1.4_beta1.ebuild 2810 RMD160 1e696a3270d57719bef23ecf23a31c6374
 MD5 543e86ab8f762d238765ca2f26f0686c deskzilla-1.4_beta1.ebuild 2810
 RMD160 1e696a3270d57719bef23ecf23a31c63743937e9 deskzilla-1.4_beta1.ebuild 2810
 SHA256 bf99876e8c3c502380b79cc90269475e038dec19dc1421cc103979e798eae1cf deskzilla-1.4_beta1.ebuild 2810
-MISC ChangeLog 795 RMD160 15f60a2a0d760ee755cc6f6aae50dabcef5df6d2 SHA1 b32baf3e9ac9e62b70d5a3f2e86d2ba79349ba35 SHA256 80d1cbae236983a640de3323a11cba6ee8cf1cd377e4ae36f5ee5e7648cd4be1
-MD5 3f359dc4c905556ca722643bb8526cdc ChangeLog 795
-RMD160 15f60a2a0d760ee755cc6f6aae50dabcef5df6d2 ChangeLog 795
-SHA256 80d1cbae236983a640de3323a11cba6ee8cf1cd377e4ae36f5ee5e7648cd4be1 ChangeLog 795
+EBUILD deskzilla-1.4_beta2.ebuild 2810 RMD160 dbc3b68787be2ead49943da9aaa003cc322f8718 SHA1 a8060b6d87eefab829665bd0c0378f8e2ec017f1 SHA256 c355777c3343a5fe293806c18766d6d0253f8b80dcfdd4685338e30965bf10da
+MD5 69b93a0cfc6bec3644ca18a1d3866743 deskzilla-1.4_beta2.ebuild 2810
+RMD160 dbc3b68787be2ead49943da9aaa003cc322f8718 deskzilla-1.4_beta2.ebuild 2810
+SHA256 c355777c3343a5fe293806c18766d6d0253f8b80dcfdd4685338e30965bf10da deskzilla-1.4_beta2.ebuild 2810
+MISC ChangeLog 940 RMD160 e6b26929a8300eb6153b99fd5fc6873819b768f1 SHA1 0074501bf5aeffc00a1b17085c0837b69d7dba98 SHA256 2bc48fdd62b1aaff4d3fcfafc94f56358af8256c4856406c5298f734eb70f739
+MD5 3b831262473987e6a68c7934359433b3 ChangeLog 940
+RMD160 e6b26929a8300eb6153b99fd5fc6873819b768f1 ChangeLog 940
+SHA256 2bc48fdd62b1aaff4d3fcfafc94f56358af8256c4856406c5298f734eb70f739 ChangeLog 940
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -26,3 +31,6 @@ SHA256 6c1f769ed3a7a432df1a00246654082d525d2c02014b390b10e9ba42f4d6c76e files/di
 MD5 7c5c1bb435c9f761a98946b92b1ab4d0 files/digest-deskzilla-1.4_beta1 289
 RMD160 25480493d109e011f28dd18aa51519d2450a1fc1 files/digest-deskzilla-1.4_beta1 289
 SHA256 d68e4a74f16a1f37bb929f853188ec77624ea555ee9bbf6051a6dba7efe4a24b files/digest-deskzilla-1.4_beta1 289
+MD5 7b9be2721b6c2ced2be1cd0441128fa9 files/digest-deskzilla-1.4_beta2 289
+RMD160 10729241988d0232d3765e6b9687d30549b90cc9 files/digest-deskzilla-1.4_beta2 289
+SHA256 a424025166d1bff470f5c4f05c3fc34a4ad2026da34e7243a1085dfe5af052dd files/digest-deskzilla-1.4_beta2 289
diff --git a/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild b/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild
new file mode 100644
index 000000000000..0b34ab6d7309
--- /dev/null
+++ b/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild,v 1.1 2007/06/09 11:16:21 caster Exp $
+
+inherit java-pkg-2 versionator
+
+DESCRIPTION="A desktop client for Mozilla's Bugzilla bug tracking system."
+HOMEPAGE="http://almworks.com/deskzilla"
+
+MY_PV=$(replace_all_version_separators '_' ${PV/beta/b})
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://d1.almworks.com/.files/${MY_P}_without_jre.tar.gz"
+LICENSE="ALMWorks-1.2"
+# license does not allow redistributing, and they seem to silently update
+# distfiles...
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.5
+	~dev-java/picocontainer-1.1
+	>=dev-java/jdom-1.0
+	>=dev-java/javolution-4.0.2
+	>=dev-java/commons-codec-1.3
+	>=dev-java/jgoodies-forms-1.0.7
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/xmlrpc-2.0.1"
+
+src_unpack() {
+	unpack ${A}
+	# Remove external unaltered bundled jars
+	local lib="${S}/lib"
+	local liborig="${S}/lib.orig"
+	mv ${lib} ${liborig} || die
+	mkdir ${lib} || die
+	# They've patched commons-httpclient (was version 3.0)
+	mv ${liborig}/commons-httpclient.jar ${lib} || die
+	# They've patched nekohtml (was version 0.9.5)
+	mv ${liborig}/nekohtml.jar ${lib} || die
+	# Almworks proprietary lib
+	mv ${liborig}/almworks-tracker-api.jar ${lib} || die
+	# IntelliJ IDEA proprietary lib
+	mv ${liborig}/forms_rt.jar ${lib} || die
+	# God knows what's this. Anyway, proprietary.
+	mv ${liborig}/twocents.jar ${lib} || die
+	rm -rf ${liborig} || die
+}
+
+src_install () {
+	local dir=/opt/${P}
+
+	insinto ${dir}
+	doins -r components etc license lib log deskzilla.url
+	insinto ${dir}/license
+	doins ${FILESDIR}/${PN}_gentoo.license
+
+	java-pkg_jarinto ${dir}
+	java-pkg_dojar ${PN}.jar
+	java-pkg_register-dependency picocontainer-1,jdom-1.0,commons-logging,commons-codec,jgoodies-forms,javolution-4,xmlrpc
+	java-pkg_dolauncher ${PN} --main "com.almworks.launcher.Launcher" --java_args "-Xmx256M"
+
+	newdoc README.txt README || die
+	newdoc RELEASE.txt RELEASE || die
+
+	doicon deskzilla.png
+	make_desktop_entry deskzilla "Deskzilla" deskzilla.png "Development"
+}
+
+pkg_postinst() {
+	elog "The default, evaluation license allows usage for one month."
+	elog "You may switch (per-user) to the license we obtained for Gentoo,"
+	elog "located in /opt/${P}/licenses/${PN}_gentoo.license"
+	elog "It is locked to Gentoo, ALM Works and Mozilla bugzilla only."
+	elog "Note that you need to use 1.5 VM to run deskzilla when setting"
+	elog "license or it won't get set due to bug in 1.6+ VMs."
+	elog
+	elog "If you are going to use Deskzilla for an open source project,"
+	elog "you can similarly request your own free license:"
+	elog "http://almworks.com/opensource.html?product=deskzilla"
+}
diff --git a/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2 b/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2
new file mode 100644
index 000000000000..06a1a71e508c
--- /dev/null
+++ b/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2
@@ -0,0 +1,3 @@
+MD5 ef95936422e12249dc622cc21957fc73 deskzilla-1_4_b2_without_jre.tar.gz 6927082
+RMD160 fcdda56a433d3b10cb4ea8d0d38cd789c8395e7b deskzilla-1_4_b2_without_jre.tar.gz 6927082
+SHA256 30e0fbfca2d6ccd8e538aa7babf45f5880fc17abbd5273eac1d200b93eff8e6f deskzilla-1_4_b2_without_jre.tar.gz 6927082