Remove USE="X" as per bug 387537. Thanks to Ulrich Müller for the report.

Package-Manager: portage-2.1.10.30/cvs/Linux i686

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 1c964cb819897a051834562ab53a7792bb942372..e148f760362e4daa79afce469923d0ecad9cfb4a 100644 (file)
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.167 2011/10/04 19:04:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.168 2011/10/23 18:02:04 billie Exp $
+
+  23 Oct 2011; Daniel Pielmeier <billie@gentoo.org> mjpegtools-2.0.0-r1.ebuild:
+  Remove USE="X" as per bug 387537. Thanks to Ulrich Müller for the report.
 
   04 Oct 2011; Jeroen Roovers <jer@gentoo.org> mjpegtools-2.0.0-r1.ebuild:
   Stable for HPPA (bug #382225).

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 221084032b5fcd99aa5ccdfff740baaa8d632cd4..14149e9301d44860e45f4ec8bc3426d8de069b88 100644 (file)
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 RMD160 1eb27563b08e2f6f2e3fc014865119914a419bb2 SHA1 12043ae95416c173ee413fa774c0c6a3c69ee9ff SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6
 DIST mjpegtools-2.0.0.tar.gz 1749671 RMD160 454e23bedb2bd592912a546d0621b5c3662c3bb2 SHA1 f411e8573d446711dbe8455a6ae9257e1afe1e70 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
-EBUILD mjpegtools-2.0.0-r1.ebuild 2085 RMD160 62d15cc24826592937d14631febb6d63c18f0a1c SHA1 35cf5a113cee5a15f72aa2fab13e99cee683f2f5 SHA256 0e39531a5e5270f003ecc8a37f304ab0ecdc897d16c8bbf1dc61375bddc1bc37
-MISC ChangeLog 29568 RMD160 bab49a37d4f9b768a71b039010ea71796cdfe7be SHA1 f1541146c7285fa0f414f1cdcd6461609e37dc1b SHA256 e70494431f10a767c314b6636ce8f4f6a910f2959d628f5b52ffad5719d0bd31
+EBUILD mjpegtools-2.0.0-r1.ebuild 2046 RMD160 80011ef33e31e4f015d53945183f26d519af51e6 SHA1 0e496a5b736357c0eebee33039ece1cca3ac0cba SHA256 5bd04e641c06b5e2c99b89a1b4c90bff37373b28c125bb23539c1cf1616b676c
+MISC ChangeLog 29729 RMD160 e1c935822c3e6cb7270baef7b10e133ed04b3630 SHA1 b3b049e69dc07a03620d089a520acdee74af4515 SHA256 fa69e398ccf806ba21d46f316ce939bc61ad25c16d728e597323f807badb6ecb
 MISC metadata.xml 372 RMD160 2fbc8c72d04adbfabfa9c6d2f63f9861c9b07ed2 SHA1 343eb2adf749af0ea042f9d6f005155998034b19 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6LWLIACgkQVWmRsqeSphM/0QCdHzzcYIPMUZ5dwvdUEspdbM/L
-UicAn1QqVID8btxXHPUEtxztXJIUeb7J
-=SaP+
+iEYEAREIAAYFAk6kVq4ACgkQlcuUeyFa0U1nwgCeJMU5pkiNmUwpMqXCnWd76C14
+9aYAn1QuheeFAuohJsmex+0CsotsPSDf
+=V3eH
 -----END PGP SIGNATURE-----

diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
index d975cfb7908c79985665c8e4898d1eb027a107fa..eb0a3508ffa5482efeef745ca24556403bdc0eb2 100644 (file)
--- a/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild,v 1.8 2011/10/04 19:01:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild,v 1.9 2011/10/23 18:02:04 billie Exp $
 
 EAPI=4
 
@@ -15,22 +15,19 @@ SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l X"
-REQUIRED_USE="!X? ( !gtk !sdl )
-       X? ( sdl )
-       sdlgfx? ( sdl )"
+IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
+REQUIRED_USE="sdlgfx? ( sdl )"
 
 RDEPEND="virtual/jpeg
        quicktime? ( media-libs/libquicktime )
        dv? ( >=media-libs/libdv-0.99 )
        png? ( media-libs/libpng )
        dga? ( x11-libs/libXxf86dga )
-       X? ( x11-libs/libX11
+       gtk? ( x11-libs/gtk+:2 )
+       sdl? ( >=media-libs/libsdl-1.2.7-r3
+               x11-libs/libX11
                x11-libs/libXt
-               gtk? ( x11-libs/gtk+:2 )
-               sdl? ( >=media-libs/libsdl-1.2.7-r3
-                       sdlgfx? ( media-libs/sdl-gfx )
-               )
+               sdlgfx? ( media-libs/sdl-gfx )
         )"
 
 DEPEND="${RDEPEND}
@@ -73,7 +70,7 @@ src_configure() {
                $(use_with sdl libsdl) \
                $(use_with sdlgfx) \
                $(use_with v4l) \
-               $(use_with X x)
+               $(use_with sdl x)
 }
 
 src_install() {