Version bump, revrite ebuild, remove some old modules which don't work with this version. Thanks to mkay for helping. Bug #207216

Package-Manager: portage-2.1.3.19

5 files changed, 186 insertions, 2 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index abde9a6b1832..0fcdd98510f6 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/kadu
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.58 2008/01/18 09:17:32 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.59 2008/02/13 01:43:35 cla Exp $
+
+*kadu-0.6.0_rc2 (13 Feb 2008)
+
+  13 Feb 2008; Dawid Węgliński <cla@gentoo.org>
+  +files/xosd-0.6.0-gentoo.patch, +files/voice-gentoo.patch,
+  +kadu-0.6.0_rc2.ebuild:
+  Version bump, revrite ebuild, remove some old modules which don't work with
+  this version. Bug #207216
 
   18 Jan 2008; Dawid Węgliński <cla@gentoo.org> metadata.xml:
   Add myself to metadata.xml
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 57d6c33d3b1d..30b3adda6b3c 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,5 +1,7 @@
 AUX kadu-0.4.3-tcltk-gcc4.patch 576 RMD160 f37fcaba6dafbc84b7bf9efd03d6708f5305195b SHA1 bc31cd2421e923b1680db7a089b8a1f5ff4032c1 SHA256 8974c9948f39100c97269e57591e0090fa017c485e89abbf5a07ece8b7299d86
 AUX kadu-toolbar_toggle-gentoo.diff 5983 RMD160 ea7c587b4c3617c2ebb445dce46d6c275a71c0a9 SHA1 bca7202cdae4eea2d5a1d1df1cffad704cf49711 SHA256 2f39f3871c120c3ef1d720b67bb1c536762b5af1a63cf79282a679a65c63b12a
+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
 DIST KaduChess-0.3-Calista.tar.bz2 24892 RMD160 8cd3c5f597cdbf91fb635da9f6520dee84b972e4 SHA1 fcb7c3c08f2fd27d7a7d2426a7192bb477af3f81 SHA256 c68ecf9a9b35de68d620481841c86f12f4b1a6ad73aa8df0393229687a10f28f
 DIST amarok-1.13.tar.gz 9201 RMD160 7061d5e8659cb19005becd4e7e99265e9bd340ea SHA1 b7d5fbf6110a4f9a3bc6c1958c16410af54e7420 SHA256 74eedf534c7021bba94c905cdecf6025c3215f7dbd178219c0e1d360779a69a2
@@ -21,6 +23,7 @@ DIST kadu-0.4.1.tar.bz2 1218351 RMD160 aab9004b0b830a14a7a13168217040d7bf68a656
 DIST kadu-0.4.2.tar.bz2 1181463 RMD160 c7e8b1e737be9ec57af93437bf3bae33687d47e8 SHA1 1398b22e585b36c3b0e66d30f1e80f210ed29e11 SHA256 2484a665bf51ca096a1f0e8da21a19738b434fdfee7475c054e2d779b6cc3e07
 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-rc2.tar.bz2 1581480 RMD160 087ee736fb0f18bd40d796958ce84e025fbfd035 SHA1 2bb1ee4cd1c0c193361ee6afddbc068b08f0ab69 SHA256 6d02c09b831ff28caae1ed449f4b8db3e42c77ec93801f76d9ae2677edf7ac58
 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-emots-tex.tar.gz 68117 RMD160 a3009daaedbf2ff2ee2e7691c549153547498e3d SHA1 e0d4010b79e61ac4cf02b85fcbf2379ae7dca0b5 SHA256 3afc6b7da6961eecf294206019d7f2a4e8c97e2f962f7c4f05e8850ccae7a88a
@@ -84,5 +87,6 @@ EBUILD kadu-0.4.3.ebuild 8586 RMD160 0c10a2dbee800eef13912b53beb0cd7888a0e023 SH
 EBUILD kadu-0.5.0.ebuild 8522 RMD160 5bb0760c08d36f76e4ad6d9d5a193f0317028ee6 SHA1 8e26e84ea9e9743f69f5dde6101ffabfae2b3f21 SHA256 3a92c5872310a74b098db573b8282324d2e18e25e68266c439d241bca41a5949
 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
