Include patch by Szymon Stefanek <devnull@omnikron.net> from bug #84281 that fixes kvirc to not link against the already installed libkvilib from previous versions.

Package-Manager: portage-2.0.51.19

5 files changed, 24 insertions, 15 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index a97e2ed6d398..21b250a895e8 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.22 2005/03/04 20:42:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.23 2005/03/07 21:36:50 swegener Exp $
+
+  07 Mar 2005; Sven Wegener <swegener@gentoo.org> kvirc-3.0.1-r1.ebuild,
+  kvirc-3.2.0.ebuild:
+  Include patch by Szymon Stefanek <devnull@omnikron.net> from bug #84281 that
+  fixes kvirc to not link against the already installed libkvilib from
+  previous versions.
 
 *kvirc-3.2.0 (04 Mar 2005)
 
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 5f168364e534..9cb68371b73e 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 589744b81d21138e4ca6c27e65d432c2 kvirc-3.0.1-r1.ebuild 1906
-MD5 04933950c40a8b79cd798c0b02c67dbb ChangeLog 4397
+MD5 3dec7f0a233d141bb11c88593b94a430 kvirc-3.0.1-r1.ebuild 1902
+MD5 998e38b6418b5b3fde02632fb276ad0b ChangeLog 4664
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 abeb5d37c7d73105c6d5448b5fd28ea8 kvirc-3.2.0.ebuild 1952
+MD5 a5683e62819c604c60876bce782146ff kvirc-3.2.0.ebuild 2060
 MD5 39628ba5cdeb5e3b6957d6a49bfd8e51 files/digest-kvirc-3.0.1-r1 65
-MD5 ddc330db93fa60a12d32e7f3e4a1d71b files/digest-kvirc-3.2.0 65
+MD5 3c9f45c4095361cc93e1f1c6d0617275 files/digest-kvirc-3.2.0 141
 MD5 3f438009c2c1f4441adb149e10e746df files/kvirc-3.0.1-kdedir-fix.patch 1953
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCKMhKI1lqEGTUzyQRAqTwAJ49lbVLmZn0z3LnlVbmx5JFjXkiYwCdHIGD
-+Awm06hPPEHG7TAm/odYJ2I=
-=jLng
+iD8DBQFCLMl6I1lqEGTUzyQRAvJuAKCz7xRWy9YsjJLjVDDk0AbgvYcEBwCcCTGm
+yyI/u4E3WuxLziaF6dCOsSc=
+=Scwt
 -----END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.0 b/net-irc/kvirc/files/digest-kvirc-3.2.0
index 746b04c725d8..608aa4740fbd 100644
--- a/net-irc/kvirc/files/digest-kvirc-3.2.0
+++ b/net-irc/kvirc/files/digest-kvirc-3.2.0
@@ -1 +1,2 @@
 MD5 e783827fda3832fc3fb50e7a41ed627d kvirc-3.2.0.tar.bz2 3704445
+MD5 be1db10f4eb16910ff1df4c4fcec5278 kvirc-3.2.0-linking-fix.patch.bz2 4266
diff --git a/net-irc/kvirc/kvirc-3.0.1-r1.ebuild b/net-irc/kvirc/kvirc-3.0.1-r1.ebuild
index c538c09de71b..ddce1ec2059d 100644
--- a/net-irc/kvirc/kvirc-3.0.1-r1.ebuild
+++ b/net-irc/kvirc/kvirc-3.0.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.1-r1.ebuild,v 1.3 2005/03/04 20:42:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.1-r1.ebuild,v 1.4 2005/03/07 21:36:50 swegener Exp $
 
 inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2 \
-	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2 \
+SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2
+	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2
 	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2"
 
 LICENSE="kvirc"
diff --git a/net-irc/kvirc/kvirc-3.2.0.ebuild b/net-irc/kvirc/kvirc-3.2.0.ebuild
index 9e26fd9dba24..0e9bacf32e30 100644
--- a/net-irc/kvirc/kvirc-3.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.0.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 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.1 2005/03/04 20:42:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.2 2005/03/07 21:36:50 swegener Exp $
 
 inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2 \
-	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2 \
-	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2"
+SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2
+	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2
+	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2
+	http://dev.gentoo.org/~swegener/distfiles/${P}-linking-fix.patch.bz2"
 
 LICENSE="kvirc"
 SLOT="3"
@@ -33,6 +34,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/kvirc-3.0.1-kdedir-fix.patch
+	epatch ${WORKDIR}/${P}-linking-fix.patch
 }
 
 src_compile() {