Don't compile python files and add better failure messages for die.

(Portage version: 2.2_rc94/cvs/Linux x86_64)

4 files changed, 26 insertions, 8 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 512d8e4a1ac6..ff38ae94a458 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/solfege
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.45 2010/10/13 11:12:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.46 2010/10/15 05:28:08 radhermit Exp $
+
+  15 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.16.4.ebuild,
+  +files/solfege-3.16.4-makefile.patch, solfege-3.18.4.ebuild:
+  Don't compile python files and add better failure messages for die.
 
   13 Oct 2010; Markos Chandras <hwoarang@gentoo.org> solfege-3.16.4.ebuild:
   Stable on amd64 wrt bug #340309
diff --git a/media-sound/solfege/files/solfege-3.16.4-makefile.patch b/media-sound/solfege/files/solfege-3.16.4-makefile.patch
new file mode 100644
index 000000000000..ba9fc2deefd5
--- /dev/null
+++ b/media-sound/solfege/files/solfege-3.16.4-makefile.patch
@@ -0,0 +1,11 @@
+--- solfege-3.16.4/Makefile.in.orig	2010-10-14 21:55:14.486591065 -0700
++++ solfege-3.16.4/Makefile.in	2010-10-14 21:55:39.833798332 -0700
+@@ -141,7 +141,7 @@
+ 	echo $(installfiles) | $(PYTHON) tools/pcopy.py $(DESTDIR)/$(datadir)/$(PACKAGE)/
+ 
+ compileall:
+-ifneq (x"$(nopycompile)",xYES)
++ifneq "$(nopycompile)" "YES"
+ 	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(datadir)/$(PACKAGE)/solfege')"
+ endif
+ 
diff --git a/media-sound/solfege/solfege-3.16.4.ebuild b/media-sound/solfege/solfege-3.16.4.ebuild
index 143387e7b012..e045ddb25a3c 100644
--- a/media-sound/solfege/solfege-3.16.4.ebuild
+++ b/media-sound/solfege/solfege-3.16.4.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/solfege/solfege-3.16.4.ebuild,v 1.4 2010/10/13 11:12:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild,v 1.5 2010/10/15 05:28:08 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
@@ -36,10 +36,11 @@ pkg_setup() {
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
-		solfege/soundcard/Makefile || die
+		solfege/soundcard/Makefile || die "sed failed"
 
 	epatch "${FILESDIR}"/${P}-swig2.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_configure() {
@@ -51,6 +52,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" nopycompile=YES install || die "emake install failed"
 	dodoc AUTHORS *hange*og FAQ README
 }
diff --git a/media-sound/solfege/solfege-3.18.4.ebuild b/media-sound/solfege/solfege-3.18.4.ebuild
index 23fdf059803a..7e442c18e657 100644
--- a/media-sound/solfege/solfege-3.18.4.ebuild
+++ b/media-sound/solfege/solfege-3.18.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild,v 1.1 2010/10/12 22:52:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild,v 1.2 2010/10/15 05:28:08 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
-inherit python
+inherit python eutils
 
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
@@ -36,7 +36,9 @@ pkg_setup() {
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
-		solfege/soundcard/Makefile || die
+		solfege/soundcard/Makefile || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-3.16.4-makefile.patch
 }
 
 src_configure() {
@@ -48,6 +50,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" nopycompile=YES install || die "emake install failed"
 	dodoc AUTHORS *hange*og FAQ README
 }