Fixed dependency problem, bug #85872 and enabled x11_docking module, bug #85884

Package-Manager: portage-2.0.51.19

4 files changed, 291 insertions, 9 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index ccf93dd72847..69846cd65960 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kadu
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.18 2005/03/18 17:07:52 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.19 2005/03/20 11:24:30 sekretarz Exp $
+
+*kadu-0.4.0_rc2-r1 (20 Mar 2005)
+
+  20 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +kadu-0.4.0_rc2-r1.ebuild:
+  Solved dependency problem, bug #85872 and enabled x11_docking module, bug #85884
 
   18 Mar 2005; Karol Wojtaszek <sekretarz@gentoo.org> kadu-0.4.0_rc2.ebuild:
   Solved problem with LIB_PATH env in arts and amarok modules
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 1add196ee55a..ad50a41cc1aa 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,16 +1,28 @@
-MD5 0d9df1a5405c0aee0bfd1f96b3b18dca ChangeLog 2504
-MD5 5dea796a7f3e380693bd0185bd5b35cd kadu-0.3.6.ebuild 609
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6b57537cbf49758ceae23a4510f6598a kadu-0.3.7.ebuild 820
-MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
-MD5 92e6b2c409481dba26af02a7b685af6b kadu-0.3.8.ebuild 867
+MD5 052f661ccd38aaeadfebc4d35e005bbc kadu-0.4.0_rc2-r1.ebuild 7865
 MD5 5032f5d04c885dc99f6c00a685471731 kadu-0.3.9.ebuild 1749
 MD5 4cd31fb88974954e268028c5b1dd663d kadu-0.4.0_rc2.ebuild 7631
+MD5 5dea796a7f3e380693bd0185bd5b35cd kadu-0.3.6.ebuild 609
+MD5 92e6b2c409481dba26af02a7b685af6b kadu-0.3.8.ebuild 867
+MD5 b627e3cf63096fa99b3d8947bff5240a ChangeLog 2705
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 2b6dd9d889e66221f2f9d82d5653889b files/digest-kadu-0.4.0_rc2 1638
+MD5 2b6dd9d889e66221f2f9d82d5653889b files/digest-kadu-0.4.0_rc2-r1 1638
+MD5 878470dcf216da170b3878d17b0f59a2 files/kadu-0.4.0_rc2-nas-gentoo.diff 986
+MD5 a749836353c0aa03308822bdcbd08422 files/kadu-0.4.0_rc2-libgsm-amd64.patch 331
+MD5 e19ebd592e5b94e0b82b481d90861819 files/xosd-gentoo.patch 1148
 MD5 5d82fddca529f0af79869df2a55db7f1 files/digest-kadu-0.3.6 63
 MD5 d6cc7076216ed7aa0d0ab8b3ff154d41 files/digest-kadu-0.3.7 63
 MD5 7259b6aef0a2d10501b79c455fe4b763 files/digest-kadu-0.3.8 63
 MD5 9c405497d2804fa81d6b2d48c00e227f files/digest-kadu-0.3.9 63
 MD5 878470dcf216da170b3878d17b0f59a2 files/kadu-0.3.9-nas-gentoo.diff 986
