for yummy nokde goodness, we need a patch to disable some functions that rely on kde headers (#55284)

5 files changed, 64 insertions, 19 deletions

diff --git a/net-p2p/qtella/ChangeLog b/net-p2p/qtella/ChangeLog
index 13ba1778bfec..8d035530354d 100644
--- a/net-p2p/qtella/ChangeLog
+++ b/net-p2p/qtella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/qtella
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.18 2004/06/29 00:25:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.19 2004/07/02 02:45:53 squinky86 Exp $
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/0.7.0-nokde.patch,
+  -files/qtella-0.6.1-nokde.diff, qtella-0.7.0.ebuild:
+  add nokde patch, #55284
 
   29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> qtella-0.5.3-r2.ebuild,
   qtella-0.6.4.ebuild, qtella-0.7.0.ebuild:
diff --git a/net-p2p/qtella/Manifest b/net-p2p/qtella/Manifest
index fc9857d7fb44..97d918b9b482 100644
--- a/net-p2p/qtella/Manifest
+++ b/net-p2p/qtella/Manifest
@@ -1,9 +1,9 @@
-MD5 1c2c1315a1d81c4ad38de1b0812562e4 qtella-0.7.0.ebuild 704
+MD5 1091105df6227af61e2a2595c72cc579 qtella-0.7.0.ebuild 793
 MD5 b754458f628fbd8a0636e5933747c364 qtella-0.6.4.ebuild 615
 MD5 b950bbfc52511c922170305f3ea48a4c qtella-0.5.3-r2.ebuild 807
-MD5 98fd45ad396f47d19c37d61eecc037d0 ChangeLog 3139
+MD5 ba1097d25a318b0033b7a4a5619d2f25 ChangeLog 3298
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 09b1c23023110b96371fbec1a52110e1 files/0.7.0-nokde.patch 1998
 MD5 1a26818529b8ff279331f5015cba38df files/digest-qtella-0.6.4 64
 MD5 ce9afdcf9321154c1866cfb82d47fa0b files/digest-qtella-0.7.0 64
 MD5 10498ea48fb6500d9dc739862a260ac5 files/digest-qtella-0.5.3-r2 64
-MD5 2dc37ee576745d4f0436756a030e76f6 files/qtella-0.6.1-nokde.diff 371
diff --git a/net-p2p/qtella/files/0.7.0-nokde.patch b/net-p2p/qtella/files/0.7.0-nokde.patch
new file mode 100644
index 000000000000..1236e54c7fed
--- /dev/null
+++ b/net-p2p/qtella/files/0.7.0-nokde.patch
@@ -0,0 +1,48 @@
+diff -Naur qtella-0.7.0.vanilla/src/QtellaSubConfig.cpp qtella-0.7.0/src/QtellaSubConfig.cpp
+--- qtella-0.7.0.vanilla/src/QtellaSubConfig.cpp	2004-05-26 16:32:00.000000000 -0500
++++ qtella-0.7.0/src/QtellaSubConfig.cpp	2004-07-01 21:37:51.156045376 -0500
+@@ -519,7 +519,7 @@
+             for(i = 0; i < vString.size(); i++)
+               _widget_config->ui_blocked_words->insertItem( vString[i].c_str() );
+ 		  }
+-		  
++				#ifdef USEKDE
+ 				if( s1 == "YID" ) {
+ 					_widget_config->lineedit_yahooid->setText( s2.c_str() );
+ 				}
+@@ -529,6 +529,7 @@
+ 				if( s1 == "YCONNECT" ) {
+ 					_widget_config->checkbox_yahooconnect->setChecked( ( s2 == "1" ) ? true : false );
+ 				}
++				#endif
+ 			}
+ 		}
+ 		f.close();
+@@ -632,11 +633,12 @@
+     << "GROUP=" << (const char*)_widget_config->ui_lineedit_userid->text() << std::endl
+     << "RESERVE_IN=" << _widget_config->ui_checkbox_reserve_in->isChecked() << std::endl
+     << "RESERVE_UP=" << _widget_config->ui_checkbox_reserve_up->isChecked() << std::endl;
+-  
++  #ifdef USEKDE
+ 	QCString result = KCodecs::base64Encode( _widget_config->lineedit_yahoopasswd->text().ascii() );
+ 	f << "YID=" << (const char*) _widget_config->lineedit_yahooid->text() << std::endl
+ 		<< "YPWD=" << (const char*) result << std::endl
+ 		<< "YCONNECT=" << ( _widget_config->checkbox_yahooconnect->isChecked() ? "1" : "0" ) << std::endl;
++  #endif
+ 	f << "GROUPS=";
+ 	for( unsigned i = 0; i < _widget_config->ui_listbox_groups->count(); ++i ) {
+ 		f << (const char*)_widget_config->ui_listbox_groups->text( i ) << ";";
+diff -Naur qtella-0.7.0.vanilla/src/main.cpp qtella-0.7.0/src/main.cpp
+--- qtella-0.7.0.vanilla/src/main.cpp	2004-05-20 11:14:13.000000000 -0500
++++ qtella-0.7.0/src/main.cpp	2004-07-01 21:09:23.000000000 -0500
+@@ -73,8 +73,10 @@
+ 
+ 	a.setMainWidget(&qtella);
+ 	qtella.show();
++	#ifdef USEKDE
+ 	KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+ 	if( args->isSet( "show-searches" ) )
+ 		qtella.setSearchLogging( true );
++	#endif
+ 	return a.exec();
+ }
diff --git a/net-p2p/qtella/files/qtella-0.6.1-nokde.diff b/net-p2p/qtella/files/qtella-0.6.1-nokde.diff
deleted file mode 100644
index 8b16a239f825..000000000000
--- a/net-p2p/qtella/files/qtella-0.6.1-nokde.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/QtellaSub.cpp	2003-02-03 01:39:07.000000000 +0200
-+++ src/QtellaSub.cpp	2003-02-25 18:28:48.000000000 +0200
-@@ -796,8 +796,8 @@
- 
- #ifndef USEKDE
- #ifndef SHARP
--  ui_checkbox_fileassociations->hide();
--  ui_checkbox_systemtray->hide();
-+  _widget_config->ui_checkbox_fileassociations->hide();
-+  _widget_config->ui_checkbox_systemtray->hide();
- #endif
- #endif
- 
diff --git a/net-p2p/qtella/qtella-0.7.0.ebuild b/net-p2p/qtella/qtella-0.7.0.ebuild
index c27273776daf..edb3bfea2a89 100644
--- a/net-p2p/qtella/qtella-0.7.0.ebuild
+++ b/net-p2p/qtella/qtella-0.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.3 2004/06/29 00:25:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0.ebuild,v 1.4 2004/07/02 02:45:53 squinky86 Exp $
 
-inherit kde
+inherit kde eutils
 
 IUSE="kde"
 use kde && need-kde 3 || need-qt 3
@@ -17,6 +17,12 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 export MAKEOPTS="$MAKEOPTS -j1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-nokde.patch
+}
+
 src_compile() {
 	kde_src_compile myconf
 	use kde || myconf="$myconf --with-kde=no"