Fix some useflag combinations failures reported by andreas schürch <andreas.schuerch...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 07a71f5bd815bfbc827c83b17ef967bce2a9fbba..77cdb3301fbc938a4c67db77efe3b041509f8597 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.571 2010/04/23 11:08:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.572 2010/04/23 15:24:24 aballier Exp $
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.6.ebuild,
+  vlc-1.0.9999.ebuild:
+  Fix some useflag combinations failures reported by andreas schürch
+  <andreas.schuerch@nativenet.ch>, bug #316805 and simplify
+  vlc_use_enable_force
 
 *vlc-1.1.9999 (23 Apr 2010)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2a75c01c43aa35b73181c0bdb1542a7bee966486..481e1ac2c02c727f9c0c7d2fd040cb3d559289e8 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,17 +11,17 @@ DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
 EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SHA1 94bf1ecc7203cc3315ace8d02805018e794c9caa SHA256 d0ac3016fcef6e5fa1b943101e9e0d83d731d06da6a8d82d572d1d8e9006a3ea
 EBUILD vlc-1.0.5.ebuild 12055 RMD160 827dd3c7f1ba1bb6e7b9b1d688c11b703aa6c205 SHA1 e4d094e7986207ba5e529bdccfbe2dcb52658130 SHA256 e98a0afe4f02d9a04b4b0a629f0bcdb1d90b6d80aabda8cfc38c728a77e92afb
-EBUILD vlc-1.0.6.ebuild 12061 RMD160 0b00e160e20da914e4bb3ebdf58f4e0fd910ae82 SHA1 7ffbeace779f070c20ca181626110717e37ef920 SHA256 3d15c1dc583213399f369579977780d11e81cca7bd8e8c8d94496df6ace35b42
-EBUILD vlc-1.0.9999.ebuild 12012 RMD160 01cd0e2f13cfc817768251dbfbcee8cbc3c93a15 SHA1 89d53b3a60fa8e335ae341e9cef11a22aed24886 SHA256 b3265530a61a3e4083d86cacf47cb2ab8313c9032672e378d4397bbab29fc691
+EBUILD vlc-1.0.6.ebuild 12265 RMD160 684f96f03185f0d28c2b4282df815252173fa1a5 SHA1 289ba0335d594279364177efd498a267bf875855 SHA256 04264e74eba0f15262aa93b661194923b2a5860196279df50dc84e4190134919
+EBUILD vlc-1.0.9999.ebuild 12217 RMD160 3eec1d182fa6f12894345165da6071b3f4ba5c21 SHA1 83bc5c5249a68618a85d937ad3bb7931187d0bc0 SHA256 8ac5307f2c23d9f5f996e9487f1e9a5815269ab8e670873376868f855059d059
 EBUILD vlc-1.1.0_pre2.ebuild 11656 RMD160 9c7ef7b180ce03cd3ff68a3e0b23e0488d1867b3 SHA1 f3fb31e13756be79ced600eebda47d5fefe4b634 SHA256 ec54d493da2e4974d1c8ff8c564f14912c6c663effc7c75ad0fa20d30bacbe4d
 EBUILD vlc-1.1.9999.ebuild 11602 RMD160 c92c9980eeb9ea27b4457a9793ce964c64683f74 SHA1 2ac86a41730a8f7b69a2812d6f1328ae81921593 SHA256 67493fd892938244f5ff6d19b74c45a94d1bbc00fcc58fae04c6cbbb30a8bec6
 EBUILD vlc-9999.ebuild 11599 RMD160 23255ecedbb9681eb3702de358ccea780011e645 SHA1 84b0657c20b4a9ef228ecb2f51bef5d94fbc5396 SHA256 a51937cbc2a3361dd871f38c42611a68eb1828e8e70297c65a44e9a3a5e261a2
