Version bump, stable x86, drop old

Package-Manager: portage-2.1.2.5

7 files changed, 59 insertions, 67 deletions

diff --git a/net-irc/jircii/ChangeLog b/net-irc/jircii/ChangeLog
index b181ab4e7a11..d2dd694136b2 100644
--- a/net-irc/jircii/ChangeLog
+++ b/net-irc/jircii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/jircii
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/ChangeLog,v 1.28 2006/10/14 16:44:25 swegener Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/ChangeLog,v 1.29 2007/05/04 18:15:36 armin76 Exp $
+
+*jircii-41 (04 May 2007)
+
+  04 May 2007; Raúl Porcel <armin76@gentoo.org> -jircii-31.ebuild,
+  jircii-40.ebuild, +jircii-41.ebuild:
+  Version bump, stable x86, drop old
 
   14 Oct 2006; Sven Wegener <swegener@gentoo.org> -jircii-35.ebuild,
   -jircii-37.ebuild:
diff --git a/net-irc/jircii/Manifest b/net-irc/jircii/Manifest
index 17fa79ea8fbd..cdb763045bd4 100644
--- a/net-irc/jircii/Manifest
+++ b/net-irc/jircii/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jerkb40.tgz 1098737 RMD160 c1da4ca015cf08c3961c5cab8abe05c359b97715 SHA1 e79aed98630c7db85a8894369b56fc79c06bde9b SHA256 1121f3f3b6f783309b868a2ce8f36a09bc1f88fe9b063539f31f44cba6f248ee
-DIST jerkr31.tgz 953423 RMD160 2d5a4beb24d556e82003464368938aa88c2b34e9 SHA1 68d99a4a6207534558d369291adefab284eb8483 SHA256 510ce25ad7afd82278f0bc8f9de378f8c34b45c63d48c7e7292a40e70cb750fb
-EBUILD jircii-31.ebuild 772 RMD160 d8d885d0679175a4d1527d8e1b8d325e67f5f2a9 SHA1 95afc9ac1d28c4a01a845a756438928ec1b7ca53 SHA256 ee30a53c9ee735ca294fcb12c3b5ea8a70fcc247a24a4d68e3a96ea5d15e393f
-MD5 66189a4b2c99031ee124971e05780668 jircii-31.ebuild 772
-RMD160 d8d885d0679175a4d1527d8e1b8d325e67f5f2a9 jircii-31.ebuild 772
-SHA256 ee30a53c9ee735ca294fcb12c3b5ea8a70fcc247a24a4d68e3a96ea5d15e393f jircii-31.ebuild 772
-EBUILD jircii-40.ebuild 764 RMD160 f98ae96cc28ca6e4c01050b24e55006d3b0e906b SHA1 856ae13748e3f7d78cb5474e4b7e06f20c5ec881 SHA256 3f2df6277be7d28b12948e8fbea163c3b2a641bc39084aff191626456d3cb6f9
-MD5 189da860e9fafb79a222fda1e3ee1917 jircii-40.ebuild 764
-RMD160 f98ae96cc28ca6e4c01050b24e55006d3b0e906b jircii-40.ebuild 764
-SHA256 3f2df6277be7d28b12948e8fbea163c3b2a641bc39084aff191626456d3cb6f9 jircii-40.ebuild 764
-MISC ChangeLog 3906 RMD160 03027eb3034fbf28718e0126fe4603a9d615c466 SHA1 7a4a473b4d73d09534104654b61a405a175583df SHA256 cf72309efd4b1912e9f9bbc5fc62698a0b1e61e6664f594b1d63dae76a6d90c8
-MD5 d4dee22924c8457627b50746ef817165 ChangeLog 3906
-RMD160 03027eb3034fbf28718e0126fe4603a9d615c466 ChangeLog 3906
-SHA256 cf72309efd4b1912e9f9bbc5fc62698a0b1e61e6664f594b1d63dae76a6d90c8 ChangeLog 3906
+DIST jerkb41.tgz 1140707 RMD160 fbcd0dff014b7ba3f027ce3bf072341615065b94 SHA1 9a11d5f95e49628f6604979d47d5dece81c4eef7 SHA256 fa6d193eb967da97268de031e9a236e709789a98f706e204fb3eeb3fa18769dc
+EBUILD jircii-40.ebuild 762 RMD160 38f888bfa5648e6ea745086b8dcd6b41653d795c SHA1 b022b7986cdce50140535edc3cec2b570b7190f1 SHA256 1143cf2ee0ae8c2c97688dc424f8542f36a1fa81de9568450e114b37f3f43991
+MD5 dcce2ea1eca15de557fab1f0687fc187 jircii-40.ebuild 762
+RMD160 38f888bfa5648e6ea745086b8dcd6b41653d795c jircii-40.ebuild 762
+SHA256 1143cf2ee0ae8c2c97688dc424f8542f36a1fa81de9568450e114b37f3f43991 jircii-40.ebuild 762
+EBUILD jircii-41.ebuild 763 RMD160 513f59b157c056c4d6ecdc4899fc798770b5c98e SHA1 834e663cab06547df76c92fde4217e0e834b4579 SHA256 5ce2b91dbd252e243a0d8cea3ecb39e42412f1ff55eaf6093e7ea93f736dbb54
+MD5 bc198440043a7d4ba7d46b76bbc82bd5 jircii-41.ebuild 763
+RMD160 513f59b157c056c4d6ecdc4899fc798770b5c98e jircii-41.ebuild 763
+SHA256 5ce2b91dbd252e243a0d8cea3ecb39e42412f1ff55eaf6093e7ea93f736dbb54 jircii-41.ebuild 763
+MISC ChangeLog 4076 RMD160 4839c87b5695ef33b176714293c96eb0116d6965 SHA1 c5603121d51b9c46018271c429e60b5d222f9e4a SHA256 e88a4c3fe7c5a9f3ab66f1be6d516322a4a0200f4151b1af32480fbbf38c9d02
+MD5 e85040f85dee3f6500b9d930a675cdc4 ChangeLog 4076
+RMD160 4839c87b5695ef33b176714293c96eb0116d6965 ChangeLog 4076
+SHA256 e88a4c3fe7c5a9f3ab66f1be6d516322a4a0200f4151b1af32480fbbf38c9d02 ChangeLog 4076
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 91767c967e5bf38ca648b797ed32f7a7 files/digest-jircii-31 214
-RMD160 92dd0f5581b2c812c571e67d1f2cc7883473b8cb files/digest-jircii-31 214
-SHA256 4d41b1c4e94fc30ad5991305bf11fcc74dd8152e4b62f43dd9502c8f31c44e7a files/digest-jircii-31 214
 MD5 0d3581152047905e86b51a738b850567 files/digest-jircii-40 217
 RMD160 ae680ba86e306af13f71751a9d2c243a1a0087f2 files/digest-jircii-40 217
 SHA256 b87de2a83be51bbd27339888b127acc3477a0ae44b9d3c8c4332b2ad4dee3c0d files/digest-jircii-40 217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMRPvI1lqEGTUzyQRAvO1AKCwDS1CEzGDCx9Ox0Nacjte3CeazwCeIeKq
