Version bump. Minor fixes.

Package-Manager: portage-2.1.5_rc4

3 files changed, 99 insertions, 2 deletions

diff --git a/dev-util/deskzilla/ChangeLog b/dev-util/deskzilla/ChangeLog
index 568618b53f66..01a4d57eda3a 100644
--- a/dev-util/deskzilla/ChangeLog
+++ b/dev-util/deskzilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/deskzilla
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.11 2008/03/29 00:12:22 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.12 2008/04/19 17:36:34 caster Exp $
+
+*deskzilla-1.6.1 (19 Apr 2008)
+
+  19 Apr 2008; Vlastimil Babka <caster@gentoo.org> +deskzilla-1.6.1.ebuild:
+  Version bump. Minor fixes.
 
 *deskzilla-1.6 (29 Mar 2008)
 
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
index 7c4934e00e9b..9c5f905f769c 100644
--- a/dev-util/deskzilla/Manifest
+++ b/dev-util/deskzilla/Manifest
@@ -1,7 +1,9 @@
 AUX deskzilla_gentoo.license 1584 RMD160 35699d15d07c5b8a29e8f06d0233f9b7014abd97 SHA1 089b1815165eb208c8fc2a3733b42781a46f6b65 SHA256 a11b89eedf8211d50ca13177b7d8d1fc59645a5c9faa13761525c24a9ae84a74
 DIST deskzilla-1_5_1_without_jre.tar.gz 7561197 RMD160 676e62476dbc41905e2a7336076e992908509d15 SHA1 ac51f1565e13e774a19c398df2de7347456ae2ea SHA256 d76b9a7f01848036b5a6a4055c83c4fa90346e917a4c71899c2a7a3c787bd9fd
+DIST deskzilla-1_6_1_without_jre.tar.gz 9024891 RMD160 ffced0182535d260b9341464daa65290942bad54 SHA1 9d6193c08ecf3d3b4fb1960d6d5fa7034aade8e8 SHA256 5f20f58f231b930f5e14947ced1ed4bbc066d295e90a2632dd486b68ed5e11af
 DIST deskzilla-1_6_without_jre.tar.gz 9020889 RMD160 abf1517aad6b44b6be6cdcb4f2bce44ef13f98a7 SHA1 3e734db54de1163b2592975e39dfbc0c8806bf13 SHA256 6c063c26f840bf7733423c643e31885c7d7230ebd24de069b9d3e42d64ee8678
 EBUILD deskzilla-1.5.1.ebuild 2937 RMD160 9d1589f8f9ff9f8db13df37bc89361a15404626a SHA1 7660a08fb8bdd3e795726205c1db19255cbeec9c SHA256 bd6e28ecd1c33e309620bd6b859304e88c24403a3adafe5159123537f9e9e81d
+EBUILD deskzilla-1.6.1.ebuild 3013 RMD160 2216653aa56428be87f81a657fa3ddc66020e8ad SHA1 58a5d9746c1e27b47931e2284ffe6f5de55f6fc9 SHA256 33ebbacffd644b6f80ff38e729e13aab779d884d822498e65b8a7a7fd6e25aa8
 EBUILD deskzilla-1.6.ebuild 3003 RMD160 a31c73e6a71dca6ee87d65fa50f95f4928b24511 SHA1 7861ef0f99e6beaf4ff7e1a47fb96fffbfd22bbc SHA256 e215d955b4bf34792c4aa96ea57d8240bd126424cb844846e8072c78ad609940
-MISC ChangeLog 2201 RMD160 3616f9f27e97d3920ef2434e14162aaa63c7bbb0 SHA1 05198dbcc555d939b7f2a97b4ae165ae73085dfe SHA256 65696945f8d0064c16a0380ea48759395266418786a628d7aa2fe18ddb31498e
+MISC ChangeLog 2339 RMD160 0c996057a688785680b6d393e3a46554b85be882 SHA1 2e4deb20b5f24443a7b73a07d828bbbf25fdf4b0 SHA256 9c7b11e492a29f83fff259d836cf935a199386ec1a65395d1329549d41798092
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-util/deskzilla/deskzilla-1.6.1.ebuild b/dev-util/deskzilla/deskzilla-1.6.1.ebuild
new file mode 100644
index 000000000000..ea98defa36fc
--- /dev/null
+++ b/dev-util/deskzilla/deskzilla-1.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.6.1.ebuild,v 1.1 2008/04/19 17:36:34 caster Exp $
+
+EAPI=1
+
+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
+	dev-java/javolution:4
+	>=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
+	dev-java/xerces:2
+	dev-java/itext:0
+	dev-java/jazzy:0"
+
+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
+	# Also jdom (was 1.0), soon they will patch everything and we will just unpack, yay
+	mv ${liborig}/pjdom.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/${PN}"
+
+	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
+	local dep="xerces-2,picocontainer-1,commons-logging,commons-codec"
+	dep+=",jgoodies-forms,javolution-4,xmlrpc,itext,jazzy"
+	java-pkg_register-dependency ${dep}
+	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 "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/${PN}/license/${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"
+}