Stable on x86, fix bug 67363, clean up old versions and add new version

9 files changed, 49 insertions, 55 deletions

diff --git a/net-im/tkabber/ChangeLog b/net-im/tkabber/ChangeLog
index 1798ed197e8a..05a62e09976d 100644
--- a/net-im/tkabber/ChangeLog
+++ b/net-im/tkabber/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/tkabber
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.17 2004/08/08 00:02:07 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.18 2004/11/26 17:32:15 tester Exp $
+
+*tkabber-0.9.7 (26 Nov 2004)
+
+  26 Nov 2004; Olivier Crete <tester@gentoo.org> -tkabber-0.9.3b-r1.ebuild,
+  -tkabber-0.9.4b.ebuild, +tkabber-0.9.7.ebuild:
+  Bumped to 0.9.7 (thanks to mikovits christian <gaelic@cargal.org>) 
+  Fixed compilation with portage 2.0.51 (thanks to Alexander Kreuzer
+  <a_kreuzer@gmx.de> and Rob Orlowsky <rob_is_not@hotmail.com>)
+  Marked 0.9.6_beta stable on x86 and cleaned up old versions
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> tkabber-0.9.6_beta.ebuild:
   Typo in DESCRIPTION: writen -> written. Bug 59717.
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
index 210d9f26511a..fc9461cebb20 100644
--- a/net-im/tkabber/Manifest
+++ b/net-im/tkabber/Manifest
@@ -1,10 +1,18 @@
-MD5 c3bf2184cf6cf8b3d26ed55e3405c2b4 tkabber-0.9.5b.ebuild 877
-MD5 94f69c8269f2bedf3016d234ddd2a563 tkabber-0.9.6_beta.ebuild 953
-MD5 6a8fa0cb47f01cd490ee925e88d750b2 tkabber-0.9.4b.ebuild 882
-MD5 5b28a646c25934d9a934e7592e9d08f6 tkabber-0.9.3b-r1.ebuild 886
-MD5 5c7219aa2c7b5851424bf36a32910aa7 ChangeLog 2102
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 661a038d0d892b626002516b93d7f1b3 ChangeLog 2523
 MD5 ea5253373c33b0d50fa8a18d3616c4ba metadata.xml 494
-MD5 a5bfd86cd0c8ead9467cf5f893511aba files/digest-tkabber-0.9.3b-r1 69
+MD5 611739e24bbf4ca611f519b38bdfcdbc tkabber-0.9.5b.ebuild 969
+MD5 9ac0609bbb9bea2419322284d1d90aa9 tkabber-0.9.6_beta.ebuild 1046
+MD5 e0fe8a0ec07042691245d3d372f66fb5 tkabber-0.9.7.ebuild 978
 MD5 7157d1f9fa47d3801d41735957b78e4c files/digest-tkabber-0.9.6_beta 69
-MD5 2de4b5cb9d0e786da7346ec6b85e4ba0 files/digest-tkabber-0.9.4b 69
 MD5 7602cd4d7daafafe0bf585fa67b29bed files/digest-tkabber-0.9.5b 69
+MD5 4e2858f909c71b96869a466c000cc7cd files/digest-tkabber-0.9.7 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBp2jCwDHaUUJ0mYMRAoKjAJ92QpIq2RVt+BSqp+NelgvKeSGKPACdEHfb
+wpScinpXNdDOE2PspY960rU=
+=nsND
+-----END PGP SIGNATURE-----
diff --git a/net-im/tkabber/files/digest-tkabber-0.9.3b-r1 b/net-im/tkabber/files/digest-tkabber-0.9.3b-r1
deleted file mode 100644
index 8044485b0485..000000000000
--- a/net-im/tkabber/files/digest-tkabber-0.9.3b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 affd4464fcaedcf6d43bb543d6822e89 tkabber-0.9.3beta.tar.gz 389027
diff --git a/net-im/tkabber/files/digest-tkabber-0.9.4b b/net-im/tkabber/files/digest-tkabber-0.9.4b
deleted file mode 100644
index 7b1ee04484ae..000000000000
--- a/net-im/tkabber/files/digest-tkabber-0.9.4b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 774eaf66e2b4b5a4e032d92f07c4a6cc tkabber-0.9.4beta.tar.gz 421814
diff --git a/net-im/tkabber/files/digest-tkabber-0.9.7 b/net-im/tkabber/files/digest-tkabber-0.9.7
new file mode 100644
index 000000000000..462069ddae94
--- /dev/null
+++ b/net-im/tkabber/files/digest-tkabber-0.9.7
@@ -0,0 +1 @@
+MD5 41a0f24239415edb8e3d2cd86e532f38 tkabber-0.9.7.tar.gz 714184
diff --git a/net-im/tkabber/tkabber-0.9.4b.ebuild b/net-im/tkabber/tkabber-0.9.4b.ebuild
deleted file mode 100644
index ef4644a99617..000000000000
--- a/net-im/tkabber/tkabber-0.9.4b.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.4b.ebuild,v 1.8 2004/06/24 23:00:34 agriffis Exp $
-
-DESCRIPTION="Featurefull Jabber client for tcl/tk."
-HOMEPAGE="http://tkabber.jabber.ru/"
-IUSE="crypt ssl"
-
-DEPEND=">=dev-lang/tcl-8.3*
-	>=dev-lang/tk-8.3*
-	dev-tcltk/tclxml-expat
-	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
-	>=dev-tcltk/tcllib-1.3
-	>=dev-tcltk/bwidget-1.3
-	ssl? ( >=dev-tcltk/tls-1.4.1 )
-	>=dev-tcltk/tkXwin-1.0
-	>=dev-tcltk/tkTheme-1.0"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-SLOT="0"
-
-MY_P="$(echo ${P}|sed 's/b$/beta/')"
-SRC_URI="http://www.jabber.ru/projects/tkabber/tkabber-0.9beta/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	make DESTDIR=${D} PREFIX=/usr install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README
-	dohtml README.html
-}
diff --git a/net-im/tkabber/tkabber-0.9.5b.ebuild b/net-im/tkabber/tkabber-0.9.5b.ebuild
index fb71f11ac30a..60646c6e3897 100644
--- a/net-im/tkabber/tkabber-0.9.5b.ebuild
+++ b/net-im/tkabber/tkabber-0.9.5b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.5b.ebuild,v 1.8 2004/06/24 23:00:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.5b.ebuild,v 1.9 2004/11/26 17:32:15 tester Exp $
 
 DESCRIPTION="Featurefull Jabber client for tcl/tk."
 HOMEPAGE="http://tkabber.jabber.ru/"
