Add gcc-4.1 patch by Tristan Heaven <tristanheaven@gmail.com>, bug #138043. Fix configure script to find the kde libraries, bug #112155. Add libyahoo patch to compile yahoo support correctly.

Package-Manager: portage-2.1.1_pre1-r1

6 files changed, 134 insertions, 40 deletions

diff --git a/net-p2p/qtella/ChangeLog b/net-p2p/qtella/ChangeLog
index aa89e6649a65..e0a90b6b3183 100644
--- a/net-p2p/qtella/ChangeLog
+++ b/net-p2p/qtella/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/qtella
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.25 2005/09/12 18:42:05 mkay Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.26 2006/06/28 03:09:05 squinky86 Exp $
+
+  28 Jun 2006; Jon Hood <squinky86@gentoo.org>
+  +files/qtella-0.7.0-gcc41.patch, qtella-0.7.0-r1.ebuild:
+  Add gcc-4.1 patch by Tristan Heaven <tristanheaven@gmail.com>, bug #138043.
+  Fix configure script to find the kde libraries, bug #112155. Add libyahoo
+  patch to compile yahoo support correctly.
 
   12 Sep 2005; <mkay@gentoo.org> qtella-0.7.0.ebuild, 
   qtella-0.7.0-r1.ebuild::
diff --git a/net-p2p/qtella/Manifest b/net-p2p/qtella/Manifest
index ffe40a8d027a..1c5300833fb8 100644
--- a/net-p2p/qtella/Manifest
+++ b/net-p2p/qtella/Manifest
@@ -1,22 +1,52 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b95ed7cc3019d2080dee7286cf1a1993 ChangeLog 4268
+AUX 0.7.0-nokde.patch 1998 RMD160 1773a31185b8c7438181a883a441b3e1ce64b3d6 SHA1 1d54479dc7bd46f9cff6df8c0a2bb5c7d2ad50a9 SHA256 0d2802d4d709868756336193daf2a9fedee4560f219d9e069fea70acc7ff2581
 MD5 09b1c23023110b96371fbec1a52110e1 files/0.7.0-nokde.patch 1998
-MD5 1a26818529b8ff279331f5015cba38df files/digest-qtella-0.6.4 64
-MD5 4ec767658f5e03d7787315714ac2d2b8 files/digest-qtella-0.6.5 64
-MD5 ce9afdcf9321154c1866cfb82d47fa0b files/digest-qtella-0.7.0 64
-MD5 ce9afdcf9321154c1866cfb82d47fa0b files/digest-qtella-0.7.0-r1 64
+RMD160 1773a31185b8c7438181a883a441b3e1ce64b3d6 files/0.7.0-nokde.patch 1998
+SHA256 0d2802d4d709868756336193daf2a9fedee4560f219d9e069fea70acc7ff2581 files/0.7.0-nokde.patch 1998
+AUX qtella-0.7.0-errno.patch 439 RMD160 8266aa08434b5968f9aefca8d295b666f63b5d36 SHA1 cfbdf0b3a4f10f8e5bf321b8758e3a19447aa625 SHA256 39d7e0531c7fb0de184f9c691de9a2176f5ce7356300bc3649db29be52576e72
 MD5 ba43248761d83c1286b6f69467492d89 files/qtella-0.7.0-errno.patch 439
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 8266aa08434b5968f9aefca8d295b666f63b5d36 files/qtella-0.7.0-errno.patch 439
+SHA256 39d7e0531c7fb0de184f9c691de9a2176f5ce7356300bc3649db29be52576e72 files/qtella-0.7.0-errno.patch 439
+AUX qtella-0.7.0-gcc41.patch 1449 RMD160 24be7ce4339e588cdcd107a0a2add626c078b361 SHA1 ce5a1fd4974919722820f6e5da5e390f0e6ee246 SHA256 a98e4a1ab667179d9124f5df58fe6b52325c52559187408d3d52f9ed00900082
+MD5 6113f3a74abd973f62282e82ec537b57 files/qtella-0.7.0-gcc41.patch 1449
+RMD160 24be7ce4339e588cdcd107a0a2add626c078b361 files/qtella-0.7.0-gcc41.patch 1449
+SHA256 a98e4a1ab667179d9124f5df58fe6b52325c52559187408d3d52f9ed00900082 files/qtella-0.7.0-gcc41.patch 1449
+DIST qtella-0.6.4.tar.gz 512207
+DIST qtella-0.6.5.tar.gz 545660
+DIST qtella-0.7.0-libyahoo.patch.gz 3566 RMD160 ca2f94362b9d75da3c6730e8a86cfc9bb72cdab9 SHA1 9e69fdbb36ed7b722de3aba6ff08f2a8c39009fa SHA256 f6b06583e30f6189377271545ee8d1f28dda8c4dfc60c4d1bf46a229aee0414d
+DIST qtella-0.7.0.tar.gz 672916 RMD160 e642e0974891e6e96b89d53a117326530116b0c6 SHA1 5e821177a5c12f56faa4b73513eb870e5182edd6 SHA256 d985e3ee9749016c3bbc8bd90c4c01af6533bff5c88407068b25fbe3107d597c
+EBUILD qtella-0.6.4.ebuild 631 RMD160 da033a5bcd3eed7fb1c96ee85fd36a58c070d922 SHA1 9b703aaa3ed6c9d2192743dd6f97135d2fb1b284 SHA256 33bbba8b47ecba4ba342f207a1cab8aef9e98e6c3c1873104c5cfcffaea5cf39
 MD5 a070dc2437a3867b732a8f5dba279075 qtella-0.6.4.ebuild 631