-MISC ChangeLog 8239 RMD160 4e94ab1c634865c2dace1cb399885ccbdffc79b5 SHA1 7fbe62bc9e72c147bd783f338cf13741dd3c8134 SHA256 77d47eed4eda42c6876f2f54cdf7f496299b27cc2b771902d117714b1a6de404
+EBUILD kadu-0.6.0_rc2.ebuild 3759 RMD160 d5e1745854fc1173d83d8b9f83a38bc12310f873 SHA1 8fef3a41c009d8b28d784f604bcd28f48fb8c072 SHA256 0b72069a3f8a0c01d85d07c82dc0c8d9b52d39040d269aac953fda27570278bc
+MISC ChangeLog 8514 RMD160 bf6d71fb6db03f77fd3a1377fa2b0c7c84df6197 SHA1 3d95722bc13f8ce2a39ba7c163d473b2a18c0427 SHA256 29398b6a87a0b8f15c4574a4348719ed2800b1343cd93c67805066a3dd362308
 MISC metadata.xml 252 RMD160 c36e4638d1c333d2436dd6c781202dce9a759893 SHA1 6f5bd5a9283d0ca68332c07b5ced59df261ae2c5 SHA256 6182ee33f948944d305c3a9a1b1bea349cbc8915baa1ada826442f79cfe41303
