Update font dependency wrt bug 323603 and 311923

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

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index dc2042e76a0fc7b59ccca12127985ba2b6b244b0..7d4ce22102ab51a1f0d9f50563a1cf0aa72fa669 100644 (file)
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.105 2010/04/28 12:31:12 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.106 2010/06/12 04:21:44 chiiph Exp $
+
+  12 Jun 2010; Tomas Touceda <chiiph@gentoo.org> lilypond-2.12.3.ebuild:
+  Update font dependency wrt bug 323603 and 311923
 
   28 Apr 2010; Tomas Touceda <chiiph@gentoo.org> lilypond-2.12.3.ebuild:
   Fix dependency problem wrt bug 315471, and improve python related code wrt

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1a41ef90c7549ea08620f4bd7b21f6ad92c80dd8..79b81be5bd56626765572dc25e6db855c9f493e6 100644 (file)
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -6,6 +6,6 @@ DIST lilypond-2.12.2.tar.gz 4575983 RMD160 0ef1e1cbceb4fbf69a31b00a030ee40c42800
 DIST lilypond-2.12.3.tar.gz 4614614 RMD160 275b34b2517780a8c94d9c0a38c3f42b22d49703 SHA1 f36072d5f57b2a3d3877e82879be375d548aa951 SHA256 4e946f263bde49e94e9154446e1bbf74b9005e92c287fd5ed5fe99217e9eacc1
 EBUILD lilypond-2.12.2-r1.ebuild 3445 RMD160 937702b929147b929e9083088495e9a565403276 SHA1 94fb4b7fc7f3b2557fafd5fcbc68286b7ba3f037 SHA256 226542797211d5c072a5b81bee86ead6ce31b30a7acfe2dec5d3e5fb2dd4dfe8
 EBUILD lilypond-2.12.2.ebuild 3392 RMD160 5fad532dceb7182e830b916174e3f4425d3a0f8d SHA1 0c95351480fb9d23dc0cd763db07185d177480a3 SHA256 b93c4b0eba6613f275ab74eac91527ec5a343744d26b06239e3c83cacc57e48c
-EBUILD lilypond-2.12.3.ebuild 2825 RMD160 593df5d40ebb88acdd56b58d274015aa9db6dbf5 SHA1 a0f414eec01d6a86ecf36ad46084216ba4cdab22 SHA256 5a01e12c05a8e32e2e316c615dac4401dfca72e31d823979aacfa635f64f0d1f
-MISC ChangeLog 17865 RMD160 811165a0bb220d091ef33e17ab255eaa0bf689b8 SHA1 1b15c8ac25b7ca8f634633bf5517071701d908a0 SHA256 6535f278010b7c14048564d8584992f2232f569b7a111dc8ae5d4bb6b8762626
+EBUILD lilypond-2.12.3.ebuild 2780 RMD160 cb802c937314f63f5ae6db7754a055f52dd2f4e8 SHA1 2d6b71744221aba923e254540aa434535ed5a818 SHA256 2b5b29e91800923ec26a456e6cb83c7daf3c4fd8dcfccf33ae2a8ee62d58881b
+MISC ChangeLog 17990 RMD160 43f89c64e2164f9b43dfca84381495c9218abcfe SHA1 4daa59aa8369eb8cea04cb89ab898480f8018e57 SHA256 59143ebf97e0731ec5ac8fa5bf1ba3bd7a60faa3211dbcc22df90888ec32227c
 MISC metadata.xml 441 RMD160 6b16ceb3995fa6133a001bd5220fccd0f316887b SHA1 6eb000095d6970bb4de6159af1700728a3f3c192 SHA256 cb8b3f74232f032ba5ff263de2c2eba57349a8c40f47b2a791b3cedaf8400bf2

diff --git a/media-sound/lilypond/lilypond-2.12.3.ebuild b/media-sound/lilypond/lilypond-2.12.3.ebuild
index 096aecb4a7a9be599f801a76d73badea950d645e..074434c54b04eb333d5bb1504ca9702c828e5a14 100644 (file)
--- a/media-sound/lilypond/lilypond-2.12.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.12.3.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-sound/lilypond/lilypond-2.12.3.ebuild,v 1.2 2010/04/28 12:31:12 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.3 2010/06/12 04:21:44 chiiph Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 
 IUSE="debug emacs profile"
 
-RDEPEND="|| ( media-fonts/gnu-gs-fonts-std media-fonts/urw-fonts )
+RDEPEND="media-fonts/urw-fonts
        >=media-libs/freetype-2
        media-libs/fontconfig
        >=x11-libs/pango-1.12.3
@@ -59,7 +59,7 @@ src_configure() {
        fi
 
        # see bug 228823
-       econf --with-ncsb-dir=/usr/share/fonts/default/ghostscript \
+       econf --with-ncsb-dir=/usr/share/fonts/urw-fonts/ \
                $(use_enable debug debugging) \
                $(use_enable profile profiling) \
                --disable-gui \