Added upstream patch to fix ICQ server name (bug 346119). Version bump straight to stable.

Package-Manager: portage-2.1.9.25/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 293 insertions, 22 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index cc7b3df62161..63fd44f0cdc1 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.269 2010/12/02 21:17:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.270 2010/12/14 22:32:50 dilfridge Exp $
+
+*kopete-4.4.5-r2 (14 Dec 2010)
+
+  14 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kopete-4.4.5-r2.ebuild, +files/kopete-4.4.5-server.patch:
+  Added upstream patch to fix ICQ server name (bug 346119). Version bump
+  straight to stable.
 
 *kopete-4.5.4 (02 Dec 2010)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 4cef2c4781d4..def89a93709c 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX kopete-4.4.5-openssl-1.patch 897 RMD160 642c8b094d4d293f4fbcd450e952f7f798f4a079 SHA1 d34e0cfd776b032602e3aebfa683c85a8f9d6245 SHA256 c348a07e605e9cbab069779c4bfcd82772515ea4a563854ed5ca6933cd43dacd
+AUX kopete-4.4.5-server.patch 4139 RMD160 816420181a54fd876c0c8262eb00fb4b14db5a3f SHA1 40f12c9af312c48fc6f6ff45539f705227470ca3 SHA256 d7ae886a70b9ce4bdc807ebde2d50906c9fdecbcc06b998348ec98e7bc72d6c5
 DIST kdenetwork-4.4.5.tar.bz2 8324754 RMD160 5cf43ba3e1b772a0fe1306f9553d5ad9cfa40a8b SHA1 5f321ce932d6b1fadf1935e527bd1848c317be7a SHA256 ca9ff22ce3fb44f4025fe864a4be8524efb252e817bd24e93e9c0dc6ea2ceee6
 DIST kdenetwork-4.5.3.tar.bz2 8151284 RMD160 0bbbbbbf5bae1d1067062cfb24b9866d304784a2 SHA1 8d9c4f674bb0811977c04121305287f0acbece20 SHA256 e5866aa5bb0fb734f830d0a70a25949f8e3c9ed7753492f68ee82cb46a0a2e66
 DIST kdenetwork-4.5.4.tar.bz2 8150653 RMD160 4ffc9e7c457b132692ad5736ae8815210b87c3b5 SHA1 95a69183912fe9f29a2e877c0655050d4a7252d1 SHA256 3c18d9afe0e521784dd8f22590da39c77b892cd29554a9d5fe56c01e45f210bc
 EBUILD kopete-4.4.5-r1.ebuild 4241 RMD160 92b1d6d80be1a54b119b7099af9693f46c7ea13a SHA1 477697ae9c810b87aa4ba9c1e5e3c4ff8aaa2b58 SHA256 c0c592bc031dc9a7b11af534f16ee5388e0ecbc86b8abfa3b62d97796b33f2ca
+EBUILD kopete-4.4.5-r2.ebuild 4274 RMD160 c81d28a78d1a62b53d56a3bc552a60c4542de81e SHA1 0b4ac070aa1dd875248332eb5a8ae43890c83112 SHA256 62eac7dfe78bbd5a4a11b5cb586e68af5f19655f6d910a8110547eaf16f74809
 EBUILD kopete-4.5.3.ebuild 4098 RMD160 c95f8d6ab160ca06dce548d2dd398bc297ba86c6 SHA1 34db8a62e122f309d1093499fecb1582a5fbab5a SHA256 6346cdf463a093d14209d6a4285e12cdd6d6654bd516a8358b9e6c167faf76c4
 EBUILD kopete-4.5.4.ebuild 4095 RMD160 fcd989a1c1d5df3a14524c806cfc1280ab3efdad SHA1 dfec3b2ed56c8a2bf3925711f116ee8cda7dcaa8 SHA256 d7b544116ad645baebae2b76eb953d0a4c0a8e8fe760664c206a253fe27ce7c2
-MISC ChangeLog 39924 RMD160 6485f9de99ab04d8c32040da7a93d39e52aa932d SHA1 1e012bf1d73d74e291c03fea1119062245ac4016 SHA256 359ce3ef3ec644d29a1bd8a06277c23c3acfeef02e71331838042de8f494efc4
+MISC ChangeLog 40173 RMD160 a5a4d78f087442e1e923124a1825c42f6f147939 SHA1 7ed78c5fc7378a06d2a09fdd5b13be6a618d66b0 SHA256 a2c7d4a96bbcb83fad82106d5ae71ad85e8692a0f8c47a411efa61c12e171112
 MISC metadata.xml 2601 RMD160 e4f2661528eb21166a330857bbe160c2320c4929 SHA1 e64643f73ba7352d45ee4d766f667a6ecd6689f5 SHA256 0cd8f8b0e27e043d3856935ca8960e99b27831c0a78bd002b1d621be6dac19e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJM+A1lAAoJEOf+E+/4L5LmOcUP/jTJhT6VbOyoi7Vzx2DhsE22
