Version bump to new bugfix release and remove old.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 19 insertions, 32 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index ec56dd9e8db7..54fb55a3d4d8 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2010/10/10 20:04:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.44 2010/10/12 22:52:04 radhermit Exp $
+
+*solfege-3.18.4 (12 Oct 2010)
+
+  12 Oct 2010; Tim Harder <radhermit@gentoo.org> -solfege-3.18.3.ebuild,
+  -files/solfege-3.18.3-swig2.patch, +solfege-3.18.4.ebuild:
+  Version bump to new bugfix release and remove old.
 
   10 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.18.3.ebuild,
   +files/solfege-3.18.3-swig2.patch:
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 2f61ada9b1b7..33c7443458fe 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -3,23 +3,22 @@ Hash: SHA1
 
 AUX solfege-3.16.4-ldflags.patch 696 RMD160 907642f0c495d7acabdf8e7c67e0f492e2d52088 SHA1 48356c2a887f560836a74d6f9af06eefb383e39a SHA256 fbc17b0be43883d8c64431633dd5c44a5692c59f44c8e91ae1e739bb07152ef3
 AUX solfege-3.16.4-swig2.patch 402 RMD160 5469d9c50fbfc62dc2e6c0fb38a09e5bbaf3d4c0 SHA1 e5bf05d26274835b776e9f8290a3892dc9a6d48d SHA256 537650558807b4c6a65e9fcf52f2550e5ee6b71c7b25af0855af38011f73615a
-AUX solfege-3.18.3-swig2.patch 597 RMD160 919a5a874df351b33a85b982685bf3256cb86d60 SHA1 41513a4dc374cda0bd22d265fb29cc57b7e188a3 SHA256 0ea1194c8c93e6f471bc51a856e8008d806d1ffbd78b203eb5fa9725581a4b85
 DIST solfege-3.14.2.tar.gz 3907723 RMD160 309fce8d2996228c8f14779b59b0629040a882b0 SHA1 e7991122b7f0d68dfd023b675b997717ab7f5bcf SHA256 ffc21ad2a3a704209d33acb5f43eca15a9203dda2f987a94c9049f92002dd153
 DIST solfege-3.16.4.tar.gz 4827876 RMD160 2e186104aa0137c26cf5436d53a3af109e36d53c SHA1 34ca593971eb4ef4c79c8ba444ae10bc78f1de57 SHA256 10a0acddd8f41c638eea56478dcdbcb4c0d0a013dba9c2530d759173a7591463
-DIST solfege-3.18.3.tar.gz 4990318 RMD160 9e9592423eff5ec16017bb3b4bc8d9a7cc09c956 SHA1 15bca1c435e3c7fa95731b1a9ea1ba62bacbbbbf SHA256 77d2e19f5434c04bfd992be9e5229ff92559e567b43d9064f8cd58ceae6ffa29
+DIST solfege-3.18.4.tar.gz 5009668 RMD160 a7120c9f0a25a3f3e76f3d944510a9434b04601d SHA1 23618543819a52ed5815be03043baa0304aa900a SHA256 7e59f6dd2ef4152cbcf77b90a9833cf049f3724a87653eca65106a1bcdbedade
 EBUILD solfege-3.14.2.ebuild 1140 RMD160 291f1b5dabe3c38f8b909d9454053b05650d964d SHA1 4126a98f827833162ea981db20a94774d50b1991 SHA256 bbe4f19a0ba64cfd1e0719c974103cea4d70750b1b57f66beae9426e26f7abf6
 EBUILD solfege-3.16.4.ebuild 1369 RMD160 120ba1c935e7f366940c19e86777c0ae5297a0cb SHA1 c649c7ca648a4d0b2f2dc103524e8908bed19a2c SHA256 a88fd3cf23856a785fbace4dce2d58d516202064d50d1b97a57a902a7b27da73
