Version bump. Port ebuild to EAPI=3

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

4 files changed, 44 insertions, 52 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 425643761bee..61120103930f 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lilypond
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.103 2009/12/10 19:02:18 ulm Exp $
+# 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 $
+
+*lilypond-2.12.3 (13 Apr 2010)
+
+  13 Apr 2010; Tomas Touceda <chiiph@gentoo.org> -lilypond-2.12.1.ebuild,
+  +lilypond-2.12.3.ebuild, +files/lilypond-2.12.3-qa_pyc_fix.patch:
+  Version bump. Port ebuild to EAPI=3
 
 *lilypond-2.12.2-r1 (10 Dec 2009)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 625aa7c5931e..2a213799f5d7 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50lilypond-gentoo.el 258 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 SHA1 e9fa3b4ae260183cd2f290fcf84b9991dbcd7875 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7
 AUX lilypond-2.12.2-dont-install-pyc.patch 434 RMD160 94e03b0cb144812f02153980d0492e1cc6ff7548 SHA1 4619bd8c6d5090a12f214b4fafa4a333dd78e7a0 SHA256 28927d79f3026a8b483a04d1a595b20e3ebc90f10ad754b28df76c24c30b31f6
 AUX lilypond-2.12.2-glibc-2.10.patch 753 RMD160 be7184866038c9a163af48642f5039eff73a4bd9 SHA1 2086995d5fdd97cf9c2f3acaec394f7d9d58136c SHA256 039306f5487bec7dcb03848aaff36034eb798363e7eed8085069e338b5831255
-DIST lilypond-2.12.1.tar.gz 4518772 RMD160 794c9d8de513ba6e32304883a62b9b368a316030 SHA1 203bead967f8409dbac00fd835d2a411694f408b SHA256 12c8961ebbed4f916effc74b7185fb2110bbc5da32ed6b1823fb2900a1307239
+AUX lilypond-2.12.3-qa_pyc_fix.patch 520 RMD160 c65aa83819e15f73f21dbba46e136ca2f8e9eb5c SHA1 52a939cdb2770f7c0f138e13dcc3d528d60552d1 SHA256 99da4e42dcbb1c3e2fbc5558f7f7b2c97a6f25b49f17a3cb2171aa44abc407cb
 DIST lilypond-2.12.2.tar.gz 4575983 RMD160 0ef1e1cbceb4fbf69a31b00a030ee40c4280091d SHA1 92afe4ef926d966e7855f64ae93ee762f1fa5178 SHA256 d03df733a2199d32082b9e60f823a9ea1e4274daaccb8cc1cab0eef87f8f140c
-EBUILD lilypond-2.12.1.ebuild 3302 RMD160 71d02e3416af81a98ea8d4334bc8580691fa1603 SHA1 bc450fdd5dfcf13cc4484ce671dc027030a2c7d8 SHA256 12e1849375b4fe361fce431ff36ef216ddb487ce03cd163ea681baa855d369a2
+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
-MISC ChangeLog 17415 RMD160 856d35256e8c11c313c0130d08767542345632b6 SHA1 a3e8ee776ed66fa5a9c8b32646d662f4b9715918 SHA256 1e7e4080ab124de615d1ba51d34774297c5d77a8f2ec11033b261ca46485c62b
+EBUILD lilypond-2.12.3.ebuild 2636 RMD160 edeedff9b309b6e50b3a7e01e003b4e80d91c5f1 SHA1 9ced73c2f37fb758a4006ba248cbb7c9f343d8b6 SHA256 a1347c3cc0f5958d43b06a3d755843b03656d9458e0d139a1d58bf406c12f3d2
+MISC ChangeLog 17631 RMD160 ec1ba0c0d6721c144daac37f6eda54bf2674500e SHA1 7e3daeb40875c803933435aab138f90ea11b6957 SHA256 ff941d4504179f95a9e2c3f7f89767b3daea3aa2d4c09ed99c4ac4de30ca8210
 MISC metadata.xml 441 RMD160 6b16ceb3995fa6133a001bd5220fccd0f316887b SHA1 6eb000095d6970bb4de6159af1700728a3f3c192 SHA256 cb8b3f74232f032ba5ff263de2c2eba57349a8c40f47b2a791b3cedaf8400bf2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkshRloACgkQOeoy/oIi7uzZBgCfcXYFRbG+EfBXj/Sy7b8cTLCx