-bW37PlQ26oF5B9J+8kq7KceNRSSTVvSJPV1TWna0imNsb9Ov76VUOii2G1broewm
-U6ssmmDar1riNhMXsyvyGDpJXZ2KV2pRt4teW3ow14SyD//1+orvFwRDjVqi2ANZ
-r1st2UJBMLrjCN29HPld9n2XHYQ2OVqM681AoA1HlD5vo02AxJ9UCurfOqDBnrJt
-7IW1Z+yx+mkw+X/isHk4SVS8SurCYHh5rXIbtWNbSwIARfc10f7XT5ykJMxHbr6H
-FsGHogVBuMLskdGcX1Ap9Z9iHEX6CG+dxqD6iSxrMN5csNSIKtiVwCXD6ArfJEWu
-0IRGYP+2D9zTW8QcNt0pdKAkt2j+USiNQa/5TH9NRyAatnjI8tgHSaSoGoAAALEV
-pV+CmJkZl/JRJ24R+maMipW+Y0dM7Mhb3fBXOlhHed4QXadsiCSL8aCEfVT36/vx
-PjkyhigP7Zy/uG3WijaLU66zFMJOQaSCmYhwco8yFBmWBpEK+X1XhZePttEan3sr
-6StooNqbLktJ06ogovp36nxRSSaHpxcfaLo7NraWoPvP72BACBgJnRvkVWVCy8q3
-Y/VYhhfoQ+hLK7J7y8qXN+uiKiZBuudVqBivQKVSN2Mp5P43lSOYp/wa/Y2uoUcQ
-XyUen953lEgLiBKHZc3a
-=JAhq
------END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-4.4.5-server.patch b/kde-base/kopete/files/kopete-4.4.5-server.patch
new file mode 100644
index 000000000000..4eec67f78630
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.4.5-server.patch
@@ -0,0 +1,121 @@
+Index: kopete/protocols/oscar/icq/icqaccount.cpp
+===================================================================
+--- kopete/protocols/oscar/icq/icqaccount.cpp	(Revision 1197798)
++++ kopete/protocols/oscar/icq/icqaccount.cpp	(Revision 1197799)
+@@ -136,7 +136,7 @@
+ 	// Create actions
+ 	mEditInfoAction = new KAction( KIcon("user-properties"), i18n( "Edit User Info..." ), this );
+ 	QObject::connect( mEditInfoAction, SIGNAL(triggered(bool)), this, SLOT(slotUserInfo()) );
+-	
++
+ 	mActionInvisible = new KToggleAction( i18n( "In&visible" ), this );
+ 	QObject::connect( mActionInvisible, SIGNAL(triggered(bool)), this, SLOT(slotToggleInvisible()) );
+ 
+@@ -188,7 +188,7 @@
+ 	*/
+ 
+ 	KActionMenu *xtrazStatusMenu = new KActionMenu( i18n( "Set Xtraz Status" ), actionMenu );
+-	
++
+ 	KAction* xtrazStatusSetAction = new KAction( i18n( "Set Status..." ), xtrazStatusMenu );
+ 	QObject::connect( xtrazStatusSetAction, SIGNAL(triggered(bool)), this, SLOT(setXtrazStatus()) );
+ 	xtrazStatusMenu->addAction( xtrazStatusSetAction );
+@@ -236,7 +236,7 @@
+ 		myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() );
+ 		QString icqNumber = accountId();
+ 		kDebug(14153) << "Logging in as " << icqNumber;
+-		QString server = configGroup()->readEntry( "Server", QString::fromLatin1( "login.oscar.aol.com" ) );
++		QString server = configGroup()->readEntry( "Server", QString::fromLatin1( "login.icq.com" ) );
+ 		uint port = configGroup()->readEntry( "Port", 5190 );
+ 
+ 		//set up the settings for the account
+Index: kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+===================================================================
+--- kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp	(Revision 1197798)
++++ kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp	(Revision 1197799)
+@@ -65,7 +65,7 @@
+ 
+ 	mProtocol->fillComboFromTable( mAccountSettings->encodingCombo, mProtocol->encodings() );
+ 
+-	//Setup the edtAccountId 
++	//Setup the edtAccountId
+ 	QRegExp rx("[0-9]{9}");
+ 	QValidator* validator = new QRegExpValidator( rx, this );
+ 	mAccountSettings->edtAccountId->setValidator(validator);
+@@ -80,9 +80,9 @@
+ 		mAccountSettings->mPasswordWidget->load(&mAccount->password());
+ 		mAccountSettings->chkAutoLogin->setChecked(mAccount->excludeConnect());
+ 
+-		QString serverEntry = mAccount->configGroup()->readEntry("Server", "login.oscar.aol.com");
++		QString serverEntry = mAccount->configGroup()->readEntry("Server", "login.icq.com");
+ 		int portEntry = mAccount->configGroup()->readEntry("Port", 5190);
+-		if ( serverEntry != "login.oscar.aol.com" || ( portEntry != 5190) )
++		if ( serverEntry != "login.icq.com" || ( portEntry != 5190) )
+ 			mAccountSettings->optionOverrideServer->setChecked( true );
+ 
+ 		mAccountSettings->edtServerAddress->setText( serverEntry );
+@@ -174,7 +174,7 @@
+ 			default:
+ 				encodingId=4;
+ 		}
+-		
++
+ 		mProtocol->setComboFromTable( mAccountSettings->encodingCombo,
+ 		                              mProtocol->encodings(),
+ 		                              encodingId );
+@@ -203,13 +203,13 @@
+ {
+ 	if ( m_visibleEngine )
+ 		delete m_visibleEngine;
+-	
++
+ 	if ( m_invisibleEngine )
+ 		delete m_invisibleEngine;
+-	
++
+ 	if ( m_ignoreEngine )
+ 		delete m_ignoreEngine;
+-	
++
+ 	delete mAccountSettings;
+ }
+ 
+@@ -254,7 +254,7 @@
+ 	}
+ 	else
+ 	{
+-		mAccount->setServerAddress("login.oscar.aol.com");
++		mAccount->setServerAddress("login.icq.com");
+ 		mAccount->setServerPort(5190);
+ 	}
+ 
+@@ -279,17 +279,17 @@
+ 	{
+ 		if ( m_visibleEngine )
+ 			m_visibleEngine->storeChanges();
+-		
++
+ 		if ( m_invisibleEngine )
+ 			m_invisibleEngine->storeChanges();
+-		
++
+ 		if ( m_ignoreEngine )
+ 			m_ignoreEngine->storeChanges();
+ 
+ 		//Update Oscar settings
+ 		static_cast<ICQMyselfContact*>( mAccount->myself() )->fetchShortInfo();
+ 	}
+-	
++
+ 	return mAccount;
+ }
+ 
+@@ -299,7 +299,7 @@
+ 	bool bOk;
+ 	QString userId = mAccountSettings->edtAccountId->text();
+ 	qulonglong uid = userId.toULongLong( &bOk );
+-	
++
+ 	if( !bOk || uid == 0 || userId.isEmpty() )
+ 	{	KMessageBox::queuedMessageBox(this, KMessageBox::Sorry,
+ 	 	                              i18n("<qt>You must enter a valid ICQ No.</qt>"), i18n("ICQ"));
diff --git a/kde-base/kopete/kopete-4.4.5-r2.ebuild b/kde-base/kopete/kopete-4.4.5-r2.ebuild
new file mode 100644
index 000000000000..ea7e5f2669e1
--- /dev/null
+++ b/kde-base/kopete/kopete-4.4.5-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.5-r2.ebuild,v 1.1 2010/12/14 22:32:50 dilfridge Exp $
+
+EAPI="3"
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook ssl v4l2"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: NO DEPS
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
+sms testbed winpopup yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jabber? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
+	v4l2? ( media-libs/libv4l )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		media-gfx/imagemagick
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-openssl-1.patch"
+	"${FILESDIR}/${P}-server.patch" )
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+	sed -e '/set (LIBV4L2_REQUIRED TRUE)/s/TRUE/FALSE/' \
+		-i kopete/CMakeLists.txt || die 'failed to make v4l2 optional'
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_with v4l2 LibV4L2)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=wlm ;;
+			zeroconf) x2=bonjour ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use jabber || use msn; then # || use irc; then
+			echo
+			#elog "In order to use ssl in jabber, msn and irc you'll need to"
+			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}