Remove unneeded patches.

(Portage version: 2.1.2-r7)

7 files changed, 8 insertions, 308 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c91125f9d8c0..d7a215c71c28 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.104 2007/02/04 02:46:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.105 2007/02/05 12:24:44 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kopete-0.12.1-icqfix3.patch, -files/kopete-3.5.3-icqfix.patch,
+  -files/kopete-3.5.x-oscarcontacts.patch,
+  -files/configure-fix-kdenetwork-gadu.patch,
+  -files/configure-fix-kdenetwork-xmms.patch, -files/disable-meanwhile.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kopete-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch b/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch
deleted file mode 100644
index 16b62aef9c0e..000000000000
--- a/kde-base/kopete/files/configure-fix-kdenetwork-gadu.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: kopete/protocols/configure.in.in
-===================================================================
---- kopete/protocols/configure.in.in	(revision 433553)
-+++ kopete/protocols/configure.in.in	(working copy)
-@@ -10,6 +10,11 @@
- ac_libgadu_includes=""
- ac_libgadu_libs=""
- 
-+AC_ARG_WITH(external-libgadu,
-+  [AS_HELP_STRING(--with-external-libgadu,
-+    [use external libgadu library @<:@default=check@:>@])],
-+  [], with_external_libgadu=check)
-+
- AC_ARG_WITH(libgadu-includes,
- 	AC_HELP_STRING([--with-libgadu-includes=DIR], [where the libgadu includes are.]),
- 	[  ac_libgadu_includes="$withval" ])
-@@ -26,12 +31,12 @@
- 	LIBGG_LIBS="-L$ac_libgadu_libs"
- fi
- 
--
--ac_save_LIBS="$LIBS"
--ac_save_CFLAGS="$CFLAGS"
--LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
--CFLAGS="$CFLAGS $LIBGG_INCLUDES"
--AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
-+if test "x$with_external_libgadu" != xno; then
-+	ac_save_LIBS="$LIBS"
-+	ac_save_CFLAGS="$CFLAGS"
-+	LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
-+	CFLAGS="$CFLAGS $LIBGG_INCLUDES"
-+	AC_MSG_CHECKING([libgadu version 1.5(rcX) with pthread support])
- 	AC_TRY_RUN(
- 	[
- 	
-@@ -61,29 +66,38 @@
- 	], [
- 	LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
- 	AC_MSG_RESULT([yes])
--	AC_SUBST(LIBGG_INCLUDES)
--	AC_SUBST(LIBGG_LIBS)
- 	COMPILE_GADU=true
--	AC_SUBST(COMPILE_GADU)
- 	use_libgadu_copy=
- 	], [
--	if test "$kde_use_threading" = "yes" ; then
--	AC_MSG_RESULT([no, falling back on supplied libgadu-copy])
--	use_libgadu_copy=yes
--	COMPILE_GADU=true
-+	AC_MSG_RESULT([no])
-+	])
-+	LIBS="$ac_save_LIBS"
-+	CFLAGS="$ac_save_CFLAGS"
-+
-+	if test "x$with_external_libgadu" != xcheck && test -z "$COMPILE_GADU"; then
-+		AC_MSG_FAILURE([--with-external-libgadu was given, but test for libgadu failed])
-+	fi
-+fi
-+
-+if test -z "$COMPILE_GADU"; then
-+	AC_MSG_CHECKING([if supplied libgadu-copy can be used])
-+	if test "$kde_use_threading" = "yes"; then
-+		AC_MSG_RESULT([yes])
-+		use_libgadu_copy=yes
-+		COMPILE_GADU=true
- 	else
--	use_libgadu_copy=
--	AC_MSG_RESULT([no, cannot fall back on libgadu-copy (no pthread)])
--	COMPILE_GADU=	
-+		AC_MSG_RESULT([no (no pthread), support for Gadu-Gadu will be disabled])
-+		use_libgadu_copy=
-+		COMPILE_GADU=
- 	fi
--	AC_SUBST(COMPILE_GADU)	
--	])
-+fi
-+
-+AC_SUBST(LIBGG_INCLUDES)
-+AC_SUBST(LIBGG_LIBS)
-+AC_SUBST(COMPILE_GADU)
- AM_CONDITIONAL(include_gadu, test -n "$COMPILE_GADU")
- AM_CONDITIONAL(include_libggcopy, test -n "$use_libgadu_copy")
--LIBS="$ac_save_LIBS"
--CFLAGS="$ac_save_CFLAGS"
- 
--
- if test "$use_libgadu_copy" = "yes"; then
- 	cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.in \
- 	${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
diff --git a/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch b/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch
deleted file mode 100644
index b9e9773a7abe..000000000000
--- a/kde-base/kopete/files/configure-fix-kdenetwork-xmms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kopete/plugins/nowlistening/configure.in.in
-===================================================================
---- kopete/plugins/nowlistening/configure.in.in	(revision 433553)
-+++ kopete/plugins/nowlistening/configure.in.in	(working copy)
-@@ -41,7 +41,19 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AS_HELP_STRING(--with-xmms,
-+    [enable support for XMMS @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" = xno; then
-+    AC_MSG_FAILURE([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_LDFLAGS)
- AC_SUBST(XMMS_INCLUDES)
-Index: configure.in.bot
-===================================================================
---- configure.in.bot	(revision 433553)
-+++ configure.in.bot	(working copy)
-@@ -63,7 +63,7 @@
-   all_tests=bad
- fi
- 
--if test -z "$XMMS_LIBS"; then
-+if test "x$with_xmms" = xcheck && test -z "$XMMS_LIBS"; then
-   echo ""
-   echo "You're missing the XMMS libraries, or the libxmms development package."
-   echo "Without libxmms Kopete's NowListening plugin won't be able to talk to"
diff --git a/kde-base/kopete/files/disable-meanwhile.diff b/kde-base/kopete/files/disable-meanwhile.diff
deleted file mode 100644
index 7ecb0e6dfff5..000000000000
--- a/kde-base/kopete/files/disable-meanwhile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kopete/protocols/configure.in.in	2005-05-23 15:07:47.000000000 +0300
-+++ kopete/protocols/configure.in.in	2005-06-30 21:51:09.000000000 +0300
-@@ -196,7 +196,7 @@
- 	AC_MSG_RESULT([yes])
- 	AC_SUBST(MEANWHILE_INCLUDES)
- 	AC_SUBST(MEANWHILE_LIBS)
--	COMPILE_MEANWHILE=true
-+	COMPILE_MEANWHILE=
- 	AC_SUBST(COMPILE_MEANWHILE)
- ], [
- 	AC_MSG_RESULT([no])
diff --git a/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch b/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch
deleted file mode 100644
index ac786297eb5e..000000000000
--- a/kde-base/kopete/files/kopete-0.12.1-icqfix3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568242)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 568243)
-@@ -239,7 +239,7 @@
- 	const WORD ICQ_MAJOR 			= 0x0014;
- 	const WORD ICQ_MINOR 			= 0x0034;
- 	const WORD ICQ_POINT 			= 0x0000;
--	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const WORD ICQ_BUILD 			= 0x0BB8;
- 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
diff --git a/kde-base/kopete/files/kopete-3.5.3-icqfix.patch b/kde-base/kopete/files/kopete-3.5.3-icqfix.patch
deleted file mode 100644
index 6370565cf64a..000000000000
--- a/kde-base/kopete/files/kopete-3.5.3-icqfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kopete/protocols/oscar/liboscar/oscartypes.h
-===================================================================
---- kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561015)
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	(revision 561016)
-@@ -232,13 +232,13 @@
- 
- 	/* ICQ Version Characteristics */
- 	const unsigned char ICQ_TCP_VERSION 	= 0x0008;
--	const char ICQ_CLIENTSTRING[] 		= "ICQ Inc. - Product of ICQ (TM).2003a.5.45.1.3777.85";
-+	const char ICQ_CLIENTSTRING[] 		= "ICQBasic";
- 	const WORD ICQ_CLIENTID 		= 0x010A;
--	const WORD ICQ_MAJOR 			= 0x0005;
--	const WORD ICQ_MINOR 			= 0x002D;
--	const WORD ICQ_POINT 			= 0x0001;
--	const WORD ICQ_BUILD 			= 0x0EC1;
--	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x00, 0x55 };
-+	const WORD ICQ_MAJOR 			= 0x0014;
-+	const WORD ICQ_MINOR 			= 0x0034;
-+	const WORD ICQ_POINT 			= 0x0000;
-+	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
- 
diff --git a/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch b/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch
deleted file mode 100644
index 7ea35079f58e..000000000000
--- a/kde-base/kopete/files/kopete-3.5.x-oscarcontacts.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=141675
-http://bugs.kde.org/show_bug.cgi?id=104243
-
-Index: kopete/protocols/oscar/liboscar/ssimanager.cpp
-===================================================================
---- kopete/protocols/oscar/liboscar/ssimanager.cpp	(revision 565951)
-+++ kopete/protocols/oscar/liboscar/ssimanager.cpp	(working copy)
-@@ -71,18 +71,65 @@
- 		while ( it != d->SSIList.end() && d->SSIList.count() > 0 )
- 			it = d->SSIList.remove( it );
- 	};
-+	
-+	d->nextContactId = 0;
-+	d->nextGroupId = 0;
- }
- 
- WORD SSIManager::nextContactId()
- {
--	d->nextContactId++;
--	return d->nextContactId;
-+	if ( d->nextContactId == 0 )
-+		d->nextContactId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextContactId < 0x8000; d->nextContactId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).bid() == d->nextContactId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+	
-+		if ( freeId )
-+			return d->nextContactId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::nextGroupId()
- {
--	d->nextGroupId++;
--	return d->nextGroupId;
-+	if ( d->nextGroupId == 0 )
-+		d->nextGroupId++;
-+	
-+	QValueList<Oscar::SSI>::const_iterator it, listEnd;
-+	
-+	for ( ; d->nextGroupId < 0x8000; d->nextGroupId++ )
-+	{
-+		bool freeId = true;
-+		listEnd = d->SSIList.end();
-+		for ( it = d->SSIList.begin(); it != listEnd; ++it )
-+		{
-+			if ( ( *it ).type() == ROSTER_GROUP && ( *it ).gid() == d->nextGroupId )
-+			{
-+				freeId = false;
-+				break;
-+			}
-+		}
-+		
-+		if ( freeId )
-+			return d->nextGroupId;
-+	}
-+	
-+	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No free group id!" << endl;
-+	return 0xFFFF;
- }
- 
- WORD SSIManager::numberOfItems() const
-@@ -379,8 +426,6 @@
- 	if ( !group.name().isEmpty() ) //avoid the group with gid 0 and bid 0
- 	{	// the group is really new
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding group '" << group.name() << "' to SSI list" << endl;
--		if ( group.gid() > d->nextGroupId )
--			d->nextGroupId = group.gid();
- 		
- 		d->SSIList.append( group );
- 		emit groupAdded( group );
-@@ -394,6 +439,10 @@
- 	QString groupName = group.name();
- 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Removing group " << group.name() << endl;
- 	int remcount = d->SSIList.remove( group );
-+	
-+	if ( d->nextGroupId > group.gid() )
-+		d->nextGroupId = group.gid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No groups removed" << endl;
-@@ -420,13 +469,6 @@
- 
- bool SSIManager::newContact( const Oscar::SSI& contact )
- {
--	//what to validate?
--	if ( contact.bid() > d->nextContactId )
--	{
--		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting next contact ID to " << contact.bid() << endl;
--		d->nextContactId = contact.bid();
--	}
--	
- 	if ( d->SSIList.findIndex( contact ) == -1 )
- 	{
- 		kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl;
-@@ -443,6 +485,9 @@
- 	QString contactName = contact.name();
- 	int remcount = d->SSIList.remove( contact );
- 	
-+	if ( d->nextContactId > contact.bid() )
-+		d->nextContactId = contact.bid();
-+	
- 	if ( remcount == 0 )
- 	{
- 		kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "No contacts were removed." << endl;
-@@ -476,6 +521,10 @@
- bool SSIManager::removeItem( const Oscar::SSI& item )
- {
- 	d->SSIList.remove( item );
-+	
-+	if ( d->nextContactId > item.bid() )
-+		d->nextContactId = item.bid();
-+	
- 	return true;
- }
-