-MD5 2b6dd9d889e66221f2f9d82d5653889b files/digest-kadu-0.4.0_rc2 1638
-MD5 a749836353c0aa03308822bdcbd08422 files/kadu-0.4.0_rc2-libgsm-amd64.patch 331
-MD5 878470dcf216da170b3878d17b0f59a2 files/kadu-0.4.0_rc2-nas-gentoo.diff 986
-MD5 e19ebd592e5b94e0b82b481d90861819 files/xosd-gentoo.patch 1148
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCPWuUZ/iYVBmujdURAj9CAKCq7wRufKxl1oNO0k1Y4df/Rx2eHACeP2kO
+r85Ou8Korc5LGrQzIt3TF/Y=
+=3Y8y
+-----END PGP SIGNATURE-----
diff --git a/net-im/kadu/files/digest-kadu-0.4.0_rc2-r1 b/net-im/kadu/files/digest-kadu-0.4.0_rc2-r1
new file mode 100644
index 000000000000..43a9c478cb67
--- /dev/null
+++ b/net-im/kadu/files/digest-kadu-0.4.0_rc2-r1
@@ -0,0 +1,24 @@
+MD5 f6ea2ebe8b62d7361326f0e227b7f40a kadu-0.4.0-rc2.tar.bz2 1174746
+MD5 1cec6670d6441d1251b3f430525564a3 tabs-r34.tar.bz2 11981
+MD5 3f5d360714c805b586cb94223bdd35d4 amarok-1.12.tar.gz 8715
+MD5 336a53aadbc0ff846ac34681d79a6c16 tcl_scripting-20050308.tar.gz 591658
+MD5 2ef812084512cc14a95c1737535cbbdb kadu-theme-alt_cryst.tar.bz2 121877
+MD5 023085edabaf6a1b844fe6b5fc9315f9 kadu-theme-crystal-16.tar.bz2 45993
+MD5 57852ff3d3fd0063a642fcc173f7fa29 kadu-theme-crystal-22.tar.bz2 48895
+MD5 f0b33b0d42b9dc1de5c6b19097600a9e kadu-theme-gg3d.tar.bz2 78353
+MD5 5ec5ec33849c35ae8d2b114250b664b3 kadu-theme-noia-16.tar.bz2 109294
+MD5 586cc6ff9ba62f0fdd7c7c1adf229efb kadu-theme-nuvola-16.tar.gz 119276
+MD5 7a17b4881141b346c6268ef25c284613 kadu-theme-nuvola-22.tar.gz 147311
+MD5 766e4841651364d032b68b8321f153ef kadu-theme-old_default.tar.bz2 85997
+MD5 a8d5d60e062255e77b732a37ea2e5e7c kadu-theme-piolnet.tar.bz2 79831
+MD5 cbd97ea8302ac4ad9507f104597da0c4 kadu-theme-real_gg.tar.bz2 131697
+MD5 640acacc8f5b33da6e1eb379eb3177dc weather-2.01.tar.bz2 46297
+MD5 001deaa1ebd6beaf104b77fce9aeff2e ext_info-1.2.tar.bz2 17868
+MD5 4959525a23d18fb37a66d7e0a3b75f76 kadu-spy-0.0.6.tar.bz2 12824
+MD5 77b0b8da0723ef23caaf1c75125d0fa4 firewall-20050308.tar.bz2 6858
+MD5 4a424362ba3a10ddbce0fb1a4ff4d649 KaduChess-0.3-Calista.tar.bz2 24892
+MD5 8d6e7e9d0e79a350e62894112994ec9b led_notify-0.1.tar.bz2 2802
+MD5 57cae3ca45d3163ba51a306f5d783d55 xmms-1.24.tar.gz 14954
+MD5 6eb7a27232304e85bc57cfc557289872 xosd_notify-050227.tar.bz2 11578
+MD5 e63393922738bea7a9d1be675c826608 mail-0.2.0.tar.bz2 93363
+MD5 0e427d25f69f5f5d10e303f8d2e79e70 spellchecker-0.13.tar.gz 9121
diff --git a/net-im/kadu/kadu-0.4.0_rc2-r1.ebuild b/net-im/kadu/kadu-0.4.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..926983b99b15
--- /dev/null
+++ b/net-im/kadu/kadu-0.4.0_rc2-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.0_rc2-r1.ebuild,v 1.1 2005/03/20 11:24:30 sekretarz Exp $
+
+inherit flag-o-matic eutils
+
+VTCL="20050308"
+VTABS="r34"
+VAMAROK="1.12"
+WEATHER="2.01"
+EXT_INFO="1.2"
+XMMS="1.24"
+XOSD_NOTIFY="050227"
+MAIL="0.2.0"
+SPELLCHECKER="0.13"
+SPY="0.0.6"
+CHESS="0.3-Calista"
+FIREWALL="20050308"
+LED_NOTIFY="0.1"
+
+DESCRIPTION="QT client for popular in Poland Gadu-Gadu IM network"
+HOMEPAGE="http://kadu.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE="X debug alsa arts esd voice speech nas oss spell ssl tcltk xmms xosd amarok pheaders extraicons extramodules mail"
+
+DEPEND="x11-libs/qt
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	arts? ( kde-base/arts )
+	amarok? ( media-sound/amarok )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	pheaders? ( >=sys-devel/gcc-3.4.0 )
+	spell? ( app-dicts/aspell-pl )
+	ssl? ( dev-libs/openssl )
+	speech? ( app-accessibility/powiedz )
+	tcltk? ( >=dev-lang/tcl-8.4.0 >=dev-lang/tk-8.4.0 )
+	xmms? ( media-sound/xmms )
+	xosd? ( x11-libs/xosd )
+	X? ( virtual/x11 )"
+
+SRC_URI="http://kadu.net/download/stable/${P/_/-}.tar.bz2
+	http://biprowod.wroclaw.pl/kadu/tabs-${VTABS}.tar.bz2
+	amarok? ( http://scripts.one.pl/amarok/devel/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 )
+	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://pcb45.tech.us.edu.pl/~tomek/kadu/kadu-spy-${SPY}.tar.bz2
+	    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 )
+	xmms? ( http://scripts.one.pl/xmms/devel/0.4.0/xmms-${XMMS}.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 )
+	spell? ( http://scripts.one.pl/spellchecker/devel/0.4.0/spellchecker-${SPELLCHECKER}.tar.gz )"
+
+
+S=${WORKDIR}/${PN}
+
+enable_module() {
+	if use ${1}; then
+	    mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
+	    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
+	rm -f ${WORKDIR}/kadu/modules/*.web
+
+	# Disabling autodownload for icons
+	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_module amarok amarok
+	enable_module spell spellchecker
+	enable_module xmms xmms
+	enable_module xosd xosd_notify
+	enable_module mail mail
+	enable_module tcltk "tcl_scripting"
+
+	enable_module extramodules weather
+	enable_module extramodules ext_info
+	enable_module extramodules spy
+	enable_module extramodules led_notify
+	enable_module extramodules tabs
+
+	# put some patches
+	epatch ${FILESDIR}/${P}-libgsm-amd64.patch
+	use nas && epatch ${FILESDIR}/${P}-nas-gentoo.diff
+	use xosd && epatch ${FILESDIR}/xosd-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 filedesc m
+	module_config hints m
+	module_config notify m
+	module_config sms m
+	module_config sound m
+	module_config desktop_docking m
+
+	if use extramodules; then
+		if use !tcltk; then
+			ewarn "script_chess depends on module_tcl_scripting;"
+			ewarn "It won't be installed."
+		fi
+	fi
+
+	# Firewall
+	if use extramodules; then
+		if use !tcltk; then
+			ewarn "script_firewall depends on module_tcl_scripting;"
+			ewarn "It won't be installed."
+		fi
+	fi
+
+	use speech && module_config speech m
+	use extramodules && module_config autoresponder
+
+	# static modules (disable only, do not compile as .so)
+	use ssl && module_config encryption y
+
+	# dynamic modules
+	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
+	use X && 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
+	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
+	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'
+	fi
+
+	local myconf
+	myconf="${myconf} --enable-modules --enable-dist-info=Gentoo"
+
+	use voice && myconf="${myconf} --enable-dependency-tracing"
+	use debug && myconf="${myconf} --enable-debug"
+	use pheaders && myconf="${myconf} --enable-pheaders"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	# Installing additional scripts and plugins
+	# Chess and Firewall
+	if use extramodules; 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}
+		# small fix form author's site
+		sed ${D}/usr/share/kadu/modules/data/tcl_scripting/scripts/KaduChess.tcl -i -e 's/on chat0 KC_recv KC_recv/on chat0 KC_recv/g'
+
+		einfo "Installing Firewall module"
+		doins ${WORKDIR}/firewall{.tcl,.png}
+	    fi
+	fi
+
+	if use extraicons; then
+	    einfo "Installing extra icons"
+	    mv ${WORKDIR}/kadu-theme-crystal-16 ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-crystal-22 ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-gg3d ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-noia-16 ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-nuvola-16 ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-nuvola-22 ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-piolnet ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/kadu-theme-real_gg ${D}/usr/share/kadu/themes/icons
+	    mv ${WORKDIR}/alt_cryst ${D}/usr/share/kadu/themes/icons
+	    chmod -R 644 ${D}/usr/share/kadu/themes/icons
+	fi
+}