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

(Portage version: 2.1.3.19)

4 files changed, 181 insertions, 1 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/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
+}