Handling skins useflags dependencies rather than dying and asking for other useflags...

Package-Manager: portage-2.1.2.2

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 736f553cf125173855189a14706c4fa6a61e6b9f..51597cc5100fca138423b76b027251deb16179ce 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.229 2007/03/05 07:31:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.230 2007/03/09 08:31:07 aballier Exp $
+
+  09 Mar 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild,
+  vlc-0.8.6_p18636.ebuild:
+  Handling skins useflags dependencies rather than dying and asking for other
+  useflags to be enabled, bug #158095
 
   05 Mar 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild,
   vlc-0.8.6_p18636.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6ef9a5256b11b8eb836305cebc4f31b38324746d..4bd401a00e6a669c798878a8a502ce0922dc1ec7 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe
 DIST vlc-patches-38.tar.bz2 11402 RMD160 647b92b86823bdf2ed1e3ba40457aa892154bcbb SHA1 1d0d3b8ccbb95f75b2bce52ad801d398b00c9125 SHA256 17174e05fb41aac4607e84b075e91e8375bb2d59a114916ca6ecaea6b885da0c
-EBUILD vlc-0.8.6-r1.ebuild 8527 RMD160 ef9b89693b55de927e89b50ce546b929ce0b540d SHA1 989add2eb3d44ddb33eb850a839c5d7a36aa7b78 SHA256 62b0611411bbaa99254b53c2bd8923d9b8ee7e0a8825af7bb84a7096b74a42be
-MD5 ed5dc5d8970bbf3e165f21eb9f9025cc vlc-0.8.6-r1.ebuild 8527
-RMD160 ef9b89693b55de927e89b50ce546b929ce0b540d vlc-0.8.6-r1.ebuild 8527
-SHA256 62b0611411bbaa99254b53c2bd8923d9b8ee7e0a8825af7bb84a7096b74a42be vlc-0.8.6-r1.ebuild 8527
-EBUILD vlc-0.8.6_p18636.ebuild 8802 RMD160 26e2a9247088147d0e723d5251dba4b5e4329f40 SHA1 5f42f4d9a70bcf2777fe75594d0a69535cc3c706 SHA256 da1742197c7e42447c9c8187ba3f9bb5dc97f24532229882162f18f0732e8571
-MD5 f40beef7b5f95ca97c38bf7fc5bddf86 vlc-0.8.6_p18636.ebuild 8802
-RMD160 26e2a9247088147d0e723d5251dba4b5e4329f40 vlc-0.8.6_p18636.ebuild 8802
-SHA256 da1742197c7e42447c9c8187ba3f9bb5dc97f24532229882162f18f0732e8571 vlc-0.8.6_p18636.ebuild 8802
-MISC ChangeLog 41549 RMD160 fca423d739b7d3510676d78c246a041730863b84 SHA1 be3fe45e3471691918a148ff872a2657f2a9db90 SHA256 7e1500e9d02c09f9e53e68d4d7de5f6f105b8c33f007e4fe829d8e2372d1d5d7
-MD5 ced773ba50a7e39d79d8d0438754be3d ChangeLog 41549
-RMD160 fca423d739b7d3510676d78c246a041730863b84 ChangeLog 41549
-SHA256 7e1500e9d02c09f9e53e68d4d7de5f6f105b8c33f007e4fe829d8e2372d1d5d7 ChangeLog 41549
+EBUILD vlc-0.8.6-r1.ebuild 8787 RMD160 fc6f19979022f167ae82c9e1d1d6afb80837c575 SHA1 9c6af8af2d89e5a01ccb815e4fccabcaf9030707 SHA256 a9564f1073cb5d4f1c05053b2b6a4dc8be4f573892e202a4d28080e4b0fe3796
+MD5 29a746f1c659f2b44e4f5e805582953b vlc-0.8.6-r1.ebuild 8787
+RMD160 fc6f19979022f167ae82c9e1d1d6afb80837c575 vlc-0.8.6-r1.ebuild 8787
+SHA256 a9564f1073cb5d4f1c05053b2b6a4dc8be4f573892e202a4d28080e4b0fe3796 vlc-0.8.6-r1.ebuild 8787
+EBUILD vlc-0.8.6_p18636.ebuild 9062 RMD160 2d9bab18eab8cdb117d9e1d71966726b3b5eb347 SHA1 b4d9ce189d9bd4bbcb3c5e2626df1ac63289e54d SHA256 0cf6a2c7388c6e3e6c557b0a74a22d4e918bdb956fb6f83f6f574d0def7f843f
+MD5 a0a7b8d72d329674198c477fcca0a95a vlc-0.8.6_p18636.ebuild 9062
+RMD160 2d9bab18eab8cdb117d9e1d71966726b3b5eb347 vlc-0.8.6_p18636.ebuild 9062
+SHA256 0cf6a2c7388c6e3e6c557b0a74a22d4e918bdb956fb6f83f6f574d0def7f843f vlc-0.8.6_p18636.ebuild 9062
+MISC ChangeLog 41766 RMD160 1b79a4789861e7f38ad41bae817fb0e9c5c35dde SHA1 c0335b383d72adb1f47067db2a9c6cc397cf07f9 SHA256 f64aee80991e10044a0b1fd98ecce4fea0f80c5586135ea0510821f076155953
+MD5 79b2f6757fa0984ac0126127929a47a7 ChangeLog 41766
+RMD160 1b79a4789861e7f38ad41bae817fb0e9c5c35dde ChangeLog 41766
+SHA256 f64aee80991e10044a0b1fd98ecce4fea0f80c5586135ea0510821f076155953 ChangeLog 41766
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -27,9 +27,9 @@ MD5 94ad9ada9f49e73c88ff0b5764d012d9 files/digest-vlc-0.8.6_p18636 503
 RMD160 9d1d3442ad35269fc112a63747c020e0b47a88f7 files/digest-vlc-0.8.6_p18636 503
 SHA256 ea07ba1ed036f2bf49ff529aff6e86abe6cd47240385b29e965ab7f91ee6f50c files/digest-vlc-0.8.6_p18636 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF68d0vFcC4BYPU0oRAsctAKC2hTF9XRf0cDw26hk4UBUeu2ncGwCfSba8