diff --git a/net-im/kadu/files/voice-gentoo.patch b/net-im/kadu/files/voice-gentoo.patch
new file mode 100644
index 000000000000..536364f4f0cc
--- /dev/null
+++ b/net-im/kadu/files/voice-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur kadu.orig/modules/voice/libgsm/src/code.c kadu/modules/voice/libgsm/src/code.c
+--- kadu.orig/modules/voice/libgsm/src/code.c	2008-02-12 11:19:33.000000000 +0000
++++ kadu/modules/voice/libgsm/src/code.c	2008-02-12 11:20:47.000000000 +0000
+@@ -7,7 +7,7 @@
+ /* $Header: /var/cvsroot/gentoo-x86/net-im/kadu/files/voice-gentoo.patch,v 1.1 2008/02/13 01:43:35 cla Exp $ */
+ 
+ #include	"config.h"
+-
++#include	<string.h>
+ 
+ #ifdef	HAS_STDLIB_H
+ #include	<stdlib.h>
diff --git a/net-im/kadu/files/xosd-0.6.0-gentoo.patch b/net-im/kadu/files/xosd-0.6.0-gentoo.patch
new file mode 100644
index 000000000000..274bccdfd6ec
--- /dev/null
+++ b/net-im/kadu/files/xosd-0.6.0-gentoo.patch
@@ -0,0 +1,27 @@
+diff -Naur kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in kadu/modules/xosd_notify/gtkfontdialog/Makefile.in
+--- kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in	2008-02-12 10:58:41.000000000 +0000
++++ kadu/modules/xosd_notify/gtkfontdialog/Makefile.in	2008-02-12 11:01:58.000000000 +0000
+@@ -1,5 +1,5 @@
+-CFLAGS:=$(CFLAGS) `gtk-config --cflags`
+-LDFLAGS:=$(LDFLAGS) `gtk-config --libs`
++CFLAGS:=$(CFLAGS) `pkg-config gtk+-2.0 --cflags`
++LDFLAGS:=$(LDFLAGS) `pkg-config gtk+-2.0 --libs`
+ 
+ all: gtkfontdialog
+ 	ln -f gtkfontdialog ../bin/
+diff -Naur kadu.orig/modules/xosd_notify/spec kadu/modules/xosd_notify/spec
+--- kadu.orig/modules/xosd_notify/spec	2008-02-12 10:58:41.000000000 +0000
++++ kadu/modules/xosd_notify/spec	2008-02-12 11:00:35.000000000 +0000
+@@ -8,10 +8,10 @@
+ MODULE_LDFLAGS="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
+ 
+ MODULE_3RDPARTY="gtkfontdialog"
+-MODULE_TOOLS="gtk-config"
++MODULE_TOOLS="pkg-config"
+ MODULE_CONFIGURE_CMD='
+ TOOL_DIRS2=`echo $TOOL_DIRS | sed -e "s/\//\\\\\\\\\//g"`
+-sed -e "s/gtk-config/$TOOL_DIRS2\/gtk-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile
++sed -e "s/pkg-config/$TOOL_DIRS2\/pkg-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile
+ 
+ echo -e "#include <xosd.h>\nint main(){xosd_create(1);return 0;}\n" > xosdtest.c
+ ret=`$CC $CXXFLAGS $MODULE_CXXFLAGS xosdtest.c $LDFLAGS $MODULE_LDFLAGS -o xosdtest 2>/dev/null >/dev/null && echo 1`
diff --git a/net-im/kadu/kadu-0.6.0_rc2.ebuild b/net-im/kadu/kadu-0.6.0_rc2.ebuild
new file mode 100644
index 000000000000..b56e71d4bfd7
--- /dev/null
+++ b/net-im/kadu/kadu-0.6.0_rc2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.0_rc2.ebuild,v 1.1 2008/02/13 01:43:35 cla Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=${P/_/-}
+MY_PV=${PV/_rc*/}
+
+AGENT="0.4.3"				#http://www.kadu.net/w/Agent
+TABS="1.1.1"				#http://www.kadu.net/w/Tabs
+SPELLCHECKER="0.21"			#http://scripts.one.pl/spellchecker
+LED_NOTIFY="0.13"			#http://http://www.kadu.net/~blysk/
+PROFILES="0.3.1"			#http://www.kadu.net/forum/viewtopic.php?t=6282
+
+DESCRIPTION="QT client for popular in Poland Gadu-Gadu IM network"
+HOMEPAGE="http://kadu.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="X debug alsa arts esd voice speech nas oss ssl xosd mail kdeenablefinal"
+
+DEPEND="=x11-libs/qt-3*
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	ssl? ( dev-libs/openssl )
+	speech? ( app-accessibility/powiedz )
+	xosd? ( x11-libs/xosd )"
+
+SRC_URI="http://www.kadu.net/download/stable/${MY_P}.tar.bz2"
+
+# Those need more work
+#	 extraicons? (
+#		http://banas.ovh.org/wp-content/uploads/2008/01/kadu-themes_0.6.0rc1-1_all.deb
+#		)
+#
+#	extramodules? (
+#		http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
+#		http://www.kadu.net/~joi/kde_transparency.tar.bz2
+#		http://www.kadu.net/~dorr/kadu-profiles-${PROFILES}.tar.bz2
+#		http://kadu.net/~arvenil/tabs/download/${MY_PV}/${TABS}/kadu-tabs-${TABS}.tar.bz2
+#		http://misiek.jah.pl/assets/2007/12/27/agent-${AGENT}.tar.gz )"
+
+S="${WORKDIR}"/${PN}
+
+module_config() {
+	sed -i -r "s/(^module_${1}\\s*=\\s*).*/\\1${2}/" .config
+}
+
+spec_config() {
+	sed -i -r "s/(^${2}\\s*=\\s*).*//" modules/${1}/spec
+	echo "${2}=${3}" >> modules/${1}/spec
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Disabling autodownload for modules and icons
+	rm -f "${WORKDIR}"/kadu/modules/*.web
+	rm -f "${WORKDIR}"/kadu/varia/themes/icons/*.web
+
+	# Disabling all modules and iconsets for further activation via USE flags
+	sed .config -i -e 's/=m/=n/g'
+	sed .config -i -e 's/=y/=n/g'
+
+	# Enable default icon theme
+	sed .config -i -e 's/icons_default=n/icons_default=y/'
+
+	use xosd && epatch "${FILESDIR}"/xosd-${MY_PV}-gentoo.patch
+	use voice && epatch "${FILESDIR}"/voice-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -fno-rtti
+
+	# Enabling default iconset
+	module_config icons_default y
+
+	# Enabling dependencies that are needed by other modules
+	module_config account_management m
+	module_config autoaway m
+	module_config autoresponder m
+	module_config config_wizard m
+	module_config dcc m
+	module_config default_sms m
+	module_config docking m
+	module_config hints m
+	module_config notify m
+	module_config history m
+	module_config sms m
+	module_config sound m
+	module_config desktop_docking m
+	module_config migration m
+
+	use xosd && module_config xosd_notify m
+	use speech && module_config speech m
+	use ssl && module_config encryption y
+	use alsa && module_config alsa_sound m
+	use arts && module_config arts_sound m
+	use esd && module_config esd_sound m
+	use nas && module_config nas_sound m
+	use voice && module_config voice m
+	use X && module_config x11_docking m
+
+	# Some fixes
+	if use arts; then
+		einfo "Fixing modules spec files"
+		spec_config arts_sound MODULE_INCLUDES_PATH "\"$(kde-config --prefix)/include $(kde-config --prefix)/include/artsc\""
+		spec_config arts_sound MODULE_LIBS_PATH $(kde-config --prefix)/lib
+	fi
+
+	local myconf
+	myconf="${myconf} --enable-modules --enable-dist-info=Gentoo --enable-pheaders"
+	econf \
+		$(use_enable kdeenablefinal final) \
+		$(use_enable voice dependency-tracing) \
+		$(use_enable debug) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install || die
+}