allow ass and truetype without X, by Andrew Savchenko, bug #299405

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a80e5f1cda2971b67ba35a6034c05687e8de4b73..b29c68fb25233e46dd3e3a82a05d4bb9e0c7f52b 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.724 2010/04/24 12:33:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.725 2010/04/24 12:44:45 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  allow ass and truetype without X, by Andrew Savchenko, bug #299405
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   use system libass, require freetype 2.2.1 at least

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ecfe49074cd75dd061213ac7cb05600508c7807c..a15229eecbec4d1d6d53e5eda5d4ab618efa7312 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-9999.ebuild 19850 RMD160 aedbc1e12a1e1f33c4b92a24e8027b633884d2f1 SHA1 34496b846fce2b19c0b2eb4b9066199891885eff SHA256 c5aa9360c987ea5c40cdde20a01a2b475f30ddd87207751a7bfa54aa9d2761f0
-MISC ChangeLog 127981 RMD160 d91ab0b70a6721f3573df915192f7a849db01386 SHA1 3e5e71df3deb135775ca0738bc14a5639405d8ff SHA256 79544f748c3f1f0bd1b0a486af30b0e41e5e4c48098d6ebf9e3bbf5a19127c44
+EBUILD mplayer-9999.ebuild 19848 RMD160 d5ac03c8ba6f919f204b72aa496d132a75db0e97 SHA1 c9dafab336890ca289ac05fe84d22e84bab999f2 SHA256 c54415b984f853dfa7ce9bb78c68c99ee0eeabece7aa50f8d22b393702010ec9
+MISC ChangeLog 128124 RMD160 8bdebd1e24c0729fb809d0c326f20df7dc834a0d SHA1 afe74d8b482e4bd922a589e84a6898e4b020c0a6 SHA256 8a66b7860cba1da932b6fa21817d163dc3b0bf3ee6693979ed956e62ee716209
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvS5QQACgkQvFcC4BYPU0oaDwCfT5alWn+jgaDZ9dysHbIgH8W4
-OKQAn0jrXAz2EqFwpjg6+lZ2szzfmbXD
-=Obox
+iEYEARECAAYFAkvS58MACgkQvFcC4BYPU0qpRgCeIl3kEXsFbEfatpqw4oZgup38
+6FIAnj1qJtZ0neD6yK0cpgbSEO5dCNGH
+=+gz1
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 5ea04ab229ef1e47762bf64e9fcbbb3425481009..fba000873121c2dd3d5460a99c73c8dc389caf51 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.39 2010/04/24 12:33:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.40 2010/04/24 12:44:45 aballier Exp $
 
 EAPI="2"
 
@@ -70,7 +70,6 @@ RDEPEND+="
        )
        X? (
                ${X_RDEPS}
-               ass? ( ${FONT_RDEPS} media-libs/libass )
                dga? ( x11-libs/libXxf86dga )
                ggi? (
                        media-libs/libggi
@@ -82,7 +81,6 @@ RDEPEND+="
                        x11-libs/libXi
                )
                opengl? ( virtual/opengl )
-               truetype? ( ${FONT_RDEPS} )
                vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) )
                xinerama? ( x11-libs/libXinerama )
                xscreensaver? ( x11-libs/libXScrnSaver )
@@ -93,6 +91,7 @@ RDEPEND+="
        )
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
+       ass? ( ${FONT_RDEPS} media-libs/libass )
        bidi? ( dev-libs/fribidi )
        bs2b? ( media-libs/libbs2b )
        cdio? ( dev-libs/libcdio )
@@ -143,6 +142,7 @@ RDEPEND+="
        speex? ( media-libs/speex )
        svga? ( media-libs/svgalib )
        theora? ( media-libs/libtheora )
+       truetype? ( ${FONT_RDEPS} )
        vorbis? ( media-libs/libvorbis )
        xanim? ( media-video/xanim )
 "