| 1 |
chiiph 10/04/28 12:31:12 |
| 2 |
|
| 3 |
Modified: ChangeLog lilypond-2.12.3.ebuild |
| 4 |
Log: |
| 5 |
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 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.105 media-sound/lilypond/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.105&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.105&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/ChangeLog?r1=1.104&r2=1.105 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v |
| 18 |
retrieving revision 1.104 |
| 19 |
retrieving revision 1.105 |
| 20 |
diff -u -r1.104 -r1.105 |
| 21 |
--- ChangeLog 13 Apr 2010 18:35:47 -0000 1.104 |
| 22 |
+++ ChangeLog 28 Apr 2010 12:31:12 -0000 1.105 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for media-sound/lilypond |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.104 2010/04/13 18:35:47 chiiph Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.105 2010/04/28 12:31:12 chiiph Exp $ |
| 28 |
+ |
| 29 |
+ 28 Apr 2010; Tomas Touceda <chiiph@g.o> lilypond-2.12.3.ebuild: |
| 30 |
+ Fix dependency problem wrt bug 315471, and improve python related code wrt |
| 31 |
+ bug 313961. Thanks to Xarthisius and Arfrever for helping with this two |
| 32 |
+ issues |
| 33 |
|
| 34 |
*lilypond-2.12.3 (13 Apr 2010) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 media-sound/lilypond/lilypond-2.12.3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: lilypond-2.12.3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- lilypond-2.12.3.ebuild 13 Apr 2010 18:35:47 -0000 1.1 |
| 52 |
+++ lilypond-2.12.3.ebuild 28 Apr 2010 12:31:12 -0000 1.2 |
| 53 |
@@ -1,10 +1,12 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.1 2010/04/13 18:35:47 chiiph Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.2 2010/04/28 12:31:12 chiiph Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
|
| 61 |
-inherit eutils versionator toolchain-funcs elisp-common flag-o-matic |
| 62 |
+PYTHON_DEPEND="2" |
| 63 |
+ |
| 64 |
+inherit eutils versionator toolchain-funcs elisp-common flag-o-matic python |
| 65 |
|
| 66 |
DESCRIPTION="GNU Music Typesetter" |
| 67 |
SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz" |
| 68 |
@@ -16,12 +18,11 @@ |
| 69 |
|
| 70 |
IUSE="debug emacs profile" |
| 71 |
|
| 72 |
-RDEPEND=" |
| 73 |
+RDEPEND="|| ( media-fonts/gnu-gs-fonts-std media-fonts/urw-fonts ) |
| 74 |
>=media-libs/freetype-2 |
| 75 |
media-libs/fontconfig |
| 76 |
>=x11-libs/pango-1.12.3 |
| 77 |
>=dev-scheme/guile-1.8.2[deprecated,regex] |
| 78 |
- >=dev-lang/python-2.4 |
| 79 |
|| ( >=app-text/ghostscript-gnu-8.15 |
| 80 |
>=app-text/ghostscript-gpl-8.15 ) |
| 81 |
emacs? ( virtual/emacs )" |
| 82 |
@@ -38,6 +39,10 @@ |
| 83 |
dev-lang/perl |
| 84 |
>=sys-devel/bison-2.0" |
| 85 |
|
| 86 |
+pkg_setup() { |
| 87 |
+ python_set_active_version 2 |
| 88 |
+} |
| 89 |
+ |
| 90 |
src_prepare() { |
| 91 |
epatch "${FILESDIR}"/${P}-qa_pyc_fix.patch |
| 92 |
} |
| 93 |
@@ -49,6 +54,7 @@ |
| 94 |
fi |
| 95 |
|
| 96 |
if use profile; then |
| 97 |
+ einfo "Stripping -fomit-frame-pointer flag" |
| 98 |
strip-flags -fomit-frame-pointer |
| 99 |
fi |
| 100 |
|
| 101 |
@@ -78,7 +84,7 @@ |
| 102 |
# for our purposes. |
| 103 |
RESTRICT=test |
| 104 |
|
| 105 |
-src_install () { |
| 106 |
+src_install() { |
| 107 |
emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install || die "emake install failed" |
| 108 |
|
| 109 |
# remove elisp files since they are in the wrong directory |
| 110 |
@@ -91,6 +97,8 @@ |
| 111 |
fi |
| 112 |
|
| 113 |
dodoc AUTHORS.txt HACKING NEWS.txt README.txt || die |
| 114 |
+ |
| 115 |
+ python_convert_shebangs -r 2 "${D}" |
| 116 |
} |
| 117 |
|
| 118 |
pkg_postinst() { |
Archives