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

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 249 insertions, 9 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/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>