@@ -25,6 +25,11 @@ MY_P="$(echo ${P}|sed 's/b$/beta/')"
 SRC_URI="http://www.jabberstudio.org/files/tkabber/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	echo -n
+}
+
 src_install() {
 	make DESTDIR=${D} PREFIX=/usr install || die
 
diff --git a/net-im/tkabber/tkabber-0.9.6_beta.ebuild b/net-im/tkabber/tkabber-0.9.6_beta.ebuild
index f02097e38773..83712d856008 100644
--- a/net-im/tkabber/tkabber-0.9.6_beta.ebuild
+++ b/net-im/tkabber/tkabber-0.9.6_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.6_beta.ebuild,v 1.5 2004/08/08 00:02:07 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.6_beta.ebuild,v 1.6 2004/11/26 17:32:15 tester Exp $
 
 MY_PV="${PV/_beta/beta}"
 DESCRIPTION="Tkabber is a Free and Open Source client for the Jabber instant messaging system, written in Tcl/Tk."
@@ -19,11 +19,16 @@ DEPEND=">=dev-lang/tcl-8.3*
 	>=dev-tcltk/tkTheme-1.0"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~sparc"
+KEYWORDS="x86 ~alpha ~sparc"
 SLOT="0"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	echo -n
+}
+
 src_install() {
 	make DESTDIR=${D} PREFIX=/usr install || die
 
diff --git a/net-im/tkabber/tkabber-0.9.3b-r1.ebuild b/net-im/tkabber/tkabber-0.9.7.ebuild
index 31155e8f341f..bb483014effe 100644
--- a/net-im/tkabber/tkabber-0.9.3b-r1.ebuild
+++ b/net-im/tkabber/tkabber-0.9.7.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.3b-r1.ebuild,v 1.10 2004/06/24 23:00:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.7.ebuild,v 1.1 2004/11/26 17:32:15 tester Exp $
 
-DESCRIPTION="Featurefull Jabber client for tcl/tk."
+DESCRIPTION="Tkabber is a Free and Open Source client for the Jabber instant messaging system, written in Tcl/Tk."
 HOMEPAGE="http://tkabber.jabber.ru/"
+SRC_URI="http://www.jabberstudio.org/files/tkabber/${P}.tar.gz"
 IUSE="crypt ssl"
 
-DEPEND=">=dev-lang/tcl-8.3*
-	>=dev-lang/tk-8.3*
+DEPEND=">=dev-lang/tcl-8.3.3
+	>=dev-lang/tk-8.3.3
 	dev-tcltk/tclxml-expat
 	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
 	>=dev-tcltk/tcllib-1.3
@@ -17,13 +18,13 @@ DEPEND=">=dev-lang/tcl-8.3*
 	>=dev-tcltk/tkTheme-1.0"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
-
+KEYWORDS="~x86 ~alpha ~sparc"
 SLOT="0"
 
-MY_P="$(echo ${P}|sed 's/b$/beta/')"
-SRC_URI="http://www.jabber.ru/projects/tkabber/tkabber-0.9beta/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+src_compile() {
+	# dont run make, because the Makefile is broken with all=install
+	echo -n
+}
 
 src_install() {
 	make DESTDIR=${D} PREFIX=/usr install || die