summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-03 20:53:28 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-03 20:53:28 +0000
commitcb01b69036296618e85c478f7f21d4ad6cff71c3 (patch)
treefba6288a502f61cd67f82c7d092bab6ea22031cb /media-video/mplayer
parentx86 stable, bug #279685 (diff)
downloadhistorical-cb01b69036296618e85c478f7f21d4ad6cff71c3.tar.gz
historical-cb01b69036296618e85c478f7f21d4ad6cff71c3.tar.bz2
historical-cb01b69036296618e85c478f7f21d4ad6cff71c3.zip
Pull in dejavu or ttf-bitstream-vera with USE ass wrt #263185.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest14
-rw-r--r--media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild6
3 files changed, 10 insertions, 16 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d8fc06a0935f..eabda26392ef 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.667 2009/08/03 20:45:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.668 2009/08/03 20:53:28 ssuominen Exp $
+
+ 03 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ mplayer-1.0_rc2_p20090731.ebuild:
+ Pull in dejavu or ttf-bitstream-vera with USE ass wrt #263185.
03 Aug 2009; Markus Meier <maekke@gentoo.org>
mplayer-1.0_rc2_p20090731.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b0da4b9f0c79..94f8a80b00e7 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_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7
AUX mplayer-1.0_rc2_p20090731-linguas.patch 699 RMD160 eccde57fe14b664e962ca5c997fa6b72ebadc763 SHA1 0f036a975250a7ef6429f9c6dce036453c3a1d25 SHA256 c0939c548249afbc45905570c99bb6593175ebaf6e34bfceda284253600d9d22
@@ -18,14 +15,7 @@ DIST mplayer-1.0_rc2_p20090731.tar.bz2 8240152 RMD160 365036583cd4e37f6f77a3e56d
DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
EBUILD mplayer-1.0_rc2_p20090322.ebuild 19438 RMD160 1d62d123f9f290239c013618af8518eaac4116b3 SHA1 651460991a16b05802b184c8d64af2a4775dd051 SHA256 51eed17bc8c82f38a4169c5428fd38e6ca81dc495549c3bd9f5dfefd394b9f80
EBUILD mplayer-1.0_rc2_p20090530.ebuild 19401 RMD160 1e61fb674b084fce28d706c6dce522088dd900be SHA1 93d42023def905c5043dbbbab8294e70c964962a SHA256 ecb9341c0046799a4dfa0e04da97dcfddd78f190f20ad061e891c872dbc60f8a
-EBUILD mplayer-1.0_rc2_p20090731.ebuild 18763 RMD160 bca36d0f504def9f67a1127347db95e0745e6196 SHA1 8eb50a3ab9608aa327b43b7d46bec619a570c1c0 SHA256 eb26163f2e0291f1e7265f34dff87a47857340e26f2c5054debb266bd608a0ad
+EBUILD mplayer-1.0_rc2_p20090731.ebuild 18823 RMD160 e5457de909fb01e089b68e2bdb24a579c7a10551 SHA1 e9c254fc415a36e0d4f938376be4002a25eb7ae3 SHA256 62395aa5ad137bf73d65e357721244e1452dfa9962cb9100df16873721e3c385
EBUILD mplayer-9999.ebuild 20148 RMD160 8240f26bb00fc3f7ed9c04d85e01b21d31de886f SHA1 5c59663a78044798ee791b687a1ee9fe2263ab9b SHA256 3ac96f9b00c2377178afe0bd1f46961a37767e273176b89623d6ad410f7a4f40
-MISC ChangeLog 118731 RMD160 f041010509fbb8fb169d999cc2595b0b331ec0f2 SHA1 108d4efa86fcdee2ae307bf71bf21c4d459e2e06 SHA256 f8e1a62ae01fb6f2d9ca5f5d8bf03b43dc600e64712ef6c2a91d93530359a506
+MISC ChangeLog 118890 RMD160 0665643b69d24ff2a15cff14b517cc87dbd8bc38 SHA1 7dc3fa8e576e0120b84272895fd9f8981b54eddf SHA256 4fd6e00bea9017f55769ffb806a67e55e3930764017483ec554eed4600f2f3d3
MISC metadata.xml 3718 RMD160 7869757d1092b1617d66093317124e1557017bb2 SHA1 91b505fac335ed7d1fe67e17a0cea75d57507a85 SHA256 ac51a29eb7775137f71ca5b7350febd48bba0cfd5ce0d69de20cf6a2cfdc613c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp3TLcACgkQkKaRLQcq0GJ0zACcDdFEZluGulsqBTiYxdbr8POU
-0KQAn03oDqIpWexAf9jtX++zbM5/+UGw
-=MIIM
------END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
index 40aba9d1cff2..80c6464094f0 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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_p20090731.ebuild,v 1.13 2009/08/03 20:45:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild,v 1.14 2009/08/03 20:53:28 ssuominen Exp $
EAPI="2"
@@ -50,8 +50,8 @@ RDEPEND="sys-libs/ncurses
)
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
- ass? ( media-libs/freetype:2
- media-libs/fontconfig )
+ ass? ( || ( media-fonts/dejavu media-found/ttf-bitstream-vera )
+ media-libs/freetype:2 media-libs/fontconfig )
openal? ( media-libs/openal )
bidi? ( dev-libs/fribidi )
cdio? ( dev-libs/libcdio )