Fix dependency problem wrt bug 315471, and improve python related code wrt bug 313961...

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

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 61120103930f2276567c42923c50b461058ed21d..dc2042e76a0fc7b59ccca12127985ba2b6b244b0 100644 (file)
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2010/04/13 18:35:47 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.105 2010/04/28 12:31:12 chiiph Exp $
+
+  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
+  bug 313961. Thanks to Xarthisius and Arfrever for helping with this two
+  issues
 
 *lilypond-2.12.3 (13 Apr 2010)
 

diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 2a213799f5d7d6c92d03df7837f1b75d1355878d..1a41ef90c7549ea08620f4bd7b21f6ad92c80dd8 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 2636 RMD160 edeedff9b309b6e50b3a7e01e003b4e80d91c5f1 SHA1 9ced73c2f37fb758a4006ba248cbb7c9f343d8b6 SHA256 a1347c3cc0f5958d43b06a3d755843b03656d9458e0d139a1d58bf406c12f3d2
-MISC ChangeLog 17631 RMD160 ec1ba0c0d6721c144daac37f6eda54bf2674500e SHA1 7e3daeb40875c803933435aab138f90ea11b6957 SHA256 ff941d4504179f95a9e2c3f7f89767b3daea3aa2d4c09ed99c4ac4de30ca8210
+EBUILD lilypond-2.12.3.ebuild 2825 RMD160 593df5d40ebb88acdd56b58d274015aa9db6dbf5 SHA1 a0f414eec01d6a86ecf36ad46084216ba4cdab22 SHA256 5a01e12c05a8e32e2e316c615dac4401dfca72e31d823979aacfa635f64f0d1f
+MISC ChangeLog 17865 RMD160 811165a0bb220d091ef33e17ab255eaa0bf689b8 SHA1 1b15c8ac25b7ca8f634633bf5517071701d908a0 SHA256 6535f278010b7c14048564d8584992f2232f569b7a111dc8ae5d4bb6b8762626
 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 a78c2d010b056b1f3416c1c28ef25cd8e5f07ec8..096aecb4a7a9be599f801a76d73badea950d645e 100644 (file)
--- a/media-sound/lilypond/lilypond-2.12.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.12.3.ebuild
@@ -1,10 +1,12 @@
 # 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.1 2010/04/13 18:35:47 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.2 2010/04/28 12:31:12 chiiph Exp $
 
 EAPI="3"
 
-inherit eutils versionator toolchain-funcs elisp-common flag-o-matic
+PYTHON_DEPEND="2"
+
+inherit eutils versionator toolchain-funcs elisp-common flag-o-matic python
 
 DESCRIPTION="GNU Music Typesetter"
 SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
@@ -16,12 +18,11 @@ KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 
 IUSE="debug emacs profile"
 
-RDEPEND="
+RDEPEND="|| ( media-fonts/gnu-gs-fonts-std media-fonts/urw-fonts )
        >=media-libs/freetype-2
        media-libs/fontconfig
        >=x11-libs/pango-1.12.3
        >=dev-scheme/guile-1.8.2[deprecated,regex]
-       >=dev-lang/python-2.4
        || ( >=app-text/ghostscript-gnu-8.15
                 >=app-text/ghostscript-gpl-8.15 )
        emacs? ( virtual/emacs )"
@@ -38,6 +39,10 @@ DEPEND="${RDEPEND}
        dev-lang/perl
        >=sys-devel/bison-2.0"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_prepare() {
        epatch "${FILESDIR}"/${P}-qa_pyc_fix.patch
 }
@@ -49,6 +54,7 @@ src_configure() {
        fi
 
        if use profile; then
+               einfo "Stripping -fomit-frame-pointer flag"
                strip-flags -fomit-frame-pointer
        fi
 
@@ -78,7 +84,7 @@ src_compile() {
 # for our purposes.
 RESTRICT=test
 
-src_install () {
+src_install() {
        emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install || die "emake install failed"
 
        # remove elisp files since they are in the wrong directory
@@ -91,6 +97,8 @@ src_install () {
        fi
 
        dodoc AUTHORS.txt HACKING NEWS.txt README.txt || die
+
+       python_convert_shebangs -r 2 "${D}"
 }
 
 pkg_postinst() {