Version bump and remove old.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 20 insertions, 32 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 13aa2b428a20..481cb90948aa 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/solfege
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.62 2011/03/04 22:40:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.63 2011/03/11 21:18:35 radhermit Exp $
+
+*solfege-3.19.5 (11 Mar 2011)
+
+  11 Mar 2011; Tim Harder <radhermit@gentoo.org> -solfege-3.19.4.ebuild,
+  -files/solfege-3.19.4-skipmanual.patch, +solfege-3.19.5.ebuild:
+  Version bump and remove old.
 
   04 Mar 2011; Tim Harder <radhermit@gentoo.org> solfege-3.19.4.ebuild,
   +files/solfege-3.19.4-skipmanual.patch:
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 83e1a1649b14..36c6928b5bd6 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA1
 
 AUX solfege-3.16.4-parallel-install.patch 593 RMD160 e8dd96d3e9fd24868af6b0088aa9ed759a95d7d4 SHA1 bdf9e49f6052915175e000b81dc2e80fe1ed2243 SHA256 6bc1eb3335d922018d9cc18401f784d452fb0214c533e83400cee24d833dcdc5
-AUX solfege-3.19.4-skipmanual.patch 319 RMD160 514328db0cff4ab96d14e47ea068543a6eb0a4aa SHA1 d8dba06718688035fbd8bc82b0120b26e61b4338 SHA256 f0c806a3485c24b3d08faeca512d8c637e4b53394bfc99db2695033053dc3e21
 DIST solfege-3.18.7.tar.gz 5017655 RMD160 55d01aa84176bcca0526e2e1720117992a46b518 SHA1 9224c8f4a9e65a063d3f8dee2b3f3908117c4b01 SHA256 5efae213e4c5418ffc8679c2e284fdc03217f3329a3c68a44328904ce2bd9404
-DIST solfege-3.19.4.tar.gz 5416566 RMD160 136f654687d15f4ecf6d7179db22efb8c5f155a6 SHA1 fd213343b8743e697408f25acbdf89f82eb6a0f1 SHA256 8007a682001336cfab25b59e44f478ec459d66378d09b3b3bd3c4a01b1b38914
+DIST solfege-3.19.5.tar.gz 5449687 RMD160 d95c232940f30b0f612bae910ac0db74cb113dff SHA1 144f8f8e57286795aac2893b811a11eee4b51de0 SHA256 6c6c02dfb91519098d9e9aba8af1bfe76dd38d235c917efeb85a53542c5a7171
 EBUILD solfege-3.18.7.ebuild 1393 RMD160 c531128aed4c3d59f4c2d805f443d4fb88be4ce8 SHA1 b1759a179c403158347d989a2aa6e167c7b7cea3 SHA256 2899fda5a8ce33b104c6fa4728fa88e13ebf6e88da791fb1e5468b63a8b72ee7
-EBUILD solfege-3.19.4.ebuild 1440 RMD160 fd2cf493a03b57982bed00feca42f03e983af05a SHA1 849af60faffecea469281fb32736e2c1a43a4ff4 SHA256 70b35a92424289b2233d0d5691d89f21c3da3d64ad447d2a5ca2c74b00b48ae3
-MISC ChangeLog 9442 RMD160 0ec3333ca16b1639f98fee4652f5a4fc86414c57 SHA1 8fac1a528000b3763160c81dadc3069efc10973f SHA256 82ffb74541002d0fb90b79318d423fc7e5d480c0e9bee7996a2c1ad4f9f81d88
+EBUILD solfege-3.19.5.ebuild 1384 RMD160 f268849e1a399dfcfc66ac20c925c4a369d64799 SHA1 1628e8819f69314fe236acdde207aebf6014e6b3 SHA256 55d1b1068b8e7e3c5624d942a5480b405b3256db3e7955efb7d7f7a869fac6ec
+MISC ChangeLog 9644 RMD160 bdf5ec498f9d8cbeb245b65d989d2301a47b7e0a SHA1 921ad2363f2fd4181bdce8ffdf0e23b00ea3c252 SHA256 6adb99c1def9edeb90b99c4029d6b08c7ff6ed315343334da16e4ac7ab70a630
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNcWpRAAoJEEqz6FtPBkyjzQIIAIHbZ3qfx2kpvQ05WGuzi654
-6eluz7Lq6RFv9BO13rL6mZALGwe/DsR3Ozw4BtzyXmPhasJw3PTJo/kAp+2Yz9LU
-NaCu9qNhpAMshw2dnvhs28fTRJlbQe298DnrSx4Fn9SSsqH5k2J3R7i+CC3N5eBC
-ymVgM3AvOdiFkOks/Bl2Gc+bWA0aVl0eETe12yT3VmGSREB1mIZzW+2Bcbkrxt6d
-FxSFsYyuArFIX9OZ725qvXlXOOzw88irgX2eYv17pBh2PnVPCReVIkLCEn+PB9a3
-iuq985GZ+s+SLI2InOP1zDEHp4WT0pBBFSmjyi7QSLPdN4gvsan5D6cO8JldT2Y=
-=ACyT
+iQEcBAEBAgAGBQJNepGzAAoJEEqz6FtPBkyjrbIIAJ77COVqTGVU/QEz0P+VQfYu
+BBampeaiJbTnbLhJepI3XY0CXeQVBYN1LZA7t2vb/LY85Rjbzn3zAw/VRJvane/r
+1WyjJHAoaNbL60kdlayo8viL92d8KhbYAXnAckHXbJ+1g+V9/chg1mARS5kZdPeF
+CYrSRbp8CBewoKluxqquxkPLjx5VNg29arBuTZvNcStOfdwZeHIS9VbFhS6QhJNy
+ywDZHhdEpSeVwVcvB3fAks7BLS8IxsI5j83muM088ZHlKJlUD3z9EUt3yGidd9S3
+YI+AoxQ4L7hMXzva7rZc+lBNcDRHuSq/yaAi18f/SLShoZ2rsRJlqr3jLoJOgSI=
+=x6SR
 -----END PGP SIGNATURE-----
diff --git a/media-sound/solfege/files/solfege-3.19.4-skipmanual.patch b/media-sound/solfege/files/solfege-3.19.4-skipmanual.patch
deleted file mode 100644
index 1bd80536ba70..000000000000
--- a/media-sound/solfege/files/solfege-3.19.4-skipmanual.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- solfege-3.19.4/help/Makefile.orig
-+++ solfege-3.19.4/help/Makefile
-@@ -32,9 +32,11 @@
- 	)
- installfiles+=help/style.css
- 
-+ifneq "$(skipmanual)" "yes"
- ifdef LILYPOND
- all: $(shell python tools/generate_theory_ly.py --png-targets)
- endif
-+endif
- 
- 
- # I have removed any code that will merge help/C/solfege.pot and
diff --git a/media-sound/solfege/solfege-3.19.4.ebuild b/media-sound/solfege/solfege-3.19.5.ebuild
index bdbac1c3cb24..66119442cf65 100644
--- a/media-sound/solfege/solfege-3.19.4.ebuild
+++ b/media-sound/solfege/solfege-3.19.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.19.4.ebuild,v 1.2 2011/03/04 22:40:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.19.5.ebuild,v 1.1 2011/03/11 21:18:35 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
 
-inherit eutils python
+inherit python
 
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
@@ -33,11 +33,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
+	sed -i -e '/^CFLAGS/s:-I/usr/src/linux/include::' \
 		solfege/soundcard/Makefile || die "sed failed"
-
-	epatch "${FILESDIR}"/${P}-skipmanual.patch
 }
 
 src_configure() {