Remove virtual/alsa dependency.

(Portage version: 2.1.2-r9)

8 files changed, 179 insertions, 173 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 8cc6e7d9dc08..0d2ea89ed89c 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kadu
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.55 2007/02/11 00:02:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.56 2007/02/11 18:16:25 flameeyes Exp $
+
+  11 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> kadu-0.4.1.ebuild,
+  kadu-0.4.1-r1.ebuild, kadu-0.4.2.ebuild, kadu-0.4.3.ebuild,
+  kadu-0.5.0_pre20060115.ebuild, kadu-0.5.0_pre20060211.ebuild,
+  kadu-0.5.0.ebuild:
+  Remove virtual/alsa dependency.
 
   10 Feb 2007; Christian Faulhammer <opfer@gentoo.org> kadu-0.4.3.ebuild:
   moved from USE flag tcltk to tk, see bug 17808
diff --git a/net-im/kadu/kadu-0.4.1-r1.ebuild b/net-im/kadu/kadu-0.4.1-r1.ebuild
index e942afd11391..dc68ffa0d08f 100644
--- a/net-im/kadu/kadu-0.4.1-r1.ebuild
+++ b/net-im/kadu/kadu-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.1-r1.ebuild,v 1.3 2006/11/13 15:08:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.1-r1.ebuild,v 1.4 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -41,7 +41,7 @@ IUSE="X debug alsa arts esd voice speech nas oss spell ssl tcltk xosd amarok ext
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib virtual/alsa )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	amarok? ( media-sound/amarok )
 	esd? ( media-sound/esound )
@@ -56,23 +56,23 @@ SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/stable/0.4.0/amarok-${AMAROK}.tar.gz )
 	tcltk? ( http://scripts.one.pl/tcl4kadu/files/stable/${PV}/tcl_scripting-${TCL}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
-	    http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
-	    http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
+		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
+		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
 		http://scripts.one.pl/~przemos/download/kadu-spy-${SPY}.tar.gz
-	    http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
-	    http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
+		http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
+		http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/stable/0.4.0/screenshot-${SCREEN_SHOT}.tar.gz
 		http://obeny.kicks-ass.net/obeny/kadu/modules/contacts/contacts-${CONTACTS}.tar.bz2
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
@@ -88,8 +88,8 @@ S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
+		module_config ${2} m
 	fi
 }
 
