Version bump (bug #257644). Thanks to Maciej Mrozowski <reavertm@poczta.fm>.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 255 insertions, 11 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 8d6b1d48ac56..4b05c02a3b67 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/kadu
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.69 2009/02/11 17:04:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.70 2009/03/07 18:26:51 cla Exp $
+
+*kadu-0.6.5.1 (07 Mar 2009)
+
+  07 Mar 2009; Dawid Węgliński <cla@gentoo.org>
+  +files/kadu-0.6.5.1-fix-qt4.5-encoding.patch,
+  +files/libgsm-ugly-code.patch, +kadu-0.6.5.1.ebuild:
+  Version bump (bug #257644). Thanks to Maciej Mrozowski <reavertm@poczta.fm>
+  for working on this bug.
 
   11 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   kadu-0.6.0.2-r1.ebuild:
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 27e693d8ff30..e51ad8682d20 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,6 +1,8 @@
 AUX kadu-0.4.3-tcltk-gcc4.patch 576 RMD160 f37fcaba6dafbc84b7bf9efd03d6708f5305195b SHA1 bc31cd2421e923b1680db7a089b8a1f5ff4032c1 SHA256 8974c9948f39100c97269e57591e0090fa017c485e89abbf5a07ece8b7299d86
 AUX kadu-0.6.0.2-kill-strip.patch 1090 RMD160 8c148f779f448a0700d44b2f51a598bf5ef240df SHA1 8a8268e5c85b91e09f2f2b261b06e14b085ffa73 SHA256 bfcc8ed6e1d2527117bdd8bebc7ea05605953acdf5cfd711bd5009ea5c221778
+AUX kadu-0.6.5.1-fix-qt4.5-encoding.patch 920 RMD160 121164df1698219aaad51eb58b9d9040d80979f7 SHA1 5948d0a37b69e85f2c5998b9e63227e7ab05598a SHA256 14654eaa0ad2f10f646d3a63ee9903fb75192146b5f748ce5d375e560a4f77c3
 AUX kadu-toolbar_toggle-gentoo.diff 5983 RMD160 ea7c587b4c3617c2ebb445dce46d6c275a71c0a9 SHA1 bca7202cdae4eea2d5a1d1df1cffad704cf49711 SHA256 2f39f3871c120c3ef1d720b67bb1c536762b5af1a63cf79282a679a65c63b12a
+AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2
 AUX voice-gentoo.patch 468 RMD160 ca260b532be75ea607807263c2b6c306f6820e8e SHA1 c8d2dff872e6611c48b71b221db2cdc450f2f029 SHA256 970a51aa1c5aa90f6f23c96b8d37255e879ee994fc1551b6e340a649c7bf5bd1
 AUX xosd-0.6.0-gentoo.patch 1506 RMD160 9b5c790159a9813fab8e8877f307bcdfae24a566 SHA1 e3d13f045df4c2fa621689c535c3c96d06e1add8 SHA256 84952020dd0db90169f2d54e23660d027612ed8d0ee5741fbd305a1ebc83ab70
 AUX xosd-gentoo.patch 1148 RMD160 d09f0f8af0701b7c56404f2ed5a744c963aa5a46 SHA1 e7c12fc41559499c8b40aae51fa04c52b5b04c0e SHA256 0d8c8dcc33e913fdf44b33d91854313633dee89eaff192aab107d0559994d7e1
@@ -28,6 +30,7 @@ DIST kadu-0.4.2.tar.bz2 1181463 RMD160 c7e8b1e737be9ec57af93437bf3bae33687d47e8
 DIST kadu-0.4.3.tar.bz2 1181830 RMD160 e7de2e95e72ba9b6235695428daad97f9992b04a SHA1 6236137270dfb7f1b028309cf5e3142f5f15c924 SHA256 3790048e8883533a0bc89119261035759278c6392b4f934c3528b729699ac0ed
 DIST kadu-0.5.0.tar.bz2 1310892 RMD160 c852af54a5c1a75235c8016f7e287e2f0fa0fd5e SHA1 8483d68c954c83baa9c3c73eecb808a20bd90b31 SHA256 32f0e5de02a808b7a1125808d04a980a2a63b484008f4f05891fe0ab6f5771a4
 DIST kadu-0.6.0.2.tar.bz2 1568547 RMD160 2e8952831cada064c1caa65b943b6e44880b39c3 SHA1 efbae7840078eab46c5ac20d6e7397cf1c1457bd SHA256 8e06b554761e39890e48ba723145d4e1e0919cc84fcd978f215a6e2a30f87bfa
+DIST kadu-0.6.5.1.tar.bz2 1341099 RMD160 3c1a8a770d0701e019b5ed68658d20ea6f789e45 SHA1 1257b37c30d9682d4fd350b78d983de04b970872 SHA256 e2df2e1d7c1fa9a5d931a35efeb936088c42ef4b5d42fef8dddadc40f87397e2
 DIST kadu-20060115.tar.bz2 1165323 RMD160 65577a591a785afb9cbbebdb3a3e19a6d871a630 SHA1 1f74a583bb49ecbddd3ec3e64f02535fcfa64627 SHA256 7e6502b196b9c825c6ed0355e254ce83f68bd974ed8d00204036f7ca08674a48
 DIST kadu-20060211.tar.bz2 1169149 RMD160 43e0917046bf06db3094d5434f374b3df73bd85c SHA1 8b87ab654614639a1740340702b32acac9cf29b6 SHA256 2550fe63c9d644dc089e09a0d7fc2e63ba56cb24b95aa869adae68bd306390ef
 DIST kadu-antistring-0.2.tar.bz2 4753 RMD160 3afdf6d2d94dd5c2dad49f62cda6ade87ce5d5ec SHA1 30d7d7ebe75450b91a3cc261504dd1c8297321b0 SHA256 f7e0e5a3d87bf3cbdea56694c547760601778ba5bb1a789dd62a2045537811d0
@@ -108,5 +111,6 @@ EBUILD kadu-0.5.0.ebuild 8522 RMD160 5bb0760c08d36f76e4ad6d9d5a193f0317028ee6 SH
 EBUILD kadu-0.5.0_pre20060115.ebuild 6941 RMD160 3df80e1ecc3250d332754894e93c23f22f5c25c5 SHA1 bbc8bfa6b3fb55b7ec62357fc90da1a2d04ce5a5 SHA256 7ef471a5c405e1af693507f2d85bd52db35d101e0f6e12539758c38f8f7825ef
 EBUILD kadu-0.5.0_pre20060211.ebuild 7157 RMD160 6aca08d737d218aae45a49bfacd744afe3a4d633 SHA1 19e7b049a4af4fb73ff010c16b2b55346281b4f3 SHA256 62835cfa2750188eaf78ccbf9a670e115407129b75f124ce41eeb90dc6e456e0
 EBUILD kadu-0.6.0.2-r1.ebuild 6138 RMD160 140ffcb8fa2a60dd3230a9583da0bcf6a2c7702d SHA1 fbe8b0df3bdfbced6da3f2365987e48fa79cc515 SHA256 e95dbd63aeef263a1a93befbfb330c4813d8eb61c9fe842d65abba23e7ffc0dd
-MISC ChangeLog 9997 RMD160 a5a7fd08b92ffbc482f8a869235590f4e81867a5 SHA1 491e6b591d05f47d25a8d9367bdf9ed9c6bb4b35 SHA256 3e66253eeb57abd7d8e761c6582f74f27403080c06c96c25fb29803fa311bddc
-MISC metadata.xml 755 RMD160 0d6aa7fc3b893677d847ebe11e6e1f30959dcd71 SHA1 d6efb396436bd3e324ad2c6146162a9e900258dc SHA256 a3046e39da0d9caa2234535ed3b70fe74751463ec477c3cd9d7e156ab209db85
+EBUILD kadu-0.6.5.1.ebuild 5107 RMD160 4b7181c2c1dd1ad00b2676c4ad819eb7d6fb82e2 SHA1 c4583325849af2e0b81e70c8976548c65e6e14f0 SHA256 92fdeb103044b38f9d02179bb50680fcff64f99e60049cf6ce7961e040b8468b
+MISC ChangeLog 10278 RMD160 af6d1ba5c16a04bfcd77e198ed5da15e58b6e31a SHA1 3381fd7e591ed5997895484b8bdf44e23ba3878b SHA256 b8366fc7c862ff01e7fb270a5b820d8daf95d26881aec72e44b98e64c4533bd5
+MISC metadata.xml 1389 RMD160 53bd9c055e9edfa664ee6d54a03032ced7c5d3f3 SHA1 a506f060496576901515ad3aff5409b035ac2ad2 SHA256 461470c4d9d8233508ff44f6e55065f81f5cc2074546cbb5a47776759d1b6146
diff --git a/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch b/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch
new file mode 100644
index 000000000000..d3113a0779a0
--- /dev/null
+++ b/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch
@@ -0,0 +1,33 @@
+--- branches/0.6.5/kadu-core/main.cpp	2009/01/04 13:18:33	6032
++++ branches/0.6.5/kadu-core/main.cpp	2009/02/22 10:45:49	6261
+@@ -153,6 +153,11 @@
+ 	}
+ 
+ #endif
++
++	kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n");
++	new KaduApplication(argc, argv);
++	kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n");
++
+ 	debug_mask = -1;
+ 	qInstallMsgHandler(kaduQtMessageHandler);
+ 	xml_config_file = new XmlConfigFile();
+@@ -199,7 +204,6 @@
+ 		if (freopen(path, "w+", stderr) == 0)
+ 			fprintf(stdout, "freopen: %s\n", strerror(errno));
+ #endif
+-
+ 	}
+ 
+ #ifdef DEBUG_ENABLED
+@@ -227,10 +231,6 @@
+ 		exit(10);
+ 	}
+ 
+-	kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n");
+-	new KaduApplication(argc, argv);
+-	kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n");
+-
+ 	defaultFont = new QFont(qApp->font());
+ 	defaultFontInfo = new QFontInfo(*defaultFont);
+ 	// loading translation
diff --git a/net-im/kadu/files/libgsm-ugly-code.patch b/net-im/kadu/files/libgsm-ugly-code.patch
new file mode 100644
index 000000000000..3db964e3851c
--- /dev/null
+++ b/net-im/kadu/files/libgsm-ugly-code.patch
@@ -0,0 +1,11 @@
+--- kadu/modules/voice/libgsm/src/code.c	2008-10-11 21:06:32.061000000 +0200
++++ kadu/modules/voice/libgsm/src/code.c	2008-10-11 21:07:24.673000000 +0200
+@@ -16,6 +16,8 @@
+ 	extern char	* memcpy P((char *, char *, int));
+ #endif
+ 
++#include	<string.h>
++
+ #include	"private.h"
+ #include	"gsm.h"
+ #include	"proto.h"
diff --git a/net-im/kadu/kadu-0.6.5.1.ebuild b/net-im/kadu/kadu-0.6.5.1.ebuild
new file mode 100644
index 000000000000..92c32accef49
--- /dev/null
+++ b/net-im/kadu/kadu-0.6.5.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.1.ebuild,v 1.1 2009/03/07 18:26:51 cla Exp $
+
+inherit cmake-utils eutils flag-o-matic
+
+EAPI="2"
+
+DESCRIPTION="QT client for popular in Poland Gadu-Gadu instant messaging network"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://www.kadu.net/download/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc"
+SLOT="0"
+IUSE="alsa amarok amarok2 ao audacious bmpx config_wizard dragonplayer oss sms spell +ssl vlc voice"
+
+COMMON_DEPEND="
+	>=media-libs/libsndfile-1.0
+	>=net-libs/libgadu-1.8[threads]
+	>=x11-libs/qt-dbus-4.4:4
+	>=x11-libs/qt-gui-4.4:4
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	spell? ( app-text/aspell )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmake-2.6
+"
+RDEPEND="${COMMON_DEPEND}
+	amarok? ( media-sound/amarok:0 )
+	amarok2? ( media-sound/amarok:2 )
+	audacious? ( media-sound/audacious )
+	bmpx? ( media-sound/bmpx )
+	dragonplayer? ( kde-base/dragonplayer )
+	vlc? ( media-video/vlc )
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/libgsm-ugly-code.patch"
+	"${FILESDIR}/${P}-fix-qt4.5-encoding.patch"
+)
+
+# set given .config variable to =m or =y
+# args: <variable> <m/y>
+config_enable() {
+	sed -i -e "s/^\(${1}=\)./\1${2}/" .config || die "config_enable failed"
+}
+
+src_prepare() {
+	# Autopatcher
+	base_src_prepare
+
+	# Multilib
+	sed -i -e 's|${CMAKE_INSTALL_PREFIX}/lib|${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}|' \
+		CMakeLists.txt || die "failed to apply multilib installation patch"
+	find modules -name CMakeLists.txt \
+		-exec sed -i -e 's|lib/kadu/modules|lib${LIB_SUFFIX}/kadu/modules|' {} + \
+		|| die "failed to fix multilib paths for modules"
+
+	# Create .config file with all variables defaulted to =n
+	sed -i -n -e "s/=\(m\|y\)/=n/" -e "/^[a-z]/p" .config \
+		|| die ".config creation failed"
+
+	# Common modules
+	config_enable module_gadu_protocol y
+	config_enable module_account_management m
+	config_enable module_advanced_userlist m
+	config_enable module_antistring m
+	config_enable module_auto_hide m
+	config_enable module_autoaway m
+	config_enable module_autoresponder m
+	config_enable module_autostatus m
+	config_enable module_cenzor m
+	config_enable module_dcc m
+	config_enable module_desktop_docking m
+	config_enable module_docking m
+	config_enable module_echo m
+	config_enable module_exec_notify m
+	config_enable module_ext_sound m
+	config_enable module_filedesc m
+	config_enable module_filtering m
+	config_enable module_firewall m
+	config_enable module_hints m
+	config_enable module_history m
+	config_enable module_last_seen m
+	config_enable module_notify m
+	config_enable module_parser_extender m
+	config_enable module_pcspeaker m
+	config_enable module_qt4_docking m
+	config_enable module_qt4_sound m
+	config_enable module_screenshot m
+	config_enable module_sound m
+	config_enable module_window_notify m
+	config_enable module_word_fix m
+
+	# Media players
+	if use amarok || use amarok2 || use audacious || use bmpx || use dragonplayer || use vlc; then
+		config_enable module_mediaplayer m
+		use amarok && config_enable amarok1_mediaplayer m
+		use amarok2 && config_enable amarok2_mediaplayer m
+		use audacious && config_enable audacious_mediaplayer m
+		use bmpx && config_enable bmpx_mediaplayer m
+		use dragonplayer && config_enable dragon_mediaplayer m
+		# falf_mediaplayer
+		# itunes_mediaplayer
+		use vlc && config_enable vlc_mediaplayer m
+		# xmms2_mediaplayer
+		# xmms_mediaplayer
+	fi
+
+	# Audio outputs
+	use alsa && config_enable module_alsa_sound m
+	use ao && config_enable module_ao_sound m
+	use oss && config_enable modules_dsp_sound m
+
+	# Misc stuff
+	use config_wizard && config_enable module_config_wizard m
+	use spell && config_enable module_spellchecker m
+	use ssl && config_enable module_encryption m
+	use voice && config_enable module_voice m
+
+	# SMS related modules
+	if use sms; then
+		config_enable module_default_sms m
+		config_enable module_sms m
+	fi
+
+	# Icons
+	config_enable icons_default y
+	# Uncomment when available
+	# config_enable icons_glass16 y
+	# config_enable icons_glass22 y
+	# config_enable icons_kadu05 y
+	# config_enable icons_oxygen16 y
+	# config_enable icons_tango16 y
+
+	# Emoticons
+	config_enable emoticons_penguins y
+	# Uncomment when available
+	# config_enable emoticons_gg6_compatible y
+	# config_enable emoticons_tango y
+
+	# Sound themes
+	config_enable sound_default y
+	# Uncomment when available
+	# config_enable sound_bns y
+	# config_enable sound_drums y
+	# config_enable sound_florkus y
+	# config_enable sound_michalsrodek y
+	# config_enable sound_percussion y
+	# config_enable sound_ultr y
+}
+
+src_configure() {
+	# Filter out dangerous flags
+	filter-flags -fno-rtti
+	strip-unsupported-flags
+
+	# Ensure -DQT_NO_DEBUG is added
+	append-cppflags -DQT_NO_DEBUG
+
+	# Configure package
+	mycmakeargs="${mycmakeargs}
+		-D BUILD_DESCRIPTION:STRING=Gentoo Linux
+		-D ENABLE_AUTDOWNLOAD:BOOL=NO"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# delete unneeded .a files from modules directory
+	rm -f "${D}"/usr/lib/kadu/modules/*.a
+}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
index cb3e1c6bdccb..734f3d62922d 100644
--- a/net-im/kadu/metadata.xml
+++ b/net-im/kadu/metadata.xml
@@ -6,14 +6,24 @@
 		<email>cla@gentoo.org</email>
 		<name>Dawid Węgliński</name>
 	</maintainer>
+	<maintainer>
+		<email>reavertm@poczta.fm</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
 	<use>
-		<flag name='amarok'>Enables amarok support in kadu</flag>
-		<flag name='config_wizard'>Enables configuration wizard module</flag>
-		<flag name='extraicons'>Enables extra icon set</flag>
-		<flag name='extramodules'>Enables extra module in kadu</flag>
-		<flag name='mail'>Enables mail module in kadu</flag>
-		<flag name='powerkadu'>Installs extra powerkadu modules</flag>
-		<flag name='speech'>Enables speech module in kadu</flag>
-		<flag name='voice'>Enables voice chat in kadu</flag>
+		<flag name="amarok">Enables <pkg>media-sound/amarok:0</pkg> (amarok1) media player support</flag>
+		<flag name="amarok2">Enables <pkg>media-sound/amarok:2</pkg> (amarok2) media player support</flag>
+		<flag name="audacious">Enables <pkg>media-sound/audacious</pkg> media player support</flag>
+		<flag name="bmpx">Enables <pkg>media-sound/bmpx</pkg> media player support</flag>
+		<flag name="dragonplayer">Enables <pkg>kde-base/dragonplayer</pkg> KDE4 media player support</flag>
+		<flag name="config_wizard">Enables configuration wizard module</flag>
+		<flag name="extraicons">Enables extra icon set</flag>
+		<flag name="extramodules">Enables building of extra modules</flag>
+		<flag name="mail">Enables mail module</flag>
+		<flag name="powerkadu">Installs extra powerkadu modules</flag>
+		<flag name="sms">Enables SMS sending plugin</flag>
+		<flag name="speech">Enables speech module</flag>
+		<flag name="vlc">Enables <pkg>media-video/vlc</pkg> media player support</flag>
+		<flag name="voice">Enables voice chat</flag>
 	</use>
 </pkgmetadata>