Version bump, rwvrite ebuild, remove some old modules which don't work with this version. Bug #207216. Ebuild kindly provided by Dawid Stawiarski <neeo@kadu.net>.

(Portage version: 2.1.4.4)

3 files changed, 198 insertions, 136 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 0fcdd98510f6..e95a8501f6a8 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,14 +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.59 2008/02/13 01:43:35 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.60 2008/06/04 22:08:10 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
+  Version bump, rewrite ebuild, remove some old modules which don't work with
+  this version. Bug #207216. Ebuild kindly provided by Dawid Stawiarski <neeo@kadu.net>.
 
   18 Jan 2008; Dawid Węgliński <cla@gentoo.org> metadata.xml:
   Add myself to metadata.xml
diff --git a/net-im/kadu/kadu-0.6.0.1.ebuild b/net-im/kadu/kadu-0.6.0.1.ebuild
new file mode 100644
index 000000000000..fe0ea9db5546
--- /dev/null
+++ b/net-im/kadu/kadu-0.6.0.1.ebuild
@@ -0,0 +1,195 @@
+# 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.1.ebuild,v 1.1 2008/06/04 22:08:10 cla Exp $
+
+inherit flag-o-matic eutils
+
+AGENT="0.4.4"			#http://www.kadu.net/w/Agent
+TABS="1.1.6"			#http://www.kadu.net/w/Tabs
+LED_NOTIFY="0.18"		#http://www.kadu.net/~blysk/
+FILTERING="20080224"	#http://www.kadu.net/~pinkworm/filtering/
+SCREENSHOT="20080104"
+OSD_NOTIFY="0.4.2"		#http://www.kadu.net/forum/viewtopic.php?t=8879
+PROFILES="0.3.1"		#http://www.kadu.net/forum/viewtopic.php?t=6282
+FIREWALL="0.7.5.1"
+
+SPELLCHECKER="20071230"
+MAIL="0.3.3"
+
+POWERKADU="2.0.4"
+ANONYM_CHECK="0.2"
+ANTYSTRING="0.2"
+AUTOHIDE="0.2.1"
+AUTOSTATUS="0.1"
+CENZOR="0.2"
+SPLITMESG="0.2"
+WORDFIX="0.3"
+PARSEREXT="0.1.1"
+
+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 libgadu alsa arts esd voice speech spell nas oss ssl mail extramodules powerkadu kdeenablefinal"
+
+DEPEND="=x11-libs/qt-3*
+	media-libs/libsndfile
+	libgadu? ( >=net-libs/libgadu-1.8.0 )
+	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 )
+	spell? ( app-dicts/aspell-pl )"
+
+SRC_URI="http://www.kadu.net/download/stable/${P}.tar.bz2
+	extramodules? (
+		http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-profiles-${PROFILES}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-osdhints_notify-${OSD_NOTIFY}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-firewall-${FIREWALL}.tar.bz2
+		http://kadu.net/~arvenil/tabs/download/${MY_PV}/kadu-tabs-${TABS}.tar.bz2
+		http://www.kadu.net/download/modules_extra/filtering/filtering-${FILTERING}.tar.bz2
+		http://www.kadu.net/download/modules_extra/screenshot/screenshot-${SCREENSHOT}.tar.bz2
+		http://misiek.jah.pl/assets/2008/2/8/agent-${AGENT}.tar.gz )
+	powerkadu? (
+		http://www.kadu.net/~dorr/moduly/kadu-powerkadu-${POWERKADU}.tar.bz2
+		http://kadu.net/~patryk/anonymous_check/anonymous_check-${ANONYM_CHECK}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-antistring-${ANTYSTRING}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-auto_hide-${AUTOHIDE}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-autostatus-${AUTOSTATUS}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-cenzor-${CENZOR}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-split_messages-${SPLITMESG}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-word_fix-${WORDFIX}.tar.bz2
+		http://www.kadu.net/~dorr/moduly/kadu-parser_extender-${PARSEREXT}.tar.bz2 )
+	mail? (
+		http://www.kadu.net/~weagle/mail/mail-${MAIL}.tar.bz2 )
+	spell? (
+		http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-${SPELLCHECKER}.tar.bz2
+	)"
+
+S="${WORKDIR}"/${PN}
+
+enable_module() {
+	if use ${1}; then
+		mv "${WORKDIR}"/${2} "${WORKDIR}"/kadu/modules/ || die "Error moving module	${2}"
+		module_config ${2} m
+	fi
+}
+
+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/'
+
+	# Enable default emoticon theme
+	sed .config -i -e 's/emoticons_penguins=n/emoticons_penguins=y/'
+
+	# Enabling extra modules
+	enable_module extramodules agent
+	enable_module extramodules osdhints_notify
+	enable_module extramodules led_notify
+	enable_module extramodules tabs
+	enable_module extramodules profiles
+	enable_module extramodules firewall
+	enable_module extramodules filtering
+	enable_module extramodules screenshot
+
+	# Enabling powerkadu and it's dependencies
+	enable_module powerkadu powerkadu
+	enable_module powerkadu anonymous_check
+	enable_module powerkadu antistring
+	enable_module powerkadu auto_hide
+	enable_module powerkadu autostatus
+	enable_module powerkadu cenzor
+	enable_module powerkadu split_messages
+	enable_module powerkadu word_fix
+	enable_module powerkadu parser_extender
+
+	enable_module mail mail
+	enable_module spell spellchecker
+
+	use voice && epatch "${FILESDIR}"/voice-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -fno-rtti
+
+	# Enabling default iconset
+	module_config icons_default y
+
+	# Enabling default emoticons
+	module_config emoticons_penguins 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 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_with libgadu existing-libgadu) \
+		$(use_enable kdeenablefinal final) \
+		$(use_enable voice dependency-tracing) \
+		$(use_enable debug) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install || die
+}
diff --git a/net-im/kadu/kadu-0.6.0_rc2.ebuild b/net-im/kadu/kadu-0.6.0_rc2.ebuild
deleted file mode 100644
index b56e71d4bfd7..000000000000
--- a/net-im/kadu/kadu-0.6.0_rc2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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
-}