Version bump. Fixes bug #62350. Removed old ebuilds and updated dependencies.

8 files changed, 20 insertions, 108 deletions

diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index 201be9d67005..d001822e3f31 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quirc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.8 2004/06/24 23:08:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.9 2004/09/01 02:35:17 swegener Exp $
+
+*quirc-0.9.84 (01 Sep 2004)
+
+  01 Sep 2004; Sven Wegener <swegener@gentoo.org> -files/0.9.83-gentoo.diff,
+  -quirc-0.9.82.ebuild, quirc-0.9.83-r1.ebuild, -quirc-0.9.83.ebuild,
+  +quirc-0.9.84.ebuild:
+  Version bump. Fixes bug #62350. Removed old ebuilds and updated dependencies.
 
   19 Jun 2004; Sven Wegener <swegener@gentoo.org> quirc-0.9.82.ebuild,
   quirc-0.9.83-r1.ebuild, quirc-0.9.83.ebuild:
diff --git a/net-irc/quirc/files/0.9.83-gentoo.diff b/net-irc/quirc/files/0.9.83-gentoo.diff
deleted file mode 100644
index d798a57fba23..000000000000
--- a/net-irc/quirc/files/0.9.83-gentoo.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN quirc-0.9.83/server.cc quirc-0.9.83-modified/server.cc
---- quirc-0.9.83/server.cc	2002-10-02 01:19:22.000000000 -0500
-+++ quirc-0.9.83-modified/server.cc	2002-10-21 23:54:37.000000000 -0500
-@@ -11,7 +11,8 @@
- #include <ctype.h>
- #include <netdb.h> 
- #include <stdarg.h>
--#include <iostream.h>
-+
-+using namespace std;
- 
- #include "config.h"
- 
-diff -urN quirc-0.9.83/servertcl.cc quirc-0.9.83-modified/servertcl.cc
---- quirc-0.9.83/servertcl.cc	2002-10-02 01:18:59.000000000 -0500
-+++ quirc-0.9.83-modified/servertcl.cc	2002-10-21 23:53:04.000000000 -0500
-@@ -1,6 +1,7 @@
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <ctype.h>
- 
- #ifdef DMALLOC
- #include <dmalloc.h>
-diff -urN quirc-0.9.83/tcl.cc quirc-0.9.83-modified/tcl.cc
---- quirc-0.9.83/tcl.cc	2002-10-01 03:32:32.000000000 -0500
-+++ quirc-0.9.83-modified/tcl.cc	2002-10-21 23:52:06.000000000 -0500
-@@ -1,6 +1,7 @@
- #include <sys/time.h>
- #include <unistd.h>
- #include <sys/socket.h>
-+#include <ctype.h>
- 
- #ifdef DMALLOC
- #include <dmalloc.h>
diff --git a/net-irc/quirc/files/digest-quirc-0.9.82 b/net-irc/quirc/files/digest-quirc-0.9.82
deleted file mode 100644
index b2f95ef70d4c..000000000000
--- a/net-irc/quirc/files/digest-quirc-0.9.82
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4148739f4cf66458bd5355d6196772cb quirc-0.9.82.tar.gz 296135
diff --git a/net-irc/quirc/files/digest-quirc-0.9.83 b/net-irc/quirc/files/digest-quirc-0.9.83
deleted file mode 100644
index 0bae9897cdb1..000000000000
--- a/net-irc/quirc/files/digest-quirc-0.9.83
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27f357aac1f305682ae79c9f0163c069 quirc-0.9.83.tar.gz 297139
diff --git a/net-irc/quirc/files/digest-quirc-0.9.84 b/net-irc/quirc/files/digest-quirc-0.9.84
new file mode 100644
index 000000000000..02a62104303b
--- /dev/null
+++ b/net-irc/quirc/files/digest-quirc-0.9.84
@@ -0,0 +1 @@
+MD5 412155a371be4960c032745b1fc5eec9 quirc-0.9.84.tar.gz 341962
diff --git a/net-irc/quirc/quirc-0.9.83-r1.ebuild b/net-irc/quirc/quirc-0.9.83-r1.ebuild
index 402f24b14511..058a8d65b0ff 100644
--- a/net-irc/quirc/quirc-0.9.83-r1.ebuild
+++ b/net-irc/quirc/quirc-0.9.83-r1.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-irc/quirc/quirc-0.9.83-r1.ebuild,v 1.7 2004/06/24 23:08:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.83-r1.ebuild,v 1.8 2004/09/01 02:35:17 swegener Exp $
 
 inherit eutils
 
@@ -8,8 +8,8 @@ DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
 SRC_URI="http://quirc.org/${P}.tar.gz"
 HOMEPAGE="http://quirc.org/"
 
-DEPEND="dev-lang/tcl
-	dev-lang/tk"
+DEPEND="<dev-lang/tcl-8.4
+	<dev-lang/tk-8.4"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,7 +20,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/0.9.83-r1-gentoo.diff
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 
 }
 
diff --git a/net-irc/quirc/quirc-0.9.83.ebuild b/net-irc/quirc/quirc-0.9.83.ebuild
deleted file mode 100644
index 654d74ff0e1d..000000000000
--- a/net-irc/quirc/quirc-0.9.83.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.83.ebuild,v 1.7 2004/06/24 23:08:45 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
-SRC_URI="http://quirc.org/${P}.tar.gz"
-HOMEPAGE="http://quirc.org/"
-
-DEPEND="dev-lang/tcl
-	dev-lang/tk"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/0.9.83-gentoo.diff
-
-}
-
-src_compile() {
-
-	export CXX="g++"
-
-	econf \
-		--datadir=/usr/share/quirc \
-		|| die "./configure failed"
-
-	emake || die
-
-}
-
-src_install () {
-
-	exeinto /usr/bin
-	doexe quirc
-
-	insinto /usr/share/quirc
-	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION
-
-	insinto /usr/share/quirc/common
-	doins ${S}/data/common/*.tcl
-
-	insinto /usr/share/quirc/themes
-	doins ${S}/data/themes/*.tcl
-
-	# this package installs docs, but we would rather do that ourselves
-	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS
-	dodoc doc/*.txt
-
-}
diff --git a/net-irc/quirc/quirc-0.9.82.ebuild b/net-irc/quirc/quirc-0.9.84.ebuild
index fd1cf1f37fd1..960115d0464d 100644
--- a/net-irc/quirc/quirc-0.9.82.ebuild
+++ b/net-irc/quirc/quirc-0.9.84.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-irc/quirc/quirc-0.9.82.ebuild,v 1.10 2004/06/24 23:08:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.1 2004/09/01 02:35:17 swegener Exp $
 
 DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
 SRC_URI="http://quirc.org/${P}.tar.gz"
@@ -11,22 +11,21 @@ DEPEND="dev-lang/tcl
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 src_compile() {
+	export CXX="g++"
 
 	econf \
 		--datadir=/usr/share/quirc \
-		|| die "./configure failed"
+		|| die "econf failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install () {
-
-	exeinto /usr/bin
-	doexe quirc
+	dodbin quirc
 
 	insinto /usr/share/quirc
 	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION
@@ -38,6 +37,5 @@ src_install () {
 	doins ${S}/data/themes/*.tcl
 
 	# this package installs docs, but we would rather do that ourselves
-	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS
-	dodoc doc/*.txt
+	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt
 }