improve font deps, by Luke-Jr, bug #392689: use any ttf font when fontconfig is enabl...

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 19699ff7d34ee62a245c6cef97d0b48a4aeaa945..b454de57212b96333e33e77ee1e997203b5a03f6 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.752 2011/11/11 12:21:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.753 2011/12/06 12:29:01 aballier Exp $
+
+  06 Dec 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.12.ebuild,
+  vlc-1.1.9999.ebuild, vlc-1.2.0_pre1.ebuild, vlc-9999.ebuild:
+  improve font deps, by Luke-Jr, bug #392689: use any ttf font when fontconfig
+  is enabled and force dejavu if not because its accessed by path
 
   11 Nov 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.12.ebuild,
   vlc-1.1.9999.ebuild:

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d31c2bfbbf950c79b3e60d77f2a28430bfae0001..64138b547d0e538bb3e6007a522147e32aab399a 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,16 +5,16 @@ DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c
 DIST vlc-1.2.0-pre1.tar.xz 16899100 RMD160 82f49619606bba26214b7c7206d0e592ec94f9bd SHA1 72b38f2c97cad4f143b16a2891f083bfab5b5174 SHA256 263bd69c5b0cf3b363d10896f373d6dc8b78feb208d51bcbc0d7260ef507ebc0
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.12.ebuild 12405 RMD160 36f817985830dfc42e4fcda1db510f82ca3d3861 SHA1 752cd6599f73cf11afd02e62c697a7fa64f1e7dc SHA256 0785ec7c088eaa6a4ec24f9bae0330fc87d6c1da4ec5705f3eac3f6395897c3e
-EBUILD vlc-1.1.9999.ebuild 12318 RMD160 8feed2fea0b23653880ca8b10455cfea8f215a5c SHA1 8ff6afc98420d5ab0c1d898cc7792ee5668c04b5 SHA256 950a5093ec8c644eef277bdebaded13964364e390653751c546b88d529add484
-EBUILD vlc-1.2.0_pre1.ebuild 10874 RMD160 0f36dda73201c6824db67478a2e2a13b57e96482 SHA1 cb1e634c4249c80b3887fa1cdef1c235365b0709 SHA256 71eff7ff28883eab85a11ee61d63f32ab776c1cd7e13039701e417711a795f21
-EBUILD vlc-9999.ebuild 10870 RMD160 59bf90bcb1b45ab33bd51a2854e590139ab93e61 SHA1 177045f0721c5ac8238ca5142b37fb79be3777a7 SHA256 11379383b7385aa8ca5d2d66b50af32d103517aa9c1d47156a832832cfece165
-MISC ChangeLog 111709 RMD160 2ec3d0f9671de18f30e54d86db4450a0bf3c117b SHA1 b9fe941117698a153984ce97a1655025e9888e74 SHA256 a0e471af367be75dc9741348aa1f8aa5a8bef6b5e4d4c7183e55f44ef1964e7c
+EBUILD vlc-1.1.12.ebuild 12443 RMD160 0f7d8e6fa9e24cf498e881a8365182702ab3356a SHA1 c2efc5e3ed66ceeea7c7fcc81a8666c1bd3da892 SHA256 8a3f7629154a5f8bba332a7d92156380abe1d2ba8a59865303fbf3ab34e317d4
+EBUILD vlc-1.1.9999.ebuild 12356 RMD160 4a94c2052b9b29106be368ef97220ed081ebb55f SHA1 bd9b2041cc896a051b6088a8367a02d191a243d3 SHA256 8c0dc3634fd02cee4262a3bed8d8e113a11af61a6a9422771a58f48d9a0f2647
+EBUILD vlc-1.2.0_pre1.ebuild 10912 RMD160 0fb3eefdff4f1d858549369ecbce7aed35a5efe2 SHA1 54fd68119c40a1be0faf9076809ca79e193944c7 SHA256 6fc3a47415476e1b76d775b7c9db0bfc3b725f99b6a11283d3b22835ad51a74a
+EBUILD vlc-9999.ebuild 10908 RMD160 89808d645306f22eb9ee7f6d1fa75111b85b5a3e SHA1 81dd72181308d6370962ab2fafc1fdba07b28537 SHA256 40fc53c841038af1ecbf0f017b925fa9a9f3e1979eef9d493805be5f2be808a8
+MISC ChangeLog 111989 RMD160 6bb341f80c12ac2feaa2f44f08be0da50a4419e2 SHA1 4ef211b2fc6729fd38950164356ea3f21695c813 SHA256 311bb4eed785c17dc40aa169545c37eead6f9e2fb6cdd94fb168ee2e7c255018
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk69EzsACgkQvFcC4BYPU0pJNACfao1FkMXRk328eVAbZuqdP1ob
-qhYAn0x5AhGphi29LrQKJCVOox6uAI7z
-=AgKL
+iEYEARECAAYFAk7eCpMACgkQvFcC4BYPU0r63QCgpfvlNb+6j0lkDuAcsDyU40LF
+eXcAnjbbnjB21pb59wBM4Wv+kAimMXyi
+=3p6b
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-1.1.12.ebuild b/media-video/vlc/vlc-1.1.12.ebuild
index e63998b940725a8cf9b17f1098f0e99e38d20a68..121f87d82a994fbcd46b234c0b793322c136078e 100644 (file)
--- a/media-video/vlc/vlc-1.1.12.ebuild
+++ b/media-video/vlc/vlc-1.1.12.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/vlc/vlc-1.1.12.ebuild,v 1.7 2011/11/11 12:21:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v 1.8 2011/12/06 12:29:01 aballier Exp $
 
 EAPI="3"
 
