Version bump, bug #272366.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 15 insertions, 96 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/Manifest b/dev-util/deskzilla/Manifest
index 0898dd15b2dc..988f4206023d 100644
--- a/dev-util/deskzilla/Manifest
+++ b/dev-util/deskzilla/Manifest
@@ -1,9 +1,7 @@
 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 2949 RMD160 6bec69accfb637ee2ce3f95ecfeb78eda0cee878 SHA1 25d53fe9351eef5454ec3312b61f5e788f8d3fa3 SHA256 ac0dbeee1fcaa011672a09d7515a574c56ef9388d190b9125843a4ff3c020745
+DIST deskzilla-1_7_1_without_jre.tar.gz 9248721 RMD160 43721bfff4f30279f02a1f4c3d0ae5f09a2b531e SHA1 18d44b3fdaed5146bc99ef4be96d36d12d2424c8 SHA256 8c643e2c828bfa14aa3b1ec668d92602aeb21edce67319c279f4bb5879425ebf
 EBUILD deskzilla-1.6.1.ebuild 3029 RMD160 88730eb8f5587a7dcf906c5265fef7e75f302084 SHA1 de72b34ec41e3c48b0dd4a3daa620e5e4cd7ef18 SHA256 2fd36aa0ee5151718cb434068df782963c98f36e2b55b79623f08843da851633
-EBUILD deskzilla-1.6.ebuild 3019 RMD160 735ee3a37c6b704a1a8f9009a56572a4b1615caf SHA1 14f3a6aa04513ab1858b1f2c435c14b793b1e295 SHA256 ba3ab8cd71201b7574b15e7c25f14f1c74d289c9836e33ea4aae90ecc08eef6f
-MISC ChangeLog 2467 RMD160 26a38884dc538ba927637e10b6915c76f3a3daca SHA1 3f03ad71ea1b691b7977493485df7920752be7ba SHA256 2f9eed163ed0bd277e2d530235ef6a0d22b4923e61d8d07bd48c9cd0913045c4
+EBUILD deskzilla-1.7.1.ebuild 3026 RMD160 5b0dc4615e9f1ee31899941fbc4d7fb2b62da56b SHA1 33b9c2f3781b14d87ee0baf21e09da43de1fb913 SHA256 e9c6b7550ba0f893cbea53df0d49309dcce0314836b8e6f6b36dedcbbda6bdd1
+MISC ChangeLog 2655 RMD160 de32eb2688b5e81d490bb48dfadcc1709e395ab7 SHA1 baf2127c04d0613764295d35eae5026a9352df3e SHA256 28157acddfedf3c72a0b060a01e838302f9a8effd484479c8f7172e5bd9723cf
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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"