Version bump, bug #272366.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 12 insertions, 91 deletions

diff --git a/dev-util/deskzilla/ChangeLog b/dev-util/deskzilla/ChangeLog
index bd2f132878b6..dd01e50c7b46 100644
--- a/dev-util/deskzilla/ChangeLog
+++ b/dev-util/deskzilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/deskzilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.13 2009/03/20 18:55:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.14 2009/10/18 18:06:25 caster Exp $
+
+*deskzilla-1.7.1 (18 Oct 2009)
+
+  18 Oct 2009; Vlastimil Babka <caster@gentoo.org> -deskzilla-1.5.1.ebuild,
+  -deskzilla-1.6.ebuild, +deskzilla-1.7.1.ebuild:
+  Version bump, bug #272366.
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> deskzilla-1.6.ebuild,
   deskzilla-1.6.1.ebuild:
diff --git a/dev-util/deskzilla/deskzilla-1.5.1.ebuild b/dev-util/deskzilla/deskzilla-1.5.1.ebuild
deleted file mode 100644
index 8c9a5cb1663e..000000000000
--- a/dev-util/deskzilla/deskzilla-1.5.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.5.1.ebuild,v 1.3 2009/10/12 11:01:23 ssuominen 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 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5
-	~dev-java/picocontainer-1.1
-	>=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
-	>=dev-java/xerces-2.8"
-
-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
-	java-pkg_register-dependency xerces-2,picocontainer-1,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 "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"
-}
diff --git a/dev-util/deskzilla/deskzilla-1.6.ebuild b/dev-util/deskzilla/deskzilla-1.7.1.ebuild
index 5b675949a0a5..4357456eb2e6 100644
--- a/dev-util/deskzilla/deskzilla-1.6.ebuild
+++ b/dev-util/deskzilla/deskzilla-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.6.ebuild,v 1.3 2009/10/12 11:01:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.7.1.ebuild,v 1.1 2009/10/18 18:06:25 caster Exp $
 
 EAPI=1
 
@@ -56,14 +56,14 @@ src_unpack() {
 }
 
 src_install () {
-	local dir=/opt/${PN}
+	local dir="/opt/${PN}"
 
-	insinto ${dir}
+	insinto "${dir}"
 	doins -r components etc license lib log deskzilla.url
-	insinto ${dir}/license
+	insinto "${dir}/license"
 	doins "${FILESDIR}"/${PN}_gentoo.license
 
-	java-pkg_jarinto ${dir}
+	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"