@@ -191,17 +191,17 @@ src_compile() {
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	if use extramodules; then
-	    einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
-	    sed ${WORKDIR}/firewall.tcl -i -e 's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
+		einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
+		sed ${WORKDIR}/firewall.tcl -i -e 's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
 	fi
 
 	local myconf
@@ -222,7 +222,7 @@ src_install() {
 	# Installing additional scripts and plugins
 	# Chess and Firewall
 	if use extramodules; then
-	    if use tcltk; then
+		if use tcltk; then
 		einfo "Installing Chess script"
 		insinto /usr/share/kadu/modules/data/tcl_scripting/scripts
 		doins ${WORKDIR}/KaduChess/{data,pics,KaduChess.tcl}
@@ -231,11 +231,11 @@ src_install() {
 
 		einfo "Installing Firewall module"
 		doins ${WORKDIR}/firewall{.tcl,.png}
-	    fi
+		fi
 	fi
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
diff --git a/net-im/kadu/kadu-0.4.1.ebuild b/net-im/kadu/kadu-0.4.1.ebuild
index 1aac4d4254cc..84aaec2eff97 100644
--- a/net-im/kadu/kadu-0.4.1.ebuild
+++ b/net-im/kadu/kadu-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.1.ebuild,v 1.6 2006/11/13 15:08:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.1.ebuild,v 1.7 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -41,7 +41,7 @@ IUSE="X debug alsa arts esd voice speech nas oss spell ssl tcltk xosd amarok ext
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib virtual/alsa )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	amarok? ( media-sound/amarok )
 	esd? ( media-sound/esound )
@@ -57,23 +57,23 @@ SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/stable/0.4.0/amarok-${VAMAROK}.tar.gz )
 	tcltk? ( http://scripts.one.pl/tcl4kadu/files/snapshots/tcl_scripting-${VTCL}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
-	    http://pcb45.tech.us.edu.pl/~blysk/weather/weather-${WEATHER}.tar.bz2
-	    http://nkg.republika.pl/files/ext_info-${EXT_INFO}.tar.bz2
-	    http://biprowod.wroclaw.pl/kadu/inne/spy-${SPY}.tar.gz
-	    http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
-	    http://biprowod.wroclaw.pl/kadu/KaduChess-${CHESS}.tar.bz2
-	    http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
+		http://pcb45.tech.us.edu.pl/~blysk/weather/weather-${WEATHER}.tar.bz2
+		http://nkg.republika.pl/files/ext_info-${EXT_INFO}.tar.bz2
+		http://biprowod.wroclaw.pl/kadu/inne/spy-${SPY}.tar.gz
+		http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
+		http://biprowod.wroclaw.pl/kadu/KaduChess-${CHESS}.tar.bz2
+		http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/stable/0.4.0/screenshot-${SSVER}.tar.gz )
 	xosd? ( http://www.kadu.net/~joi/xosd_notify/xosd_notify-${XOSD_NOTIFY}.tar.bz2 )
 	mail? ( http://michal.kernel-panic.cjb.net/mail/tars/release/mail-${MAIL}.tar.bz2 )
@@ -86,8 +86,8 @@ S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
+		module_config ${2} m
 	fi
 }
 
@@ -189,17 +189,17 @@ src_compile() {
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	if use extramodules; then
-	    einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
-	    sed ${WORKDIR}/firewall.tcl -i -e 's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
+		einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
+		sed ${WORKDIR}/firewall.tcl -i -e 's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
 	fi
 
 	local myconf
@@ -220,7 +220,7 @@ src_install() {
 	# Installing additional scripts and plugins
 	# Chess and Firewall
 	if use extramodules; then
-	    if use tcltk; then
+		if use tcltk; then
 		einfo "Installing Chess script"
 		insinto /usr/share/kadu/modules/data/tcl_scripting/scripts
 		doins ${WORKDIR}/KaduChess/{data,pics,KaduChess.tcl}
@@ -229,11 +229,11 @@ src_install() {
 
 		einfo "Installing Firewall module"
 		doins ${WORKDIR}/firewall{.tcl,.png}
-	    fi
+		fi
 	fi
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
diff --git a/net-im/kadu/kadu-0.4.2.ebuild b/net-im/kadu/kadu-0.4.2.ebuild
index 6b32fbf439f7..efc3b778a821 100644
--- a/net-im/kadu/kadu-0.4.2.ebuild
+++ b/net-im/kadu/kadu-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.2.ebuild,v 1.7 2006/11/13 15:08:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.2.ebuild,v 1.8 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -42,7 +42,7 @@ IUSE="debug alsa arts esd voice speech nas oss spell ssl tcltk
 	xosd amarok extraicons extramodules mail config_wizard"
 
 DEPEND="=x11-libs/qt-3*
-	alsa? ( media-libs/alsa-lib virtual/alsa
+	alsa? ( media-libs/alsa-lib
 	media-libs/libsndfile )
 	arts? ( kde-base/arts
 			media-libs/libsndfile )
@@ -65,23 +65,23 @@ SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/stable/0.4.0/amarok-${AMAROK}.tar.gz )
 	tcltk? ( http://scripts.one.pl/tcl4kadu/files/stable/${PV}/tcl_scripting-${TCL}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
-	    http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
-	    http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
+		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
+		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
 		http://scripts.one.pl/~przemos/download/kadu-spy-${SPY}.tar.gz
-	    http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
-	    http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
+		http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
+		http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/stable/0.4.0/screenshot-${SCREEN_SHOT}.tar.gz
 		http://obeny.kicks-ass.net/obeny/kadu/modules/contacts/contacts-${CONTACTS}.tar.bz2
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
@@ -97,8 +97,8 @@ S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
+		module_config ${2} m
 	fi
 }
 
@@ -188,29 +188,29 @@ src_compile() {
 	use ssl && module_config encryption y
 
 	# dynamic modules
-	use alsa 	&&	( module_config sound m; module_config alsa_sound m )
-	use arts 	&& 	( module_config sound m; module_config arts_sound m )
-	use esd 	&&	( module_config sound m; module_config esd_sound m )
-	use nas 	&&	( module_config sound m; module_config nas_sound m )
-	use voice 	&&	( module_config sound m; module_config voice m )
-	use oss 	&&	( module_config sound m; module_config dsp_sound m )
+	use alsa	&&	( module_config sound m; module_config alsa_sound m )
+	use arts	&&	( module_config sound m; module_config arts_sound m )
+	use esd		&&	( module_config sound m; module_config esd_sound m )
+	use nas		&&	( module_config sound m; module_config nas_sound m )
+	use voice	&&	( module_config sound m; module_config voice m )
+	use oss		&&	( module_config sound m; module_config dsp_sound m )
 	module_config x11_docking m
 	module_config wmaker_docking m
 
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	if use extramodules; then
-	    einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
-	    sed ${WORKDIR}/firewall.tcl -i -e \
+		einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
+		sed ${WORKDIR}/firewall.tcl -i -e \
 			's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
 	fi
 
@@ -232,7 +232,7 @@ src_install() {
 	# Installing additional scripts and plugins
 	# Chess and Firewall
 	if use extramodules; then
-	    if use tcltk; then
+		if use tcltk; then
 		einfo "Installing Chess script"
 		insinto /usr/share/kadu/modules/data/tcl_scripting/scripts
 		doins ${WORKDIR}/KaduChess/{data,pics,KaduChess.tcl}
@@ -242,11 +242,11 @@ src_install() {
 
 		einfo "Installing Firewall module"
 		doins ${WORKDIR}/firewall{.tcl,.png}
-	    fi
+		fi
 	fi
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
diff --git a/net-im/kadu/kadu-0.4.3.ebuild b/net-im/kadu/kadu-0.4.3.ebuild
index 3f48129ec7b3..caa18329d651 100644
--- a/net-im/kadu/kadu-0.4.3.ebuild
+++ b/net-im/kadu/kadu-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.3.ebuild,v 1.8 2007/02/11 00:02:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.3.ebuild,v 1.9 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -42,7 +42,7 @@ IUSE="debug alsa arts esd voice speech nas oss spell ssl tk
 	xosd amarok extraicons extramodules mail config_wizard"
 
 DEPEND="=x11-libs/qt-3*
-	alsa? ( media-libs/alsa-lib virtual/alsa
+	alsa? ( media-libs/alsa-lib
 	media-libs/libsndfile )
 	arts? ( kde-base/arts
 			media-libs/libsndfile )
diff --git a/net-im/kadu/kadu-0.5.0.ebuild b/net-im/kadu/kadu-0.5.0.ebuild
index 22a67b61ba4a..08be936804c4 100644
--- a/net-im/kadu/kadu-0.5.0.ebuild
+++ b/net-im/kadu/kadu-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0.ebuild,v 1.2 2007/02/08 01:27:38 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0.ebuild,v 1.3 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ XOSD_NOTIFY="20060424"		#http://www.kadu.net/~joi/xosd_notify
 MAIL="0.2.0"				#http://michal.gov.one.pl/mail
 SPELLCHECKER="0.19"			#http://scripts.one.pl/spellchecker
 #SPY="0.0.8-2"				#http://scripts.one.pl/~przemos/projekty/kaduspy/
-LED_NOTIFY="0.9" 			#http://http://www.kadu.net/~blysk/
+LED_NOTIFY="0.9"			#http://http://www.kadu.net/~blysk/
 SCREEN_SHOT="0.4.4"			#http://scripts.one.pl/screenshot
 OSD_NOTIFY="0.3.2"			#http://www.kadu.net/~pan_wojtas/osdhints_notify/
 POWERKADU="20061109"		#http://kadu.net/~patryk/powerkadu/
@@ -24,7 +24,7 @@ FIREWALL="0.6.4"			#http://www.kadu.net/~pan_wojtas/firewall/download.html
 EXEC_NOTIFY="20060424"		#http://www.kadu.net/~joi/exec_notify/
 FILEDESC="1.12"				#http://scripts.one.pl/filedesc/
 FILTERING="0.3.6-20060816"	#http://www.kadu.net/~pinkworm/filtering/
-PROFILES="0.1"				#http://www.kadu.net/forum/viewtopic.php?t=6282 
+PROFILES="0.1"				#http://www.kadu.net/forum/viewtopic.php?t=6282
 							#(fixme: no homepage?)
 SHELLEXEC="1.2.0"			#http://www.kadu.net/~obeny/modules/shellexec/
 
@@ -56,7 +56,7 @@ IUSE="X debug alsa arts esd voice speech nas oss spell ssl xosd amarok extraicon
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib virtual/alsa )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	amarok? ( media-sound/amarok )
 	esd? ( media-sound/esound )
@@ -69,48 +69,48 @@ DEPEND="=x11-libs/qt-3*
 SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/devel/${MY_PV}/amarok-${AMAROK}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2
 		http://kadu.net/download/additions/kompatybilne_z_GG6.tar.gz
 		http://kadu.net/download/additions/dodatkowe_emoty_GG7.tar.gz
 		http://www.kadu.net/download/additions/kadu-emots-zestaw288.tar.bz2
 		http://www.kadu.net/download/additions/kadu-emots-tex.tar.gz )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
-	    http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
-	    http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
-	    http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
+		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
+		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
+		http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/devel/${MY_PV}/screenshot-${SCREEN_SHOT}.tar.gz
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
 		http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-${OSD_NOTIFY}.tar.gz
 		http://kadu.net/~patryk/powerkadu/powerkadu-${POWERKADU}.tar.gz
-		http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-${FIREWALL}.tar.gz 
-		http://www.kadu.net/~joi/exec_notify/packages/exec_notify-${EXEC_NOTIFY}.tar.bz2 
-		http://scripts.one.pl/filedesc/devel/${MY_PV}/filedesc-${FILEDESC}.tar.gz 
-		http://www.kadu.net/~pinkworm/filtering/filtering-${FILTERING}-${MY_PV}.tar.bz2 
+		http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-${FIREWALL}.tar.gz
+		http://www.kadu.net/~joi/exec_notify/packages/exec_notify-${EXEC_NOTIFY}.tar.bz2
+		http://scripts.one.pl/filedesc/devel/${MY_PV}/filedesc-${FILEDESC}.tar.gz
+		http://www.kadu.net/~pinkworm/filtering/filtering-${FILTERING}-${MY_PV}.tar.bz2
 		http://www.kadu.net/~obeny/modules/shellexec/0.5.x/shellexec-${SHELLEXEC}.tar.bz2 )
 	xosd? ( http://www.kadu.net/~joi/xosd_notify/packages/xosd_notify-${XOSD_NOTIFY}.tar.bz2 )
 	mail? ( http://michal.kernel-panic.cjb.net/mail/tars/release/mail-${MAIL}.tar.bz2 )
 	spell? (
 	http://scripts.one.pl/spellchecker/devel/${MY_PV}/spellchecker-${SPELLCHECKER}.tar.gz
 	)"
-#		http://www.kadu.net/~dorr/kadu-profiles-${PROFILES}.tar.gz 
+#		http://www.kadu.net/~dorr/kadu-profiles-${PROFILES}.tar.gz
 
 
 S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
+		module_config ${2} m
 	fi
 }
 
@@ -204,12 +204,12 @@ src_compile() {
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	local myconf
@@ -229,7 +229,7 @@ src_install() {
 		install || die
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
@@ -240,7 +240,7 @@ src_install() {
 		mv $S/varia/themes/emoticons/penguins ${WORKDIR}/
 		for emots in $EMOTICONS; do
 			for i in ${WORKDIR}/$emots/*; do
-				insinto  /usr/share/kadu/themes/emoticons/$emots/${i/*\/}
+				insinto	 /usr/share/kadu/themes/emoticons/$emots/${i/*\/}
 				doins $i/*
 			done
 		done
diff --git a/net-im/kadu/kadu-0.5.0_pre20060115.ebuild b/net-im/kadu/kadu-0.5.0_pre20060115.ebuild
index cdd7ca752076..1027df37da33 100644
--- a/net-im/kadu/kadu-0.5.0_pre20060115.ebuild
+++ b/net-im/kadu/kadu-0.5.0_pre20060115.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0_pre20060115.ebuild,v 1.4 2006/11/13 15:08:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0_pre20060115.ebuild,v 1.5 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ XOSD_NOTIFY="051121"		#http://www.kadu.net/~joi/xosd_notify
 MAIL="0.2.0"				#http://michal.gov.one.pl/mail
 SPELLCHECKER="0.18"			#http://scripts.one.pl/spellchecker
 SPY="0.0.8-2"				#http://scripts.one.pl/~przemos/projekty/kaduspy/
-LED_NOTIFY="0.5" 			#http://http://www.kadu.net/~blysk/
+LED_NOTIFY="0.5"			#http://http://www.kadu.net/~blysk/
 SCREEN_SHOT="0.4.0"			#http://scripts.one.pl/screenshot
 CONTACTS="1.0rc1"			#http://obeny.kicks-ass.net/obeny/kadu/modules/contacts
 OSD_NOTIFY="0.2.7.2"		#http://www.kadu.net/~pan_wojtas/osdhints_notify/
@@ -43,7 +43,7 @@ IUSE="X debug alsa arts esd voice speech nas oss spell ssl xosd amarok extraicon
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib virtual/alsa )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	amarok? ( media-sound/amarok )
 	esd? ( media-sound/esound )
@@ -56,22 +56,22 @@ DEPEND="=x11-libs/qt-3*
 SRC_URI="http://kadu.net/download/snapshots/${PN}-${SNAPSHOT}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/devel/${MY_PV}/amarok-${AMAROK}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
-	    http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
-	    http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
+		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
+		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
 		http://scripts.one.pl/~przemos/download/kadu-spy-${SPY}.tar.gz
-	    http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
+		http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/devel/${MY_PV}/screenshot-${SCREEN_SHOT}.tar.gz
 		http://obeny.kicks-ass.net/obeny/kadu/modules/contacts/contacts-${CONTACTS}.tar.bz2
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
@@ -88,8 +88,8 @@ S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
+		module_config ${2} m
 	fi
 }
 
@@ -177,12 +177,12 @@ src_compile() {
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	local myconf
@@ -201,7 +201,7 @@ src_install() {
 		install || die
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
diff --git a/net-im/kadu/kadu-0.5.0_pre20060211.ebuild b/net-im/kadu/kadu-0.5.0_pre20060211.ebuild
index 83e3b04255d7..5969695b708f 100644
--- a/net-im/kadu/kadu-0.5.0_pre20060211.ebuild
+++ b/net-im/kadu/kadu-0.5.0_pre20060211.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0_pre20060211.ebuild,v 1.2 2006/11/13 15:08:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.5.0_pre20060211.ebuild,v 1.3 2007/02/11 18:16:25 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ XOSD_NOTIFY="20060123"		#http://www.kadu.net/~joi/xosd_notify
 MAIL="0.2.0"				#http://michal.gov.one.pl/mail
 SPELLCHECKER="0.18"			#http://scripts.one.pl/spellchecker
 SPY="0.0.8-2"				#http://scripts.one.pl/~przemos/projekty/kaduspy/
-LED_NOTIFY="0.6" 			#http://http://www.kadu.net/~blysk/
+LED_NOTIFY="0.6"			#http://http://www.kadu.net/~blysk/
 SCREEN_SHOT="0.4.0"			#http://scripts.one.pl/screenshot
 CONTACTS="1.0rc1"			#http://obeny.kicks-ass.net/obeny/kadu/modules/contacts
 OSD_NOTIFY="0.2.7.2"		#http://www.kadu.net/~pan_wojtas/osdhints_notify/
@@ -44,7 +44,7 @@ IUSE="X debug alsa arts esd voice speech nas oss spell ssl xosd amarok extraicon
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib virtual/alsa )
+	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	amarok? ( media-sound/amarok )
 	esd? ( media-sound/esound )
@@ -57,22 +57,22 @@ DEPEND="=x11-libs/qt-3*
 SRC_URI="http://kadu.net/download/snapshots/${PN}-${SNAPSHOT}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/devel/${MY_PV}/amarok-${AMAROK}.tar.gz )
 	extraicons? (
-	    http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-	    http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
-	    http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
+		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
+		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
+		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
-	    http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
-	    http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
+		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
+		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
 		http://scripts.one.pl/~przemos/download/kadu-spy-${SPY}.tar.gz
-	    http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
+		http://www.kadu.net/~blysk/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/devel/${MY_PV}/screenshot-${SCREEN_SHOT}.tar.gz
 		http://obeny.kicks-ass.net/obeny/kadu/modules/contacts/contacts-${CONTACTS}.tar.bz2
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
@@ -90,8 +90,8 @@ S=${WORKDIR}/${PN}
 
 enable_module() {
 	if use ${1}; then
-	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
-	    module_config ${2} m
+		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/ || die "Error moving module	${2}"
+		module_config ${2} m
 	fi
 }
 
@@ -180,12 +180,12 @@ src_compile() {
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
-	    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
+		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
 	if use amarok; then
-	    spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
-	    spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
+		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
+		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 
 	local myconf
@@ -205,7 +205,7 @@ src_install() {
 		install || die
 
 	if use extraicons; then
-	    einfo "Installing extra icons"
+		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}