-MISC ChangeLog 88408 RMD160 a0ff5a4f7b7f61d59596c75f348d0f32e17f1e83 SHA1 43ad670123d031b795c896d28b7646c2f49f407d SHA256 f1e227076a6e31c2d2abd7423846370ed7969342b914ae935a96c3dbaf898453
+MISC ChangeLog 88655 RMD160 f6f0304af0eba41cdc6e7a6987bacb9d06f0ab20 SHA1 888c73cd0f38f17823f016f22338aa2a6d3c6473 SHA256 39eb3a05a26ec21b6840fd14cc50f86ded79e9dc3462b139fcf080072231bc3e
 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvRf8gACgkQvFcC4BYPU0peyQCggCvToaEIXQMoJj7rs+4XSUP2
-BsMAoKQELHGp3nV4chjviX10EIDdJBf/
-=IXRV
+iEYEARECAAYFAkvRu68ACgkQvFcC4BYPU0ofAwCgrn2H5hygfSSDMB0rlLiCU4Rm
+vgcAoMbPnyWykZSBCZ5Jom1DrdhRaixK
+=1vVm
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-1.0.6.ebuild b/media-video/vlc/vlc-1.0.6.ebuild
index dd2abb1eee60dda31d5ad640ebc1ad9c61b17a9e..455569b4711c8b8ea5c0ab25e5853f209542de98 100644 (file)
--- a/media-video/vlc/vlc-1.0.6.ebuild
+++ b/media-video/vlc/vlc-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.1 2010/04/22 17:56:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.2 2010/04/23 15:24:24 aballier Exp $
 
 EAPI="2"
 
@@ -126,7 +126,11 @@ RDEPEND="
                sdl? ( >=media-libs/libsdl-1.2.8
                        sdl-image? ( media-libs/sdl-image ) )
                shout? ( media-libs/libshout )
-               skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+               skins? (
+                               x11-libs/qt-gui:4 x11-libs/qt-core:4
+                               x11-libs/libXext x11-libs/libX11
+                               media-libs/freetype media-fonts/dejavu
+                          )
                speex? ( media-libs/speex )
                svg? ( >=gnome-base/librsvg-2.9.0 )
                svga? ( media-libs/svgalib )
@@ -179,13 +183,11 @@ vlc_use_force() {
        use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
 }
 
-# Use when $2 depends strictly on $3
-# if use $1 then enable $2 and $3, otherwise disable $2
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
 vlc_use_enable_force() {
        if use $1 ; then
-               echo "--enable-$2 --enable-$3"
-       else
-               echo "--disable-$2"
+               echo "--enable-$2"
        fi
 }
 
