[gentoo-commits] gentoo-x86 commit in media-sound/solfege: ChangeLog solfege-3.16.4.ebuild solfege-3.18.4.ebuild

["Tim Harder (radhermit)" <radhermit@gentoo.org>]

radhermit    10/10/15 05:28:08

  Modified:             ChangeLog solfege-3.16.4.ebuild
                        solfege-3.18.4.ebuild
  Log:
  Don't compile python files and add better failure messages for die.
  
  (Portage version: 2.2_rc94/cvs/Linux x86_64)

Revision  Changes    Path
1.46                 media-sound/solfege/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	13 Oct 2010 11:12:55 -0000	1.45
+++ ChangeLog	15 Oct 2010 05:28:08 -0000	1.46
@@ -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



1.5                  media-sound/solfege/solfege-3.16.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild?r1=1.4&r2=1.5

Index: solfege-3.16.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- solfege-3.16.4.ebuild	13 Oct 2010 11:12:55 -0000	1.4
+++ solfege-3.16.4.ebuild	15 Oct 2010 05:28:08 -0000	1.5
@@ -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 @@
 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_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" nopycompile=YES install || die "emake install failed"
 	dodoc AUTHORS *hange*og FAQ README
 }



1.2                  media-sound/solfege/solfege-3.18.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild?r1=1.1&r2=1.2

Index: solfege-3.18.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- solfege-3.18.4.ebuild	12 Oct 2010 22:52:04 -0000	1.1
+++ solfege-3.18.4.ebuild	15 Oct 2010 05:28:08 -0000	1.2
@@ -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 @@
 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_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" nopycompile=YES install || die "emake install failed"
 	dodoc AUTHORS *hange*og FAQ README
 }