Version bump and remove the betas.

(Portage version: 2.1.3_rc4)

7 files changed, 16 insertions, 94 deletions

diff --git a/dev-util/deskzilla/ChangeLog b/dev-util/deskzilla/ChangeLog
index 6f2d180dc499..f7b073af26a2 100644
--- a/dev-util/deskzilla/ChangeLog
+++ b/dev-util/deskzilla/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2007/06/16 11:06:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.6 2007/06/19 13:48:00 caster Exp $
+
+*deskzilla-1.4 (19 Jun 2007)
+
+  19 Jun 2007; Vlastimil Babka <caster@gentoo.org>
+  -deskzilla-1.4_beta1.ebuild, -deskzilla-1.4_beta2.ebuild,
+  +deskzilla-1.4.ebuild:
+  Version bump and remove the betas.
 
   16 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   deskzilla-1.4_beta2.ebuild:
diff --git a/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild b/dev-util/deskzilla/deskzilla-1.4.ebuild
index b1b76c378508..e243b35a52fd 100644
--- a/dev-util/deskzilla/deskzilla-1.4_beta2.ebuild
+++ b/dev-util/deskzilla/deskzilla-1.4.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2007/06/16 11:06:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.4.ebuild,v 1.1 2007/06/19 13:48:00 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_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"
diff --git a/dev-util/deskzilla/deskzilla-1.4_beta1.ebuild b/dev-util/deskzilla/deskzilla-1.4_beta1.ebuild
deleted file mode 100644
index 5e04ec0b56a8..000000000000
--- a/dev-util/deskzilla/deskzilla-1.4_beta1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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_beta1.ebuild,v 1.1 2007/05/27 12:05:09 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.3 b/dev-util/deskzilla/files/digest-deskzilla-1.3
index eddc33820256..ea9b6064353d 100644
--- a/dev-util/deskzilla/files/digest-deskzilla-1.3
+++ b/dev-util/deskzilla/files/digest-deskzilla-1.3
@@ -1,3 +1,3 @@
-MD5 b52028429d1a231470b8fc7a6eaccbca deskzilla-1_3_without_jre.tar.gz 6883155
-RMD160 2aaeaa161970eff8d241d912eb956ab8c23d07b2 deskzilla-1_3_without_jre.tar.gz 6883155
-SHA256 688c0c4592d701e9f0d0e7675a29a5c2003bd7410ccbfc9da1e591f9f7c74d9b deskzilla-1_3_without_jre.tar.gz 6883155
+MD5 07bccea518963482439d35d10f65f45a deskzilla-1_3_without_jre.tar.gz 6882713
+RMD160 25070a37c7660c9b48a6ada1e108944c268a8298 deskzilla-1_3_without_jre.tar.gz 6882713
+SHA256 d96905cd50ad943a65b39789cd658c00d51f61404eb8ecc7c700561a4af2e289 deskzilla-1_3_without_jre.tar.gz 6882713
diff --git a/dev-util/deskzilla/files/digest-deskzilla-1.4 b/dev-util/deskzilla/files/digest-deskzilla-1.4
new file mode 100644
index 000000000000..9dd683a01be9
--- /dev/null
+++ b/dev-util/deskzilla/files/digest-deskzilla-1.4
@@ -0,0 +1,3 @@
+MD5 9ea42a545c9967e2e8146895b34886d8 deskzilla-1_4_without_jre.tar.gz 6928323
+RMD160 bd8d0355cae9971096ac6a2d88d3e4fe9853aec2 deskzilla-1_4_without_jre.tar.gz 6928323
+SHA256 cf05c9af7af51b876343f3182e458851a3f2b731d78817cb60af68f919768985 deskzilla-1_4_without_jre.tar.gz 6928323
diff --git a/dev-util/deskzilla/files/digest-deskzilla-1.4_beta1 b/dev-util/deskzilla/files/digest-deskzilla-1.4_beta1
deleted file mode 100644
index 6bf50155f5ca..000000000000
--- a/dev-util/deskzilla/files/digest-deskzilla-1.4_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 932e25fa1f5bf4d61f8f21a0b7c6de6a deskzilla-1_4_b1_without_jre.tar.gz 6922854
-RMD160 7f82ad3fd49a817f4b127fc2f5e48e5e009cf7d7 deskzilla-1_4_b1_without_jre.tar.gz 6922854
-SHA256 048aa9700fc60f1bd6b1f757cb95f0955326be9536ec688160b2930cdabae52e deskzilla-1_4_b1_without_jre.tar.gz 6922854
diff --git a/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2 b/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2
deleted file mode 100644
index 06a1a71e508c..000000000000
--- a/dev-util/deskzilla/files/digest-deskzilla-1.4_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-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