net-im/spark: Dont use deprecated java-pkg.eclass, jdk should be in DEPEND, add some...

svn path=/sunrise/; revision=7785

diff --git a/net-im/spark/ChangeLog b/net-im/spark/ChangeLog
index 3f98ffca4e9c5f84522867dfc5d1cb83e5a8b654..937ff03f932698eb88abe8f77466bd62987ff894 100644 (file)
--- a/net-im/spark/ChangeLog
+++ b/net-im/spark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/spark
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: 
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header:
+
+  24 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  spark-2.5.8.ebuild:
+  Dont use deprecated java-pkg.eclass, jdk should be in DEPEND, add some die
+  statements
 
   13 Jan 2009; Oleg Kluchkin <oleg.kluchkin@gmail.com> +spark-2.5.8.ebuild:
   Initial commit of Spark IM. Bug #194693 from Robert Piasek

diff --git a/net-im/spark/Manifest b/net-im/spark/Manifest
index 2cf2ec48aba34a9780bf1d2aaf34b4545556d4b0..26e3e29dc84880be10a5102feb3b46b2c579c80f 100644 (file)
--- a/net-im/spark/Manifest
+++ b/net-im/spark/Manifest
@@ -1,5 +1,5 @@
 AUX spark.sh 629 RMD160 e8fbeaff983537d98cab54faf2bd9af2ce7a356a SHA1 75358e1de7f74f717255a930df5064bd87d644ff SHA256 4fefe7c85d9368d6b45688972698a542dba4aaddb143e44af0942985d36a115b
 DIST spark_2_5_8.tar.gz 32563759 RMD160 54253ae211560d029fd10528da5e629444986bdd SHA1 0dbc05e2f37d67d038878b35690c0e34ced00947 SHA256 962b38f433845f28d438599c402fd2fda91f978abc54c7fc2d1436066a21315f
-EBUILD spark-2.5.8.ebuild 1269 RMD160 e4547895725a52e739f2b5d74f2fda551b3ec506 SHA1 a267d5f21a5888960c444f048dcb027da0eb70d0 SHA256 926c9993b8ac4aa8e61ad3f7e490f0f7714125620bac98da1b6141b11e6e8623
-MISC ChangeLog 249 RMD160 655a4b67fb6ec13674604b32285d5986a36fd0c2 SHA1 3513661d620da0a8e2b5d17b04582b2f2822cc0b SHA256 3ace9b78711b3e26233af1a9c1f6b75d7782dd57d2d455b542bdf7e76f3f4736
+EBUILD spark-2.5.8.ebuild 1291 RMD160 50350e75706c1b6d82e44c04925f248ec6f2f76e SHA1 9e6c1945e4b2aa95f1738554877068f0fb96944b SHA256 68103ab46767a9d1e40a370a28b7beea18b234fa076982c9fd8a8e21f459f9d8
+MISC ChangeLog 420 RMD160 bf051af30424bf0e690defe0b7f4c79d3b97ee8c SHA1 57eec2b172c42b7d5cac15cd8b8642d23874e59e SHA256 06dc396673433a9c131e633ffa4974251b6f37afce9ce70d0004633d32f00ba0
 MISC metadata.xml 542 RMD160 91533f4799032bbc07cd4dbc8289966c4df09fb7 SHA1 344681fbddf3f0d01ec3f2c5a6bd20b7a34319e2 SHA256 98c7d5a0e8a5ee969b9519e41cea2c15842a1afe6a2bb4d8eb828dfac137ee1b

diff --git a/net-im/spark/spark-2.5.8.ebuild b/net-im/spark/spark-2.5.8.ebuild
index 81f808ba3c351cf9fe13a9fd40d1f18ff4ca2405..7f7971e54bb6bb61f530a9a8bfe21c5c36bae356 100644 (file)
--- a/net-im/spark/spark-2.5.8.ebuild
+++ b/net-im/spark/spark-2.5.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2009 Gentoo Foundation
+# Copyright 2009-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils java-pkg
+inherit eutils java-pkg-2
 
 DESCRIPTION="Spark is an Open Source, cross-platform IM client optimized for businesses and organizations"
 HOMEPAGE="http://www.igniterealtime.org/projects/spark/"
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=virtual/jdk-1.5
-       >=virtual/jre-1.5"
-DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+       app-arch/unzip"
 
 S=${WORKDIR}/Spark
 
@@ -24,7 +24,7 @@ src_install() {
        java-pkg_dojar .install4j/*.jar
 
        insinto /usr/share/spark
-       doins -r resources xtra plugins
+       doins -r resources xtra plugins || die
 
        dobin "${FILESDIR}"/spark.sh || die
        unzip -qq lib/spark.jar
@@ -32,7 +32,7 @@ src_install() {
        make_desktop_entry spark.sh "Spark IM" spark-64x64 "Network;InstantMessaging"
 
        if use doc; then
-               dohtml -r documentation/*
+               dohtml -r documentation/* || die
        fi
 }
 
@@ -44,4 +44,4 @@ pkg_postinst() {
        ewarn "1. replace /usr/share/spark/plugins/jniwrapper.jar with attachment from the post above;"
        ewarn "2. remove ~/.Spark/plugins"
        ewarn "3. re-start Spark IM"
-}
\ No newline at end of file
+}