@@ -196,17 +198,20 @@ pkg_setup() {
                eerror "the old ${PN} version and will not work."
                die "Unmerge vlc 0.9.x first"
        fi
-       vlc_use_needs skins truetype
-       vlc_use_force skins qt4
        vlc_use_needs cddax cdio
        vlc_use_needs vcdx cdio
        vlc_use_needs vcdx vcdinfo
        vlc_use_needs vcdinfo cdio
        vlc_use_needs bidi truetype
-       vlc_use_force remoteosd gcrypt
        vlc_use_needs fontconfig truetype
        vlc_use_needs libv4l2 v4l2
        vlc_use_needs libtiger kate
+       vlc_use_force remoteosd gcrypt
+       vlc_use_force skins truetype
+       vlc_use_force skins qt4
+       vlc_use_force skins X
+       vlc_use_force qt4 X
+       vlc_use_force vlm stream
        use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
        if use qt4 || use skins ; then
                qt4_pkg_setup
@@ -318,6 +323,7 @@ src_configure() {
                $(use_enable pulseaudio pulse) \
                $(use_enable pvr) \
                $(use_enable qt4) \
+               $(use_enable remoteosd) \
                $(use_enable rtsp realrtsp) \
                $(use_enable run-as-root) \
                $(use_enable samba smb) \
@@ -342,6 +348,7 @@ src_configure() {
                $(use_enable v4l2) \
                $(use_enable vcdinfo) \
                $(use_enable vcdx) \
+               $(use_enable vlm) \
                $(use_enable vorbis) \
                $(use_enable win32codecs loader) \
                $(use_enable wma-fixed) \
@@ -358,9 +365,12 @@ src_configure() {
                --disable-growl \
                --disable-optimizations \
                --enable-fast-install \
-               $(vlc_use_enable_force vlm vlm sout) \
-               $(vlc_use_enable_force skins skins2 qt4) \
-               $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+               $(vlc_use_enable_force qt4 x11) \
+               $(vlc_use_enable_force vlm sout) \
+               $(vlc_use_enable_force skins qt4) \
+               $(vlc_use_enable_force skins freetype) \
+               $(vlc_use_enable_force skins x11) \
+               $(vlc_use_enable_force remoteosd libgcrypt)
 }
 
 src_install() {

diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 3a26106fc7b43dc42dc5d5d16ba819df73e1a36b..918dcab287ddeb59723c91a4b9fd210a3e05e376 100644 (file)
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.39 2010/04/07 16:04:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.40 2010/04/23 15:24:24 aballier Exp $
 
 EAPI="2"
 
@@ -126,7 +126,11 @@ RDEPEND="
                sdl? ( >=media-libs/libsdl-1.2.8
                        sdl-image? ( media-libs/sdl-image ) )
                shout? ( media-libs/libshout )
-               skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+               skins? (
+                               x11-libs/qt-gui:4 x11-libs/qt-core:4
+                               x11-libs/libXext x11-libs/libX11
+                               media-libs/freetype media-fonts/dejavu
+                          )
                speex? ( media-libs/speex )
                svg? ( >=gnome-base/librsvg-2.9.0 )
                svga? ( media-libs/svgalib )
@@ -179,13 +183,11 @@ vlc_use_force() {
        use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
 }
 
-# Use when $2 depends strictly on $3
-# if use $1 then enable $2 and $3, otherwise disable $2
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
 vlc_use_enable_force() {
        if use $1 ; then
-               echo "--enable-$2 --enable-$3"
-       else
-               echo "--disable-$2"
+               echo "--enable-$2"
        fi
 }
 
@@ -196,17 +198,20 @@ pkg_setup() {
                eerror "the old ${PN} version and will not work."
                die "Unmerge vlc 0.9.x first"
        fi
-       vlc_use_needs skins truetype
-       vlc_use_force skins qt4
        vlc_use_needs cddax cdio
        vlc_use_needs vcdx cdio
        vlc_use_needs vcdx vcdinfo
        vlc_use_needs vcdinfo cdio
        vlc_use_needs bidi truetype
-       vlc_use_force remoteosd gcrypt
        vlc_use_needs fontconfig truetype
        vlc_use_needs libv4l2 v4l2
        vlc_use_needs libtiger kate
+       vlc_use_force remoteosd gcrypt
+       vlc_use_force skins truetype
+       vlc_use_force skins qt4
+       vlc_use_force skins X
+       vlc_use_force qt4 X
+       vlc_use_force vlm stream
        use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
        if use qt4 || use skins ; then
                qt4_pkg_setup
@@ -318,6 +323,7 @@ src_configure() {
                $(use_enable pulseaudio pulse) \
                $(use_enable pvr) \
                $(use_enable qt4) \
+               $(use_enable remoteosd) \
                $(use_enable rtsp realrtsp) \
                $(use_enable run-as-root) \
                $(use_enable samba smb) \
@@ -342,6 +348,7 @@ src_configure() {
                $(use_enable v4l2) \
                $(use_enable vcdinfo) \
                $(use_enable vcdx) \
+               $(use_enable vlm) \
                $(use_enable vorbis) \
                $(use_enable win32codecs loader) \
                $(use_enable wma-fixed) \
@@ -358,9 +365,12 @@ src_configure() {
                --disable-growl \
                --disable-optimizations \
                --enable-fast-install \
-               $(vlc_use_enable_force vlm vlm sout) \
-               $(vlc_use_enable_force skins skins2 qt4) \
-               $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+               $(vlc_use_enable_force qt4 x11) \
+               $(vlc_use_enable_force vlm sout) \
+               $(vlc_use_enable_force skins qt4) \
+               $(vlc_use_enable_force skins freetype) \
+               $(vlc_use_enable_force skins x11) \
+               $(vlc_use_enable_force remoteosd libgcrypt)
 }
 
 src_install() {