MPlayer now installs the default config in /etc/mplayer/mplayer.conf...

Package-Manager: portage-2.1.2.3

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 21b19898bc5d9f8b5fd2236dac75abae82e23027..6aec334d8bf2be24b449245b641dd53c6f0cbbf1 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.469 2007/04/02 22:50:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.470 2007/04/09 16:22:47 lu_zero Exp $
+
+  09 Apr 2007; Luca Barbato <lu_zero@gentoo.org>
+  mplayer-1.0_rc2_pre20070321-r4.ebuild:
+  MPlayer now installs the default config in /etc/mplayer/mplayer.conf
 
   02 Apr 2007; Luca Barbato <lu_zero@gentoo.org>
   mplayer-1.0_rc2_pre20070321-r4.ebuild:

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a8aa55d1f459f5f1f255452b1152782910416f16..5fee2ccc1222b7e87fcad11152697552a9c7f1d7 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -45,14 +45,14 @@ EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
-EBUILD mplayer-1.0_rc2_pre20070321-r4.ebuild 17366 RMD160 f3de8681f85733870be18f9128127c22a283c7b1 SHA1 2ee4c6abd9d699f57977983691ef0369f887722f SHA256 3ab655e125081c3efeac4d5bfec171a2f64a2bc097a58dca7742069fe6bfbb31
-MD5 43b614daaedb6f45072da8e54d8443ea mplayer-1.0_rc2_pre20070321-r4.ebuild 17366
-RMD160 f3de8681f85733870be18f9128127c22a283c7b1 mplayer-1.0_rc2_pre20070321-r4.ebuild 17366
-SHA256 3ab655e125081c3efeac4d5bfec171a2f64a2bc097a58dca7742069fe6bfbb31 mplayer-1.0_rc2_pre20070321-r4.ebuild 17366
-MISC ChangeLog 84311 RMD160 dae9696774270345d5632b5c08bc4b2c24038bf5 SHA1 aa070705e25a7d591fe3cc8e8616413d941df6db SHA256 26b75af82c627f7e4dc0fb8f47345ad04aff8c2c6910e9d4fea956d316a2ec9e
-MD5 0872948788174b1388d290eb9e34ab55 ChangeLog 84311
-RMD160 dae9696774270345d5632b5c08bc4b2c24038bf5 ChangeLog 84311
-SHA256 26b75af82c627f7e4dc0fb8f47345ad04aff8c2c6910e9d4fea956d316a2ec9e ChangeLog 84311
+EBUILD mplayer-1.0_rc2_pre20070321-r4.ebuild 17382 RMD160 5174963be7c2587143da649b7b2c9617653d73cc SHA1 5c1d33d99b86500dbb3af6fae3cde74189471392 SHA256 05c70f6f9e73bdbbc7b7255e0adea420d87bff01b68d2eaec24c3c07848f7d77
+MD5 4ba8e32bcd142ef3ceaba302f43a756c mplayer-1.0_rc2_pre20070321-r4.ebuild 17382
+RMD160 5174963be7c2587143da649b7b2c9617653d73cc mplayer-1.0_rc2_pre20070321-r4.ebuild 17382
+SHA256 05c70f6f9e73bdbbc7b7255e0adea420d87bff01b68d2eaec24c3c07848f7d77 mplayer-1.0_rc2_pre20070321-r4.ebuild 17382
+MISC ChangeLog 84473 RMD160 d6929aa2d17a63ad1b8de7b6b4b6dfa909f5ef73 SHA1 9c60904ab77fee25c379f0ed57b8b95efe444c10 SHA256 334d66f4e700cdcebf87dcc4b0d6bb54012ae196be935cc1ff34ade5d4e1f90d
+MD5 3698094883efe3b284f0e8a14b3bb531 ChangeLog 84473
+RMD160 d6929aa2d17a63ad1b8de7b6b4b6dfa909f5ef73 ChangeLog 84473
+SHA256 334d66f4e700cdcebf87dcc4b0d6bb54012ae196be935cc1ff34ade5d4e1f90d ChangeLog 84473
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223

diff --git a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
index 528a6afa55420b781a8adacec08c470901608a7a..a87ef315175a50fb98bbd1b92d98ab12a687d506 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_pre20070321-r4.ebuild,v 1.3 2007/04/02 22:50:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild,v 1.4 2007/04/09 16:22:47 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -509,11 +509,11 @@ src_install() {
                dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
        fi
 
-       insinto /etc
+       insinto /etc/mplayer
        newins ${S}/etc/example.conf mplayer.conf
 
        if use srt || use truetype;     then
-               cat >> ${D}/etc/mplayer.conf << EOT
+               cat >> ${D}/etc/mplayer/mplayer.conf << EOT
 fontconfig=1
 subfont-osd-scale=4
 subfont-text-scale=3