kvirc moved to svn, thanks to ich@kuja.in in bug #158815 and also some cleanup and automake fix

(Portage version: 2.1.2_rc4)

4 files changed, 33 insertions, 47 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index bfefe8f1fb2e..781a271a208f 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.40 2006/11/14 19:47:41 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.41 2006/12/23 22:13:00 jokey Exp $
+
+  23 Dec 2006; Markus Ullmann <jokey@gentoo.org> kvirc-3.2.0.ebuild,
+  -kvirc-3.2.3.ebuild, -kvirc-3.2.4.ebuild, kvirc-3.2.5.ebuild,
+  kvirc-9999.ebuild:
+  kvirc moved to svn, thanks to ich@kuja.in in bug #158815 and also some
+  cleanup and automake fix
 
   14 Nov 2006; Andrej Kacian <ticho@gentoo.org> kvirc-3.2.5.ebuild:
   Stable on x86, bug #155139, by Mike Pagano <mpagano at gmail.com>.
diff --git a/net-irc/kvirc/kvirc-3.2.0.ebuild b/net-irc/kvirc/kvirc-3.2.0.ebuild
index e0674bea5739..2e6b8ae6fdfa 100644
--- a/net-irc/kvirc/kvirc-3.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.11 2006/09/24 19:52:23 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.12 2006/12/23 22:13:00 jokey Exp $
 
-inherit autotools eutils kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
@@ -23,11 +23,7 @@ RDEPEND="esd? ( media-sound/esound )
 	=x11-libs/qt-3*"
 
 DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/libtool
-	sys-devel/gettext
-	sys-apps/sed"
+	sys-devel/gettext"
 
 src_unpack() {
 	unpack ${A}
@@ -57,15 +53,12 @@ src_compile() {
 
 	[ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm"
 
-	WANT_AUTOCONF="2.5"
-	WANT_AUTOMAKE="1.5"
-
-	econf ${myconf} || die "failed to configure"
-	emake -j1 || die "failed to make"
+	econf ${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	make docs DESTDIR="${D}" || die "make docs failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" docs || die "emake docs failed"
 	dodoc ChangeLog INSTALL README TODO
 }
diff --git a/net-irc/kvirc/kvirc-3.2.5.ebuild b/net-irc/kvirc/kvirc-3.2.5.ebuild
index f4bd1c8e470e..3ac9370d3f2d 100644
--- a/net-irc/kvirc/kvirc-3.2.5.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.5.ebuild,v 1.3 2006/11/14 19:47:41 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.5.ebuild,v 1.4 2006/12/23 22:13:00 jokey Exp $
 
-inherit autotools eutils kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
@@ -22,11 +22,7 @@ RDEPEND="esd? ( media-sound/esound )
 	=x11-libs/qt-3*"
 
 DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/libtool
-	sys-devel/gettext
-	sys-apps/sed"
+	sys-devel/gettext"
 
 src_unpack() {
 	unpack ${A}
@@ -53,15 +49,12 @@ src_compile() {
 
 	[ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm"
 
-	WANT_AUTOCONF="2.5"
-	WANT_AUTOMAKE="1.5"
-
-	econf ${myconf} || die "failed to configure"
-	emake -j1 || die "failed to make"
+	econf ${myconf} || die "econf failed"
+	emake -j1 || die "econf failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	make docs DESTDIR="${D}" || die "make docs failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" docs || die "emake docs failed"
 	dodoc ChangeLog INSTALL README TODO
 }
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index a983cfbc9738..6a327f981b0a 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.4 2006/09/24 19:52:23 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.5 2006/12/23 22:13:00 jokey Exp $
 
-inherit autotools eutils kde-functions cvs
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit autotools eutils kde-functions subversion
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
@@ -21,17 +23,12 @@ RDEPEND="esd? ( media-sound/esound )
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
-ECVS_SERVER="cvs.kvirc.net:/cvs"
-ECVS_MODULE="kvirccvs/kvirc"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/${P}"
-
-S="${WORKDIR}/${ECVS_MODULE}"
+ESVN_REPO_URI="https://svn.kvirc.de/svn/trunk/kvirc"
+ESVN_PROJECT="kvirc"
+ESVN_BOOTSTRAP="./autogen.sh"
 
 src_unpack() {
-	cvs_src_unpack
-	cd ${S}
-	einfo "Generating configure script, this takes a moment"
-	./autogen.sh
+	subversion_src_unpack
 	epatch ${FILESDIR}/${PN}-3.2.3-kdedir-fix.patch
 }
 
@@ -54,15 +51,12 @@ src_compile() {
 
 	[ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm"
 
-	WANT_AUTOCONF="2.5"
-	WANT_AUTOMAKE="1.5"
-
-	econf ${myconf} || die "failed to configure"
-	emake -j1 || die "failed to make"
+	econf ${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	make docs DESTDIR="${D}" || die "make docs failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" docs || die "emake docs failed"
 	dodoc ChangeLog README TODO
 }