-EBUILD solfege-3.18.3.ebuild 1328 RMD160 fabbd683441a7086d0e9eee2b7a64436e4f08d00 SHA1 a31d3407cef3466ab17399f0cb2145c137a30516 SHA256 34531269fef795b8067c931467b86fae1bf27f8e0e5bbcf99f9474ea37557e73
-MISC ChangeLog 6435 RMD160 3879d9a44b77c2de5ba5a021068488b859177286 SHA1 5d3c799fbe5cff7aafee0992a02e653c7a2364f1 SHA256 15858d6653dea5af243f1b0f549ade594c6afbad71a5c2bcbd0b7c9b066db827
+EBUILD solfege-3.18.4.ebuild 1281 RMD160 afd3b86dba8dbffc58a939349ae097067370bf43 SHA1 204b2a2b1b794361611a386fde637f484991dccc SHA256 d675be45053e09ad909aedc81b6f0e73aaccf29b2c7d52744eab1090da6e06de
+MISC ChangeLog 6654 RMD160 4b5fcc37c412cefb3065dfd0bca7cc085700998a SHA1 cb65ef064b108e119addd7c43c590e0b3080d5f2 SHA256 2b1e4fa486b8d6e14456763b53792b0ff380dea5ff1c18c3e77c610390eb7373
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMshw+AAoJEEqz6FtPBkyjyU8H/jzgvXcUkmgYuZpTfmwZJprb
-MMZhA6134DFWmPoJ/hMUz187tXU5yYSjJcG6Is+eufWoTERKVekWZ9qXKvST7cQ4
-bX3XLQ1atsVt9Iw4Z6/2F72d4LkluXz5tNrWQ0jszpqkpsMPo3xaUU1rcNiHqJwT
-dCQQZsWcRJNa6I+pKkdARr9FuzniDIAcAGLsSOXzEINVS/CLbI6qzMBThmD2erUu
-O4glvbRSJ/hFt4ZEZKZdrrZQfcgiR1iqHkEEwV5/UL5luf12Z5XqgTxXaMJwB4hK
-b0rFJuJUovbxWKgyfIzKMzSXiPTHz0V3IVHTdKxoA4k8Kf/m2X0Tq1MmxDoP2A4=
-=a77L
+iQEcBAEBAgAGBQJMtOaeAAoJEEqz6FtPBkyjbOEIAJQBmZY81/2B+TY8T1BZ0lRY
+0CBZNU+n+0Ye+P1QNiRtMn0/TfoXQVlgp5fDCQZSxgFmDEQ1Ogra2k7GodrDmcrq
+WO6WB42ydI0J+cordtGcRx4ocPqP/BwWgPS74EtXZHHoGB2Zgd5/m+6fFHWLcEWV
+osWCBwQ0UpAWoe/nZRaBiXQ9fg+YR93SC/5QRR3GTxIXqhjre4ZUdYBRNQ6Qr2qk
+z3B4r92Gz6lJLiIzE2yIqVM9PZpmOWsYuf3b77CfWI5d9AUwr6GM7qFOAmQzW6PM
+EQqh79c+i5o9P7HCjZKfiJKs8a3xs2qnNficoM0Mgrl61Ku3e4XpF6NFvbuqPzU=
+=3BR0
 -----END PGP SIGNATURE-----
diff --git a/media-sound/solfege/files/solfege-3.18.3-swig2.patch b/media-sound/solfege/files/solfege-3.18.3-swig2.patch
deleted file mode 100644
index 297bffdf8f3e..000000000000
--- a/media-sound/solfege/files/solfege-3.18.3-swig2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur solfege-3.18.3.orig/solfege/soundcard/Makefile solfege-3.18.3/solfege/soundcard/Makefile
---- solfege-3.18.3.orig/solfege/soundcard/Makefile	2010-10-08 02:31:36.000000000 -0700
-+++ solfege-3.18.3/solfege/soundcard/Makefile	2010-10-10 12:29:39.636698327 -0700
-@@ -30,11 +30,7 @@
-  ifdef SWIG
-   ifeq ($(SWIG_VERSION),1.1)
-    TARGETS += solfege/soundcard/solfege_c_midimodule.so
--  endif
--  ifeq ($(SWIG_VERSION),1.3)
--   TARGETS += solfege/soundcard/_solfege_c_midi.so
--  endif
--  ifeq ($(SWIG_VERSION),unknown)
-+  else
-    TARGETS += solfege/soundcard/_solfege_c_midi.so
-   endif
-  endif
diff --git a/media-sound/solfege/solfege-3.18.3.ebuild b/media-sound/solfege/solfege-3.18.4.ebuild
index 090c3d9561c8..23fdf059803a 100644
--- a/media-sound/solfege/solfege-3.18.3.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.3.ebuild,v 1.2 2010/10/10 20:04:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.4.ebuild,v 1.1 2010/10/12 22:52:04 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
-inherit python eutils
+inherit python
 
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
@@ -37,8 +37,6 @@ src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
 		solfege/soundcard/Makefile || die
-
-	epatch "${FILESDIR}"/${P}-swig2.patch
 }
 
 src_configure() {