Marked stable on x86. Removed old ebuild.

5 files changed, 15 insertions, 130 deletions

diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index cfe4ba305723..ec461b2ded16 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2004/09/12 15:54:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.11 2004/11/13 00:23:01 swegener Exp $
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/0.9.83-r1-gentoo.diff, -quirc-0.9.83-r1.ebuild,
+  quirc-0.9.84.ebuild:
+  Marked stable on x86. Removed old ebuild.
 
   12 Sep 2004; Sven Wegener <swegener@gentoo.org> quirc-0.9.84.ebuild:
   Accidently dropped one keyword, re-added it.
diff --git a/net-irc/quirc/files/0.9.83-r1-gentoo.diff b/net-irc/quirc/files/0.9.83-r1-gentoo.diff
deleted file mode 100644
index 5d82a9c8e9be..000000000000
--- a/net-irc/quirc/files/0.9.83-r1-gentoo.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN quirc-0.9.83/configure.in quirc-0.9.83-modified/configure.in
---- quirc-0.9.83/configure.in	2002-10-02 01:23:58.000000000 -0500
-+++ quirc-0.9.83-modified/configure.in	2002-11-06 01:58:07.000000000 -0600
-@@ -55,12 +55,12 @@
- CXXFLAGS="$CXXFLAGS $X_CFLAGS"
- 
- dnl Add some convenient directories to LIBS
--LDFLAGS="$LDFLAGS -L/usr/local/lib -L. -L.. -L$HOME/lib"
-+LDFLAGS="$LDFLAGS -L. -L.. -L$HOME/lib"
- 
- dnl Add some nice dirs to CPPFLAGS (-I. -I.. -IHOME/include ?)
- dnl $x_includes may have more than one dir in it.  $X_CFLAGS could be used as
- dnl an alternative if such a case is discovered.
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+dnl CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- 
- dnl Back up the existing flags, then add the X includes on, for internal use.
- cppflags_backup="$CPPFLAGS"
-@@ -111,7 +111,7 @@
- 
- if test "$WISH" = "notfound"; then
-   AC_PATH_PROGS(WISH, wish8.3 wish8.2 wish8.1 wish8.0 wish, notfound, \
--  $PATH:/usr/bin:/usr/local/bin)
-+  $PATH:/usr/bin)
- fi
- 
- if test "$WISH" = "notfound"; then
-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-11-06 01:54:36.000000000 -0600
-@@ -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-11-06 01:54:36.000000000 -0600
-@@ -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-11-06 01:54:36.000000000 -0600
-@@ -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.83-r1 b/net-irc/quirc/files/digest-quirc-0.9.83-r1
deleted file mode 100644
index 0bae9897cdb1..000000000000
--- a/net-irc/quirc/files/digest-quirc-0.9.83-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27f357aac1f305682ae79c9f0163c069 quirc-0.9.83.tar.gz 297139
diff --git a/net-irc/quirc/quirc-0.9.83-r1.ebuild b/net-irc/quirc/quirc-0.9.83-r1.ebuild
deleted file mode 100644
index 058a8d65b0ff..000000000000
--- a/net-irc/quirc/quirc-0.9.83-r1.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-r1.ebuild,v 1.8 2004/09/01 02:35:17 swegener 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-8.4
-	<dev-lang/tk-8.4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-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.84.ebuild b/net-irc/quirc/quirc-0.9.84.ebuild
index 20e7dbbe64dc..1cdc3d5b9da8 100644
--- a/net-irc/quirc/quirc-0.9.84.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.84.ebuild,v 1.2 2004/09/12 15:54:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.3 2004/11/13 00:23:01 swegener Exp $
 
 DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
 SRC_URI="http://quirc.org/${P}.tar.gz"
@@ -11,12 +11,10 @@ DEPEND="dev-lang/tcl
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 src_compile() {
-	export CXX="g++"
-
 	econf \
 		--datadir=/usr/share/quirc \
 		|| die "econf failed"
@@ -25,17 +23,19 @@ src_compile() {
 }
 
 src_install () {
-	dodbin quirc
+	dobin quirc || die "dobin failed"
 
 	insinto /usr/share/quirc
-	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION
+	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION \
+		|| die "doins failed"
 
 	insinto /usr/share/quirc/common
-	doins ${S}/data/common/*.tcl
+	doins ${S}/data/common/*.tcl || die "doins failed"
 
 	insinto /usr/share/quirc/themes
-	doins ${S}/data/themes/*.tcl
+	doins ${S}/data/themes/*.tcl || die "doins failed"
 
 	# this package installs docs, but we would rather do that ourselves
-	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt
+	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt \
+		|| die "dodoc failed"
 }