-S1N5MiHc/XDfw3sxKhMWJzI=
-=KQDa
------END PGP SIGNATURE-----
+MD5 271a3f12f4fc604088d85f2b347d4661 files/digest-jircii-41 217
+RMD160 000e8ef213997b5526529a35bd2bdda94610c1ef files/digest-jircii-41 217
+SHA256 9f63c5f93ad79a6824fa2ab6a9f7ac554d8984adca1b45ed1f4b4875dcb6660b files/digest-jircii-41 217
diff --git a/net-irc/jircii/files/digest-jircii-31 b/net-irc/jircii/files/digest-jircii-31
deleted file mode 100644
index 397dcd8024e3..000000000000
--- a/net-irc/jircii/files/digest-jircii-31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a6c8e544289ce5f908168fe13205c306 jerkr31.tgz 953423
-RMD160 2d5a4beb24d556e82003464368938aa88c2b34e9 jerkr31.tgz 953423
-SHA256 510ce25ad7afd82278f0bc8f9de378f8c34b45c63d48c7e7292a40e70cb750fb jerkr31.tgz 953423
diff --git a/net-irc/jircii/files/digest-jircii-41 b/net-irc/jircii/files/digest-jircii-41
new file mode 100644
index 000000000000..9ab27dd3c46c
--- /dev/null
+++ b/net-irc/jircii/files/digest-jircii-41
@@ -0,0 +1,3 @@
+MD5 35db65b75effe0c52a99c7e053faf44b jerkb41.tgz 1140707
+RMD160 fbcd0dff014b7ba3f027ce3bf072341615065b94 jerkb41.tgz 1140707
+SHA256 fa6d193eb967da97268de031e9a236e709789a98f706e204fb3eeb3fa18769dc jerkb41.tgz 1140707
diff --git a/net-irc/jircii/jircii-31.ebuild b/net-irc/jircii/jircii-31.ebuild
deleted file mode 100644
index 0c0524aebb27..000000000000
--- a/net-irc/jircii/jircii-31.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-31.ebuild,v 1.2 2005/05/03 19:01:44 swegener Exp $
-
-DESCRIPTION="jIRCii - IRC client written in Java"
-HOMEPAGE="http://jirc.hick.org/"
-SRC_URI="http://jirc.hick.org/download/jerkr${PV}.tgz"
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-RDEPEND="virtual/jre"
-DEPEND=""
-
-S=${WORKDIR}/jIRCii
-
-src_compile() {
-	true
-}
-
-src_install() {
-	insinto /usr/share/jircii
-	doins jerk.jar || die "doins failed"
-
-	cat >${T}/jircii <<EOF
-#!/bin/sh
-exec java -jar /usr/share/jircii/jerk.jar
-EOF
-	dobin ${T}/jircii || die "dobin failed"
-
-	dodoc readme.txt whatsnew.txt docs/*.pdf extra/*.irc || die "dodoc failed"
-}
diff --git a/net-irc/jircii/jircii-40.ebuild b/net-irc/jircii/jircii-40.ebuild
index 6c64c92ebbc8..ae3f3ef1fc5d 100644
--- a/net-irc/jircii/jircii-40.ebuild
+++ b/net-irc/jircii/jircii-40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-40.ebuild,v 1.1 2006/10/14 16:41:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-40.ebuild,v 1.2 2007/05/04 18:15:36 armin76 Exp $
 
 inherit java-pkg-2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jirc.hick.org/"
 SRC_URI="http://jirc.hick.org/download/jerkb${PV}.tgz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/net-irc/jircii/jircii-41.ebuild b/net-irc/jircii/jircii-41.ebuild
new file mode 100644
index 000000000000..19ffdf7ff84b
--- /dev/null
+++ b/net-irc/jircii/jircii-41.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-41.ebuild,v 1.1 2007/05/04 18:15:36 armin76 Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="jIRCii - IRC client written in Java"
+HOMEPAGE="http://jirc.hick.org/"
+SRC_URI="http://jirc.hick.org/download/jerkb${PV}.tgz"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=""
+
+S="${WORKDIR}"/jIRCii
+
+src_compile() {
+	true
+}
+
+src_install() {
+	java-pkg_dojar jerk.jar || die "java-pkg_dojar failed"
+	java-pkg_dolauncher jircii --jar "${JAVA_PKG_JARDEST}"/jerk.jar || die "java-pkg_dolauncher"
+
+	dodoc readme.txt whatsnew.txt docs/*.pdf extra/*.irc || die "dodoc failed"
+}