4 files changed, 28 insertions, 20 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a50293d812f9..f562cfed70fc 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.289 2005/04/07 15:05:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.290 2005/04/11 21:01:50 luckyduck Exp $
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild:
+  added support for blinkenlights, fixes #86776. we also dont install useless
+  menu entries any longer if use -gtk, fixes bug #86399
 
   07 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
   mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1c6beefc19cb..6f8f62103911 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 394220a06dda1782639917c269bf2cf6 mplayer-1.0_pre6-r2.ebuild 16570
+MD5 308809413b66a905e14141fa6cd9f847 mplayer-1.0_pre6-r2.ebuild 16649
 MD5 8b78266165bb3ae9b9e0e62894f543a9 mplayer-1.0_pre5-r5.ebuild 16809
 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
-MD5 6fb31b2d85b79c724885d88f5c795833 mplayer-1.0_pre6-r1.ebuild 16570
+MD5 f9a04596156a56a38a73c5d4a7cf3a43 mplayer-1.0_pre6-r1.ebuild 16574
 MD5 8f9db270042c019287fc969f41ac8801 mplayer-1.0_pre5-r4.ebuild 16480
 MD5 6922dce70bbab5cbe8c21e003ffd5226 mplayer-1.0_pre4-r7.ebuild 12234
-MD5 567946540098bae005ae1d9e60d6878e ChangeLog 53328
+MD5 64042279fe9a691c6ff953f9692a3816 ChangeLog 53573
 MD5 a899c1b15e110f948f5eaba5746a7016 mplayer-1.0_pre5-r3.ebuild 14739
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
@@ -55,7 +55,7 @@ MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCVUw/06ebR+OMO78RAggdAJ9t0v6wxgXSRldYzIb2VDKSKcZL3QCfSAH/
-/isVNZAfDhoDVd2W1S6l+P4=
-=s/O+
+iD8DBQFCWuXW06ebR+OMO78RAij4AJ4iAxiX2tIEzbA3nn1Pe2VPVCJq6ACePgGl
+yOaZSU7yKBg9dRt7aJdrX6g=
+=/U6G
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
index babe5df3c4e2..d26f0e0bc3e2 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r1.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/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.5 2005/04/07 15:05:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r1.ebuild,v 1.6 2005/04/11 21:01:50 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -501,12 +501,12 @@ src_install() {
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
 		dosym mplayer /usr/bin/gmplayer
-	fi
 
-	insinto /usr/share/pixmaps
-	newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-	insinto /usr/share/applications
-	doins ${FILESDIR}/mplayer.desktop
+		insinto /usr/share/pixmaps
+		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
+		insinto /usr/share/applications
+		doins ${FILESDIR}/mplayer.desktop
+	fi
 
 	dodir /usr/share/mplayer/fonts
 	local x=
diff --git a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
index 1b9963b04e69..a4004a950499 100644
--- a/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.5 2005/04/07 15:05:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r2.ebuild,v 1.6 2005/04/11 21:01:50 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts avi bidi bl debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmxext mythtv nas nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -435,6 +435,9 @@ src_compile() {
 
 	use live && myconf="${myconf} --with-livelibdir=/usr/$(get_libdir)/live"
 
+	# support for blinkenlights
+	use bl && myconf="${myconf} --enable-bl"
+
 	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
 	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
 	# it *will* be removed asap; in the meantime, doesn't hurt anything.
@@ -501,12 +504,12 @@ src_install() {
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
 		dosym mplayer /usr/bin/gmplayer
-	fi
 
-	insinto /usr/share/pixmaps
-	newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-	insinto /usr/share/applications
-	doins ${FILESDIR}/mplayer.desktop
+		insinto /usr/share/pixmaps
+		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
+		insinto /usr/share/applications
+		doins ${FILESDIR}/mplayer.desktop
+	fi
 
 	dodir /usr/share/mplayer/fonts
 	local x=