-xW09TACySn3ZGwtfKAAutfs=
-=dyCW
+iD8DBQFF8RtUvFcC4BYPU0oRAvPiAKCMW8zFlx4fmbLtsNpWPZ1K3s1ARACgs8OW
+jvdT1YU2oEM5zoyAMlWCzBg=
+=PJKv
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild
index f6f03ceed6b94a5f20cbfb36d71b4e028c8f1857..4499501cc9d0fee2d84affd731146c7f141fc44f 100644 (file)
--- a/media-video/vlc/vlc-0.8.6-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.6-r1.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/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.20 2007/03/05 07:31:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.21 2007/03/09 08:31:07 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -66,6 +66,9 @@ RDEPEND="
                arts? ( kde-base/arts )
                alsa? ( media-libs/alsa-lib )
                wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 )
+               skins? ( >=x11-libs/wxGTK-2.6.2-r1
+                       media-libs/freetype
+                       media-fonts/ttf-bitstream-vera )
                ncurses? ( sys-libs/ncurses )
                xosd? ( x11-libs/xosd )
                lirc? ( app-misc/lirc )
@@ -117,18 +120,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if use wxwindows; then
+       if use wxwindows || use skins; then
                WX_GTK_VER="2.6"
                need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
        fi
 
        if use skins && ! use truetype; then
-               eerror "Trying to build with skins support but without truetype."
-               die "You have to use 'truetype' to use 'skins'"
+               ewarn "Trying to build with skins support but without truetype."
+               ewarn "Enabling truetype."
        fi
        if use skins && ! use wxwindows; then
-               eerror "Trying to build with skins support but without wxwindows."
-               die "You have to use 'wxwindows' to use 'skins'"
+               ewarn "Trying to build with skins support but without wxwindows."
+               ewarn "Enabling wxwindows."
        fi
 }
 