@@ -129,7 +129,8 @@ RDEPEND="
                svga? ( media-libs/svgalib )
                taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
                theora? ( >=media-libs/libtheora-1.0_beta3 )
-               truetype? ( media-libs/freetype media-fonts/dejavu )
+               truetype? ( media-libs/freetype virtual/ttf-fonts
+                       !fontconfig? ( media-fonts/dejavu ) )
                twolame? ( media-sound/twolame )
                udev? ( >=sys-fs/udev-142 )
                upnp? ( net-libs/libupnp )

diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 06351cca02f4877c541c96fdab480ce213ccb528..00ce04ff6f4881e635c71389a03dae193c39d3f2 100644 (file)
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.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/vlc/vlc-1.1.9999.ebuild,v 1.35 2011/11/11 12:21:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.36 2011/12/06 12:29:01 aballier Exp $
 
 EAPI="3"
 
@@ -127,7 +127,8 @@ RDEPEND="
                svga? ( media-libs/svgalib )
                taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
                theora? ( >=media-libs/libtheora-1.0_beta3 )
-               truetype? ( media-libs/freetype media-fonts/dejavu )
+               truetype? ( media-libs/freetype virtual/ttf-fonts
+                       !fontconfig? ( media-fonts/dejavu ) )
                twolame? ( media-sound/twolame )
                udev? ( >=sys-fs/udev-142 )
                upnp? ( net-libs/libupnp )

diff --git a/media-video/vlc/vlc-1.2.0_pre1.ebuild b/media-video/vlc/vlc-1.2.0_pre1.ebuild
index 9135d071f3024edd0f77b016085bec23bb659887..cc196f92f8405c58ef7e4a9f5ad3fce74c3f167c 100644 (file)
--- a/media-video/vlc/vlc-1.2.0_pre1.ebuild
+++ b/media-video/vlc/vlc-1.2.0_pre1.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/vlc/vlc-1.2.0_pre1.ebuild,v 1.1 2011/11/04 12:16:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.2.0_pre1.ebuild,v 1.2 2011/12/06 12:29:01 aballier Exp $
 
 EAPI="4"
 
@@ -129,7 +129,8 @@ RDEPEND="
                swscale? ( virtual/ffmpeg )
                taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
                theora? ( >=media-libs/libtheora-1.0_beta3 )
-               truetype? ( media-libs/freetype media-fonts/dejavu )
+               truetype? ( media-libs/freetype virtual/ttf-fonts
+                       !fontconfig? ( media-fonts/dejavu ) )
                twolame? ( media-sound/twolame )
                udev? ( >=sys-fs/udev-142 )
                upnp? ( net-libs/libupnp )

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0fe3ad177f49ec3a5e3747bca7d8cfa0b5e435d2..42c8b093165f6e91a0975fe1af4c358a1a178015 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.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/vlc/vlc-9999.ebuild,v 1.151 2011/11/04 12:16:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.152 2011/12/06 12:29:01 aballier Exp $
 
 EAPI="4"
 
@@ -129,7 +129,8 @@ RDEPEND="
                swscale? ( virtual/ffmpeg )
                taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
                theora? ( >=media-libs/libtheora-1.0_beta3 )
-               truetype? ( media-libs/freetype media-fonts/dejavu )
+               truetype? ( media-libs/freetype virtual/ttf-fonts
+                       !fontconfig? ( media-fonts/dejavu ) )
                twolame? ( media-sound/twolame )
                udev? ( >=sys-fs/udev-142 )
                upnp? ( net-libs/libupnp )