Get rid of need-qt syntax, mark x86 stable

5 files changed, 15 insertions, 79 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 00ec7440b195..87be2dd83b08 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.11 2003/12/06 02:25:04 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.12 2004/01/04 02:37:52 caleb Exp $
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
+  kvirc-3.0.0_beta2-r1.ebuild:
+  Change dep to get away from need-qt syntax
+  Mark x86 stable (though the ebuild is really old)
 
   05 Dec 2003; Chuck Short <zul@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
   kvirc-3.0.0_beta2-r1.ebuild:
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index c738d4033281..c84924fb09fb 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,4 @@
-MD5 7b47d0b37330d7119fdf9f64d03388e6 kvirc-3.0.0_beta2-r1.ebuild 2359
-MD5 e39cdae315037db00e4a40dda9755762 ChangeLog 2768
+MD5 2a4f18545538c50ab97973e41e521de8 kvirc-3.0.0_beta2-r1.ebuild 2316
+MD5 fc6eccc995c55b44c5a611f4c6ba431b ChangeLog 2975
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 52c8fd371edc0aabfbad9ec186ba305a kvirc-3.0.0_beta1-r1.ebuild 2147
-MD5 4cea7b0d2f1dad834e7758adaebc9d73 files/digest-kvirc-3.0.0_beta1-r1 70
 MD5 68d2153371007bdad609f225fdba63be files/digest-kvirc-3.0.0_beta2-r1 70
diff --git a/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1 b/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1
deleted file mode 100644
index b07a4606c155..000000000000
--- a/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fde2ff00014b7e7fdc32d1b4f5040ad kvirc-3.0.0-beta1.tar.gz 2565299
diff --git a/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild b/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild
deleted file mode 100644
index 9849966fa257..000000000000
--- a/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild,v 1.4 2003/12/06 02:25:04 zul Exp $
-
-inherit kde-base
-
-MYP=${P//_/-}
-MYPV=${PV//_/-}
-S=${WORKDIR}/${MYP}
-DESCRIPTION="An advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/kvirc/${MYPV}/source/${MYP}.tar.gz"
-
-LICENSE="kvirc"
-SLOT="3"
-KEYWORDS="x86 ~amd64"
-IUSE="kde esd ipv6"
-
-use kde && need-kde 3 || need-qt 3
-newdepend "esd? ( media-sound/esound )"
-#	   ssl? ( dev-libs/openssl )"
-use kde || newdepend "arts? ( kde-base/arts )"
-
-[ `use debug` ]		&& myconf="$myconf --with-debug-symbols"
-
-#The assembly seems to be less than stable
-#[ "$ARCH" == "x86" ]	&& myconf="$myconf --with-ix86-asm"
-
-use ipv6		&& myconf="$myconf --with-ipv6-support" \
-			|| myconf="$myconf --without-ipv6-support"
-# arts support without kde support isn't liked by the configure script
-# possibly it could be made to work but i didn't want to spend time on it
-use kde			&& myconf="$myconf --with-kde-support --with-arts-support" \
-			|| myconf="$myconf --without-kde-support --without-arts-support"
-use esd			&& myconf="$myconf --with-esd-support" \
-			|| myconf="$myconf --without-esd-support"
-# no use flag as yet, and a hard dep is rather pointless
-#use audiofile		&& myconf="$myconf --with-arts-support" \
-#			|| myconf="$myconf --without-arts-support"
-# doesn't compile
-#use ssl			&& myconf="$myconf --with-ssl-support" \
-#			|| myconf="$myconf --without-ssl-support"
-
-# use aa even when kde support is disabled
-myconf="$myconf --with-aa-fonts"
-
-src_compile() {
-	use kde && kde_src_compile myconf
-
-	# always install into /usr regardless of kde support
-	# kvirc doesn't have a kde-like installed file structure anyway
-	myconf="$myconf --prefix=/usr -v"
-
-	# make sure we disable kde support as the configure script can auto-enable
-	# it when it isn't wanted
-	use kde || export KDEDIR=""
-
-	kde_src_compile configure make
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	make docs DESTDIR=${D} || die
-	dodoc ChangeLog INSTALL README TODO
-}
diff --git a/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild b/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild
index 449deb81c5f6..f09af3b86d7a 100644
--- a/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild
+++ b/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild,v 1.4 2003/12/06 02:25:04 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild,v 1.5 2004/01/04 02:37:52 caleb Exp $
 
 inherit kde-base
 
@@ -13,15 +13,14 @@ SRC_URI="ftp://ftp.kvirc.net/kvirc/${MYPV}/source/${MYP}.tar.gz"
 
 LICENSE="kvirc"
 SLOT="3"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="kde esd ipv6 ssl debug"
 
-use kde && need-kde 3 || need-qt 3
-
-newdepend "esd? ( media-sound/esound )
-	   ssl? ( dev-libs/openssl )
-	   oss? ( media-libs/audiofile )"
-use kde || newdepend "arts? ( kde-base/arts )"
+DEPEND="esd? ( media-sound/esound )
+	ssl? ( dev-libs/openssl )
+	oss? ( media-libs/audiofile )
+	>=x11-libs/qt-3
+	kde? ( >=kde-base/kdelibs-3 )"
 
 [ `use debug` ]		&& myconf="$myconf --with-debug-symbols"