@@ -178,6 +181,19 @@ src_compile () {
                myconf="${myconf} $(use_enable live live555)"
        fi
 
+       if use truetype || use skins; then
+               myconf="${myconf} --enable-freetype"
+       else
+               myconf="${myconf} --disable-freetype"
+       fi
+
+       if use wxwindows || use skins; then
+               myconf="${myconf} --enable-wxwidgets"
+       else
+               myconf="${myconf} --disable-wxwidgets"
+       fi
+
+
        econf \
                $(use_enable altivec) \
                $(use_enable stream sout) \
@@ -197,7 +213,6 @@ src_compile () {
                $(use_enable xv xvideo) \
                $(use_enable xinerama) \
                $(use_enable opengl glx) $(use_enable opengl) \
-               $(use_enable truetype freetype) \
                $(use_enable bidi fribidi) \
                $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
                $(use_enable fbcon fb) \
@@ -209,7 +224,6 @@ src_compile () {
                $(use_enable esd) \
                $(use_enable arts) \
                $(use_enable alsa) \
-               $(use_enable wxwindows wxwidgets) \
                $(use_enable ncurses) \
                $(use_enable xosd) \
                $(use_enable lirc) \
@@ -287,5 +301,5 @@ src_install() {
                newins "${S}"/share/vlc${res}x${res}.png vlc.png
        done
 
-       use wxwindows || rm "${D}/usr/share/applications/vlc.desktop"
+       use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
 }

diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild
index 71edf48fd3a79bc61cfb1f053e5a3ea4c64d8ef3..1b583ea21cb0c4ee6c937f3b928a704538306f5e 100644 (file)
--- a/media-video/vlc/vlc-0.8.6_p18636.ebuild
+++ b/media-video/vlc/vlc-0.8.6_p18636.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/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.15 2007/03/05 07:31:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.16 2007/03/09 08:31:07 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -71,6 +71,9 @@ RDEPEND="
                arts? ( kde-base/arts )
                alsa? ( media-libs/alsa-lib )
                wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 )
+               skins? ( >=x11-libs/wxGTK-2.6.2-r1
+                       media-libs/freetype
+                       media-fonts/ttf-bitstream-vera )
                ncurses? ( sys-libs/ncurses )
                xosd? ( x11-libs/xosd )
                lirc? ( app-misc/lirc )
@@ -124,18 +127,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-       if use wxwindows; then
+       if use wxwindows || use skins; then
                WX_GTK_VER="2.6"
                need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
        fi
 
        if use skins && ! use truetype; then
-               eerror "Trying to build with skins support but without truetype."
-               die "You have to use 'truetype' to use 'skins'"
+               ewarn "Trying to build with skins support but without truetype."
+               ewarn "Enabling truetype."
        fi
        if use skins && ! use wxwindows; then
-               eerror "Trying to build with skins support but without wxwindows."
-               die "You have to use 'wxwindows' to use 'skins'"
+               ewarn "Trying to build with skins support but without wxwindows."
+               ewarn "Enabling wxwindows."
        fi
 }
 
@@ -186,6 +189,19 @@ src_compile () {
                myconf="${myconf} $(use_enable live live555)"
        fi
 
+       if use truetype || use skins; then
+               myconf="${myconf} --enable-freetype"
+       else
+               myconf="${myconf} --disable-freetype"
+       fi
+
+       if use wxwindows || use skins; then
+               myconf="${myconf} --enable-wxwidgets"
+       else
+               myconf="${myconf} --disable-wxwidgets"
+       fi
+
+
        econf \
                $(use_enable altivec) \
                $(use_enable stream sout) \
@@ -205,7 +221,6 @@ src_compile () {
                $(use_enable xv xvideo) \
                $(use_enable xinerama) \
                $(use_enable opengl glx) $(use_enable opengl) \
-               $(use_enable truetype freetype) \
                $(use_enable bidi fribidi) \
                $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
                $(use_enable fbcon fb) \
@@ -217,7 +232,6 @@ src_compile () {
                $(use_enable esd) \
                $(use_enable arts) \
                $(use_enable alsa) \
-               $(use_enable wxwindows wxwidgets) \
                $(use_enable ncurses) \
                $(use_enable xosd) \
                $(use_enable lirc) \
@@ -295,5 +309,5 @@ src_install() {
                newins "${S}"/share/vlc${res}x${res}.png vlc.png
        done
 
-       use wxwindows || rm "${D}/usr/share/applications/vlc.desktop"
+       use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
 }