Version bump, bug #215151.

Package-Manager: portage-2.1.4.4

3 files changed, 26 insertions, 12 deletions

diff --git a/dev-util/deskzilla/ChangeLog b/dev-util/deskzilla/ChangeLog
index 364d80f54428..568618b53f66 100644
--- a/dev-util/deskzilla/ChangeLog
+++ b/dev-util/deskzilla/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2008/02/29 18:00:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/ChangeLog,v 1.11 2008/03/29 00:12:22 caster Exp $
+
+*deskzilla-1.6 (29 Mar 2008)
+
+  29 Mar 2008; Vlastimil Babka <caster@gentoo.org> -deskzilla-1.4.1.ebuild,
+  +deskzilla-1.6.ebuild:
+  Version bump, bug #215151.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> deskzilla-1.4.1.ebuild,
   deskzilla-1.5.1.ebuild:
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
index 60aed6e08601..7c4934e00e9b 100644
--- a/dev-util/deskzilla/Manifest
+++ b/dev-util/deskzilla/Manifest
@@ -1,7 +1,7 @@
 AUX deskzilla_gentoo.license 1584 RMD160 35699d15d07c5b8a29e8f06d0233f9b7014abd97 SHA1 089b1815165eb208c8fc2a3733b42781a46f6b65 SHA256 a11b89eedf8211d50ca13177b7d8d1fc59645a5c9faa13761525c24a9ae84a74
-DIST deskzilla-1_4_1_without_jre.tar.gz 6928941 RMD160 715f51e8ff66b5c2b912779eb7cf5008f40438dd SHA1 04f831fee567239e79e21d25968320c06b8cd4e1 SHA256 bab1d4704ca897c6c783a1ff3d02e5015ca13246f593dd85e21c4b244edcd0a0
 DIST deskzilla-1_5_1_without_jre.tar.gz 7561197 RMD160 676e62476dbc41905e2a7336076e992908509d15 SHA1 ac51f1565e13e774a19c398df2de7347456ae2ea SHA256 d76b9a7f01848036b5a6a4055c83c4fa90346e917a4c71899c2a7a3c787bd9fd
-EBUILD deskzilla-1.4.1.ebuild 2809 RMD160 4fe6621bfa28f75c9d309915a4638ffa90c0cf05 SHA1 98a949cb5325bd15f5f57d16839bbef9b3fcc959 SHA256 9da3ecb979ee5c7c0fa04961e3bf3967426a1fc70003984019c9645009dafb53
+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
-MISC ChangeLog 2039 RMD160 2e0644c92c6453a2a59a9ceffa6d515a234665dc SHA1 321b489da6984177870b6fa2c82f4a57aac455ba SHA256 ff922b8c30fed85fde31a1dae6e7f0a14a49216904449e837fd758f0e577f357
+EBUILD deskzilla-1.6.ebuild 3003 RMD160 a31c73e6a71dca6ee87d65fa50f95f4928b24511 SHA1 7861ef0f99e6beaf4ff7e1a47fb96fffbfd22bbc SHA256 e215d955b4bf34792c4aa96ea57d8240bd126424cb844846e8072c78ad609940
+MISC ChangeLog 2201 RMD160 3616f9f27e97d3920ef2434e14162aaa63c7bbb0 SHA1 05198dbcc555d939b7f2a97b4ae165ae73085dfe SHA256 65696945f8d0064c16a0380ea48759395266418786a628d7aa2fe18ddb31498e
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-util/deskzilla/deskzilla-1.4.1.ebuild b/dev-util/deskzilla/deskzilla-1.6.ebuild
index cc1ce87ee2b1..da215b86ac06 100644
--- a/dev-util/deskzilla/deskzilla-1.4.1.ebuild
+++ b/dev-util/deskzilla/deskzilla-1.6.ebuild
@@ -1,6 +1,8 @@
 # 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.4.1.ebuild,v 1.2 2008/02/29 18:00:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/deskzilla/deskzilla-1.6.ebuild,v 1.1 2008/03/29 00:12:23 caster Exp $
+
+EAPI=1
 
 inherit java-pkg-2 versionator
 
@@ -16,17 +18,19 @@ LICENSE="ALMWorks-1.2"
 # distfiles...
 RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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/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/xmlrpc-2.0.1
+	dev-java/xerces:2
+	dev-java/itext:0
+	dev-java/jazzy:0"
 
 src_unpack() {
 	unpack ${A}
@@ -39,6 +43,8 @@ src_unpack() {
 	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
@@ -54,11 +60,13 @@ src_install () {
 	insinto ${dir}
 	doins -r components etc license lib log deskzilla.url
 	insinto ${dir}/license
-	doins ${FILESDIR}/${PN}_gentoo.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
+	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