+RMD160 da033a5bcd3eed7fb1c96ee85fd36a58c070d922 qtella-0.6.4.ebuild 631
+SHA256 33bbba8b47ecba4ba342f207a1cab8aef9e98e6c3c1873104c5cfcffaea5cf39 qtella-0.6.4.ebuild 631
+EBUILD qtella-0.6.5.ebuild 632 RMD160 da5cab05e5a6f99c7c4af24b33dfccd02db7195f SHA1 37c82a12aa545fc0c029364402c8a99ef54fc404 SHA256 d4a5b79a833292ddf154d5677893730bd48fe143c0f97b77116a2ffe9288c42d
 MD5 0dc528f6960571b17589de24a429ad17 qtella-0.6.5.ebuild 632
-MD5 b6fb9a698b418575116dc0f1d13abf31 qtella-0.7.0-r1.ebuild 919
+RMD160 da5cab05e5a6f99c7c4af24b33dfccd02db7195f qtella-0.6.5.ebuild 632
+SHA256 d4a5b79a833292ddf154d5677893730bd48fe143c0f97b77116a2ffe9288c42d qtella-0.6.5.ebuild 632
+EBUILD qtella-0.7.0-r1.ebuild 1156 RMD160 d70a408ee8db5d59a7677e8ebf94db21267b4e3d SHA1 04b0a44b12163fb8aa857d419b9958b37020affa SHA256 d2f5b8d6d91df078ebd8548abd511ad4b677d7685fd3e56ebf69e7fdac95acb4
+MD5 9c04ff60abc92ff57ef4d83146145888 qtella-0.7.0-r1.ebuild 1156
+RMD160 d70a408ee8db5d59a7677e8ebf94db21267b4e3d qtella-0.7.0-r1.ebuild 1156
+SHA256 d2f5b8d6d91df078ebd8548abd511ad4b677d7685fd3e56ebf69e7fdac95acb4 qtella-0.7.0-r1.ebuild 1156
+EBUILD qtella-0.7.0.ebuild 872 RMD160 3e377346d1ead6269ee97933d00fa4afa641ff27 SHA1 67cfbcad49ab1cad09074c7e9dfcc9f84b1e9ecc SHA256 a881eaf8b0ef738274715d49c74e1ffb38dd018cafc4fefdaadc74578b69fc1d
 MD5 14092af108c80379a2a532567473e95a qtella-0.7.0.ebuild 872
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDKsXnI1lqEGTUzyQRArvvAKCG83wNqDaJN4PVlhgh3J6J3DxeBgCeIELJ
-+mt2QU1+Vtfhz6cPFxpe5TY=
-=XeCe
------END PGP SIGNATURE-----
+RMD160 3e377346d1ead6269ee97933d00fa4afa641ff27 qtella-0.7.0.ebuild 872
+SHA256 a881eaf8b0ef738274715d49c74e1ffb38dd018cafc4fefdaadc74578b69fc1d qtella-0.7.0.ebuild 872
+MISC ChangeLog 4578 RMD160 2466c9a56f977e0e7e1346ba2b3254c50b3f3cca SHA1 828fc27f8ad2fcd64079c6875d304173cd04dde8 SHA256 36108e47fa8c9612a0be8ba99affd2e3c5e81184fc71995dbad0548a9831dccc
+MD5 46a9eab9fde6470daa540c700101ea33 ChangeLog 4578
+RMD160 2466c9a56f977e0e7e1346ba2b3254c50b3f3cca ChangeLog 4578
+SHA256 36108e47fa8c9612a0be8ba99affd2e3c5e81184fc71995dbad0548a9831dccc ChangeLog 4578
+MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
+SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
+MD5 1a26818529b8ff279331f5015cba38df files/digest-qtella-0.6.4 64
+RMD160 183fa08ac71fb27165c614e7cb7d9a4ea6e2ee76 files/digest-qtella-0.6.4 64
+SHA256 c35c3dc04a61bc7323c5c422050d8723ea78d093a7a25dc3b298c283fa37f085 files/digest-qtella-0.6.4 64
+MD5 4ec767658f5e03d7787315714ac2d2b8 files/digest-qtella-0.6.5 64
+RMD160 86f492dbd4498032c25c456083afc6187f40712f files/digest-qtella-0.6.5 64
+SHA256 1a530e562bc06199d7984621c48d6787b20aa47c6c4094d662399407d07e1273 files/digest-qtella-0.6.5 64
+MD5 8f7a60b76abf171e96d125f68c1f0fad files/digest-qtella-0.7.0 238
+RMD160 7bbdff78dd51ac513cacf888cc803178432ad832 files/digest-qtella-0.7.0 238
+SHA256 8a5b518a46220210ae68b060639919641b711bc23d42150d02f766d2429918eb files/digest-qtella-0.7.0 238
+MD5 d96e4795ad67f0a3addb80c29deb1739 files/digest-qtella-0.7.0-r1 503
+RMD160 7f2cac6a01eda531326f0f1b87f15dc8b48a4cb1 files/digest-qtella-0.7.0-r1 503
+SHA256 304c9410d9731f8087370e46e96796675c26c35d663418d0f40c80a0a1f83110 files/digest-qtella-0.7.0-r1 503
diff --git a/net-p2p/qtella/files/digest-qtella-0.7.0 b/net-p2p/qtella/files/digest-qtella-0.7.0
index 77c603f794c5..bd48d6792416 100644
--- a/net-p2p/qtella/files/digest-qtella-0.7.0
+++ b/net-p2p/qtella/files/digest-qtella-0.7.0
@@ -1 +1,3 @@
 MD5 43f59fcf6366db64f8b6b3fc3d6b0fa3 qtella-0.7.0.tar.gz 672916
