From d11ae455bb14b91d77af350f010388c6fa5a3233 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 17 Feb 2008 14:10:08 +0000 Subject: [PATCH] Fixed automagic libXss depend, revealed by asneeded and depclean. Package-Manager: portage-2.1.4.4 --- media-video/mplayer/ChangeLog | 6 +++++- media-video/mplayer/Manifest | 14 ++------------ media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild | 13 +++++++++---- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 07bfefff44e8..dac871513332 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.554 2008/02/17 13:10:02 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.555 2008/02/17 14:10:08 drac Exp $ + + 17 Feb 2008; Samuli Suominen + mplayer-1.0_rc2_p25993.ebuild: + Fixed automagic libXss depend, revealed by asneeded and depclean. 17 Feb 2008; Christoph Mende mplayer-1.0_rc2_p25993.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 46f0fa894446..e0412c5b8fd0 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX mplayer-1.0_rc2_p24929-pulse.patch 1217 RMD160 e6a164ce597e677642ec8f1840e90759deb45eac SHA1 62cae651ec5955db3c41313000a5abfe290eaeb0 SHA256 9f0d13c5cf723be3d9fcc88193b33f0eb2b9f0458c1ed1d8049df3bdecfcd33a DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 @@ -11,13 +8,6 @@ DIST mplayer-1.0_rc2_p25993.tar.bz2 7949013 RMD160 47d580a2254d7f149f6d4b1db6f79 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 EBUILD mplayer-1.0_rc2_p24929-r1.ebuild 15454 RMD160 2f0bcc97d572667fd202ca82170752d13a0611ca SHA1 5a3f81a64400883c857b1a2c8b99d47a59ee0ee8 SHA256 c1bbe576a5fd17bf8b145a583dbfe39b3679b8538270b414cb16098dad8fe542 EBUILD mplayer-1.0_rc2_p24929-r2.ebuild 15534 RMD160 03382c15c954e927f1847b519bc9f153af1a7e3d SHA1 e19e65249d7a2f450d530d2dd95229bd35293444 SHA256 dd6cd6c96b13006a6d2078b3b77eb718649efbecc5fc7d2917eaf5fd7d9f4931 -EBUILD mplayer-1.0_rc2_p25993.ebuild 15931 RMD160 848b3a36daa95dd4c173fa8e6a702bbcf14af855 SHA1 3673f3ab28dd5daf66b14c2b9ac727812b1e1189 SHA256 f6ebb66bae848f67a09c029537d2081d336b0a2d013c68235106f27921775c33 -MISC ChangeLog 97400 RMD160 fefc53000449f3cc2591e044841d806db71e0060 SHA1 49bcc5e0895c4ebd8328f1edca12ab6ec90e60de SHA256 14bb31a3863355513044ddd7d7bd37fb5a26426df3fa3e3d76ddd1823112fa54 +EBUILD mplayer-1.0_rc2_p25993.ebuild 16080 RMD160 92194fb137b8287b8781f0191e7ddbc44cd869e2 SHA1 c56ae8c8c0187262f03bc121bc4351dbfb79e38a SHA256 622c41f8b6c5995f87f7df8ae0116d9fcc4b1a7d2acc2064f9cc6879e586ded4 +MISC ChangeLog 97548 RMD160 41a111e2f8b27f494b3546f552da93853521dd7b SHA1 e8a58d95c0b0e1fba945e26a5f82c89b167439c1 SHA256 a0aba6a85f9c2621af1dc867245f8be729be99c01824189a7e30d2736aa62c45 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHuDIzKhnDs22gwa8RAlvVAKChqa6bh2BZYtlZakfr9YMf5swHWgCgpmXO -/f+Ti07n5q3R+WHeME2CiKc= -=le74 ------END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild index 7966f419129d..919c4496f2e6 100644 --- a/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild,v 1.8 2008/02/17 13:10:02 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild,v 1.9 2008/02/17 14:10:08 drac Exp $ inherit eutils flag-o-matic multilib @@ -9,7 +9,10 @@ IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amrnb amrwb arts bidi bl bindist cddb cdio cdparanoia cpudetection custom-cflags debug dga doc dts dvb directfb dvd dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 -musepack nas nemesi unicode vorbis opengl openal oss png pnm pulseaudio quicktime radio rar real rtc samba sdl speex srt sse sse2 ssse3 svga teletext tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama xv xvid xvmc zoran" +musepack nas nemesi unicode vorbis opengl openal oss png pnm pulseaudio +quicktime radio rar real rtc samba sdl speex srt sse sse2 ssse3 svga teletext +tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama +xscreensaver xv xvid xvmc zoran" VIDEO_CARDS="s3virge mga tdfx vesa" @@ -108,7 +111,8 @@ RDEPEND="sys-libs/ncurses xvid? ( media-libs/xvid ) X? ( x11-libs/libXxf86vm x11-libs/libXext - )" + ) + xscreensaver? ( x11-libs/libXScrnSaver )" # video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first DEPEND="${RDEPEND} @@ -124,6 +128,7 @@ DEPEND="${RDEPEND} x11-proto/xf86vidmodeproto ) X? ( x11-proto/xextproto x11-proto/xf86vidmodeproto ) + xscreensaver? ( x11-proto/scrnsaverproto ) iconv? ( virtual/libiconv )" # Make sure the assembler USE flags are unmasked on amd64 # Remove this once default-linux/amd64/2006.1 is deprecated @@ -159,7 +164,6 @@ pkg_setup() { } src_unpack() { - unpack ${A} if ! use truetype ; then @@ -207,6 +211,7 @@ src_compile() { ################ #Optional features# ############### + use xscreensaver || myconf="${myconf} --disable-xss" use bidi || myconf="${myconf} --disable-fribidi" use bl && myconf="${myconf} --enable-bl" use enca || myconf="${myconf} --disable-enca" -- 2.26.2