Making dependency on libsndfile optional (bug #103285) and adding config_wizard local USE

Package-Manager: portage-2.0.52-r1

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 763381c8fa4d57b10120142470f98cab08d3594a..f4cac50e0bda386e60c18e8f0c9080f230bdfa22 100644 (file)
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2005/10/13 13:13:28 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.34 2005/10/13 19:30:49 mkay Exp $
+
+  13 Oct 2005; <mkay@gentoo.org> kadu-0.4.2.ebuild:
+  Making dependency on libsndfile optional (bug #103285) and adding
+  config_wizard local USE
 
 *kadu-0.4.2 (13 Oct 2005)
 

diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index ff9db4bc95069a0ad926c8025a2b90c2052ff953..e6df998ca6c22f1a533bb3b147405e74b2819708 100644 (file)
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,10 +1,10 @@
-MD5 97a333878644a0b35a4414de1812ede4 ChangeLog 4464
+MD5 164d03475e9722954f383468f9b10126 ChangeLog 4611
 MD5 ef2265e113f71f0c35b266aa93a224cb kadu-0.3.8.ebuild 859
 MD5 c30b964070d0f19383b5da19f14b79dd kadu-0.4.0.ebuild 7598
 MD5 90287df2c186fa948a71b3864453fcad kadu-0.4.1.ebuild 7501
 MD5 33e3466c984190a7bda01f7d4089f7a6 metadata.xml 245
 MD5 c3f7107c1a5212cf9677f6ea442c7e1e kadu-0.4.1-r1.ebuild 8345
-MD5 44a6319b550555324e5634235f693792 kadu-0.4.2.ebuild 8360
+MD5 0f9e1de604bd45e8a2d41a7214908f6d kadu-0.4.2.ebuild 8740
 MD5 7259b6aef0a2d10501b79c455fe4b763 files/digest-kadu-0.3.8 63
 MD5 27947a323558dd9aaa82c5b164f398b8 files/digest-kadu-0.4.0 1699
 MD5 5ec29be748778e605f23b2efe84b78a1 files/digest-kadu-0.4.1 1699

diff --git a/net-im/kadu/kadu-0.4.2.ebuild b/net-im/kadu/kadu-0.4.2.ebuild
index a98d53b8cefa8f540fa76a90b9b003a00e116703..ef86d60f3c5a1fcb3f7b127cfacd0079f7ff1398 100644 (file)
--- a/net-im/kadu/kadu-0.4.2.ebuild
+++ b/net-im/kadu/kadu-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2005/10/13 13:13:28 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.2.ebuild,v 1.2 2005/10/13 19:30:49 mkay Exp $
 
 inherit flag-o-matic eutils
 
@@ -39,22 +39,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="X debug alsa arts esd voice speech nas oss spell ssl tcltk xmms xosd amarok extraicons extramodules mail"
+IUSE="debug alsa arts esd voice speech nas oss spell ssl tcltk
+       xmms xosd amarok extraicons extramodules mail config_wizard"
 
 DEPEND="=x11-libs/qt-3*
-       media-libs/libsndfile
-       alsa? ( media-libs/alsa-lib virtual/alsa )
-       arts? ( kde-base/arts )
+       alsa? ( media-libs/alsa-lib virtual/alsa
+       media-libs/libsndfile )
+       arts? ( kde-base/arts
+                       media-libs/libsndfile )
+       esd? ( media-sound/esound
+                       media-libs/libsndfile )
+       nas? ( media-libs/nas
+                       media-libs/libsndfile )
+       oss? ( media-libs/libsndfile )
+       config_wizard? ( media-libs/libsndfile )
+       voice? ( media-libs/libsndfile )
        amarok? ( media-sound/amarok )
-       esd? ( media-sound/esound )
-       nas? ( media-libs/nas )
        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 )"
+       xosd? ( x11-libs/xosd )"
+
 
 SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
        amarok? ( http://scripts.one.pl/amarok/stable/0.4.0/amarok-${AMAROK}.tar.gz )
@@ -144,8 +151,6 @@ src_unpack() {
 }
 
 src_compile() {
-       filter-flags -fno-rtti
-
        # Enabling default iconset
        module_config icons_default y
 
@@ -153,7 +158,6 @@ src_compile() {
        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
@@ -161,8 +165,9 @@ src_compile() {
        module_config hints m
        module_config notify m
        module_config sms m
-       module_config sound m
        module_config desktop_docking m
+       use config_wizard && \
+               ( module_config sound m; module_config config_wizard m )
 
        if use extramodules; then
                if use !tcltk; then
@@ -186,13 +191,14 @@ src_compile() {
        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
+       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"
@@ -207,7 +213,8 @@ src_compile() {
 
        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'
+           sed ${WORKDIR}/firewall.tcl -i -e \
+                       's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
        fi
 
        local myconf
@@ -233,7 +240,8 @@ src_install() {
                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'
+               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}