+RMD160 e642e0974891e6e96b89d53a117326530116b0c6 qtella-0.7.0.tar.gz 672916
+SHA256 d985e3ee9749016c3bbc8bd90c4c01af6533bff5c88407068b25fbe3107d597c qtella-0.7.0.tar.gz 672916
diff --git a/net-p2p/qtella/files/digest-qtella-0.7.0-r1 b/net-p2p/qtella/files/digest-qtella-0.7.0-r1
index 77c603f794c5..ad58823af275 100644
--- a/net-p2p/qtella/files/digest-qtella-0.7.0-r1
+++ b/net-p2p/qtella/files/digest-qtella-0.7.0-r1
@@ -1 +1,6 @@
+MD5 bc19001957de521d2fbad8e75559266c qtella-0.7.0-libyahoo.patch.gz 3566
+RMD160 ca2f94362b9d75da3c6730e8a86cfc9bb72cdab9 qtella-0.7.0-libyahoo.patch.gz 3566
+SHA256 f6b06583e30f6189377271545ee8d1f28dda8c4dfc60c4d1bf46a229aee0414d qtella-0.7.0-libyahoo.patch.gz 3566
 MD5 43f59fcf6366db64f8b6b3fc3d6b0fa3 qtella-0.7.0.tar.gz 672916