-MAAAn1VJb3zU8aGLPeftQRrnlG9LJI+v
-=Nc/Z
------END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch b/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch
new file mode 100644
index 000000000000..3ac3c305d3aa
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur lilypond-2.12.2.orig/python/GNUmakefile lilypond-2.12.2/python/GNUmakefile
+--- lilypond-2.12.2.orig/python/GNUmakefile	2009-01-18 22:04:57.000000000 -0200
++++ lilypond-2.12.2/python/GNUmakefile	2009-12-10 12:28:27.000000000 -0300
+@@ -16,7 +16,7 @@
+ INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
+ 
+ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
+-INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
++INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES)
+ 
+ $(outdir)/midi.lo: $(outdir)/config.hh
+ 
diff --git a/media-sound/lilypond/lilypond-2.12.1.ebuild b/media-sound/lilypond/lilypond-2.12.3.ebuild
index 5b1289586967..a78c2d010b05 100644
--- a/media-sound/lilypond/lilypond-2.12.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.12.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1.ebuild,v 1.5 2009/05/26 05:56:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.1 2010/04/13 18:35:47 chiiph Exp $
 
-inherit eutils versionator toolchain-funcs elisp-common
+EAPI="3"
+
+inherit eutils versionator toolchain-funcs elisp-common flag-o-matic
 
 DESCRIPTION="GNU Music Typesetter"
 SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
@@ -10,22 +12,15 @@ HOMEPAGE="http://lilypond.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 
-#LANGS="cs da de es fi fr it ja nl ru rw sv tr zh_TW"
 IUSE="debug emacs profile"
-#IUSE="debug doc emacs gtk profile"
-
-#for X in ${LANGS} ; do
-#		 IUSE="${IUSE} linguas_${X/-/_}"
-#done
 
-# guile with deprecated and regex
 RDEPEND="
 	>=media-libs/freetype-2
 	media-libs/fontconfig
 	>=x11-libs/pango-1.12.3
-	>=dev-scheme/guile-1.8.2
+	>=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 )
@@ -42,39 +37,32 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	dev-lang/perl
 	>=sys-devel/bison-2.0"
-#	doc? ( media-libs/netpbm
-#		   media-gfx/imagemagick
-#          app-text/texi2html )"
-
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		local flags="deprecated regex"
-		built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
-	fi
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa_pyc_fix.patch
 }
 
-src_compile() {
+src_configure() {
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		eerror "You need GCC 4.x to build this software."
 		die "you need to compile with gcc-4 or later"
 	fi
 
+	if use profile; then
+		strip-flags -fomit-frame-pointer
+	fi
+
 	# see bug 228823
 	econf --with-ncsb-dir=/usr/share/fonts/default/ghostscript \
 		$(use_enable debug debugging) \
 		$(use_enable profile profiling) \
 		--disable-gui \
 		--disable-documentation
-#		$(use_enable doc documentation)
+}
 
-#	# without -j1 it will not fail, but building docs later will, bug 236010
+src_compile() {
+	# without -j1 it will not fail, but building docs later will, bug 236010
 	emake -j1 || die "emake failed"
-#	emake || die "emake failed"
-
-# -j is unsupported, but CPU_COUNT may be set instead
-#	if use doc; then
-#		emake -j1 CPU_COUNT=2 web || die "emake web failed"
-#	fi
 
 	if use emacs; then
 		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
@@ -93,13 +81,8 @@ RESTRICT=test
 src_install () {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install || die "emake install failed"
 
-#	if use doc; then
-#		# Note: installs .html docs, .pdf docs and examples
-#		emake out=www web-install DESTDIR=${D} webdir=/usr/share/doc/${PF}/html || die "emake web-install failed"
-#	fi
-
 	# remove elisp files since they are in the wrong directory
-	rm -r "${D}"/usr/share/emacs
+	rm -rf "${D}"/usr/share/emacs
 
 	if use emacs; then
 		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
@@ -107,7 +90,7 @@ src_install () {
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
 	fi
 
-	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt || die
 }
 
 pkg_postinst() {