+RMD160 e642e0974891e6e96b89d53a117326530116b0c6 qtella-0.7.0.tar.gz 672916
+SHA256 d985e3ee9749016c3bbc8bd90c4c01af6533bff5c88407068b25fbe3107d597c qtella-0.7.0.tar.gz 672916
diff --git a/net-p2p/qtella/files/qtella-0.7.0-gcc41.patch b/net-p2p/qtella/files/qtella-0.7.0-gcc41.patch
new file mode 100644
index 000000000000..df349c5ec0d2
--- /dev/null
+++ b/net-p2p/qtella/files/qtella-0.7.0-gcc41.patch
@@ -0,0 +1,47 @@
+--- include/AudioMp3.h
++++ include/AudioMp3.h
+@@ -11,7 +11,7 @@
+ class AudioMp3: public MyAudioFile
+ {
+ public:
+-  AudioMp3::AudioMp3( std::string filename );
++  AudioMp3( std::string filename );
+   std::string	&getTitle()	{ return _title; };
+   void		setTitle( std::string str ) { _title = str; };
+   std::string	&getArtist()	{ return _artist;} ;
+
+--- include/AudioOgg.h
++++ include/AudioOgg.h
+@@ -11,7 +11,7 @@
+ class AudioOgg: public MyAudioFile
+ {
+ public:
+-  AudioOgg::AudioOgg( std::string filename );
++  AudioOgg( std::string filename );
+   std::string	&getTitle()	{ return _title; };
+   void		setTitle( std::string str ) { _title = str; }
+   std::string	&getArtist()	{ return _artist;} ;
+
+--- include/AudioWav.h
++++ include/AudioWav.h
+@@ -11,7 +11,7 @@
+ class AudioWav: public MyAudioFile
+ {
+ public:
+-  AudioWav::AudioWav( std::string filename );
++  AudioWav( std::string filename );
+   std::string	&getTitle()	{ return _title; };
+   std::string	&getArtist()	{ return _artist;} ;
+ //  std::string	&getAlbum()	{ return _album; };
+
+--- include/BitTorrent.h
++++ include/BitTorrent.h
+@@ -67,7 +67,7 @@
+ public:
+ 	~BitTorrent();
+ 	static BitTorrent* decode( const char* buf, int len );
+-	static BitTorrent* BitTorrent::bt_decode_file( const char* filename );
++	static BitTorrent* bt_decode_file( const char* filename );
+ 	void setAnnounce( const std::string& announce );
+ 	const std::string& getAnnounce() const;
+ 	void setSingleFile( bool s );
diff --git a/net-p2p/qtella/qtella-0.7.0-r1.ebuild b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
index 81bfde9d9221..ea4fe848b91a 100644
--- a/net-p2p/qtella/qtella-0.7.0-r1.ebuild
+++ b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
@@ -1,44 +1,48 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.4 2005/09/12 17:31:55 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.5 2006/06/28 03:09:05 squinky86 Exp $
 
-inherit eutils kde-functions
+inherit eutils qt3 multilib kde-functions
 
-SRC_URI="mirror://sourceforge/qtella/${P}.tar.gz"
-HOMEPAGE="http://www.qtella.net"
+need-kde 3
+
+SRC_URI="mirror://sourceforge/qtella/${P}.tar.gz
+	http://squinky.gotdns.com/${P}-libyahoo.patch.gz"
+HOMEPAGE="http://qtella.sourceforge.net/"
 DESCRIPTION="Excellent QT/KDE Gnutella Client"
 
 LICENSE="GPL-2"
 IUSE="kde"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc ~x86"
 SLOT="3" # why??
 
-DEPEND="=x11-libs/qt-3*
+DEPEND="$(qt_min_version 3)
 	kde? ( >=kde-base/kdelibs-3 )"
 
-export MAKEOPTS="$MAKEOPTS -j1"
-
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${P}.tar.gz
+	cd "${S}"
 	if ! use kde; then
-		epatch ${FILESDIR}/${PV}-nokde.patch
+		epatch "${FILESDIR}"/${PV}-nokde.patch
 	fi
-	epatch ${FILESDIR}/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${DISTDIR}"/${P}-libyahoo.patch.gz
 }
 
 src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
 	local myconf
-	use kde || myconf="--with-kde=no"
+	if use kde ; then
+		myconf="--with-kde=yes --with-kde-libs=${KDEDIR}"
+	else
+		myconf="--with-kde=no"
+	fi
 
-	econf ${myconf} || die
-	emake || die
+	econf ${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog THANKS
 }