diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2010-10-10 20:04:05 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2010-10-10 20:04:05 +0000 |
| commit | 904e00ca9d3fc391c8cdd32007af78919c03903b (patch) | |
| tree | eaa8ed9033b215f5a73875b5b7225589b202a12b /media-sound/solfege | |
| parent | Fix openmotif dependency. Change EAPI to 1. (diff) | |
| download | historical-904e00ca9d3fc391c8cdd32007af78919c03903b.tar.gz historical-904e00ca9d3fc391c8cdd32007af78919c03903b.tar.bz2 historical-904e00ca9d3fc391c8cdd32007af78919c03903b.zip | |
Fix compile with swig-2.
Package-Manager: portage-2.2_rc90/cvs/Linux x86_64
Diffstat (limited to 'media-sound/solfege')
| -rw-r--r-- | media-sound/solfege/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/solfege/Manifest | 19 | ||||
| -rw-r--r-- | media-sound/solfege/files/solfege-3.18.3-swig2.patch | 16 | ||||
| -rw-r--r-- | media-sound/solfege/solfege-3.18.3.ebuild | 6 |
4 files changed, 35 insertions, 12 deletions
diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog index ec74558cfc8e..ec56dd9e8db7 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.42 2010/10/10 19:48:19 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.43 2010/10/10 20:04:05 radhermit Exp $ + + 10 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.18.3.ebuild, + +files/solfege-3.18.3-swig2.patch: + Fix compile with swig-2. 10 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.16.4.ebuild, +files/solfege-3.16.4-ldflags.patch: diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest index 86d44c283539..2f61ada9b1b7 100644 --- a/media-sound/solfege/Manifest +++ b/media-sound/solfege/Manifest @@ -3,22 +3,23 @@ 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 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 1281 RMD160 e4597678bdfa6892d976613742dbe23c110046cf SHA1 fce8b6eb54c16619283db16a48d3b17b3f153566 SHA256 8b0884b3c3b12b09e894a7ecc20842bdc7e3dae4a4befd442e24b4d744d44f1a -MISC ChangeLog 6298 RMD160 16403dd104c8b68d4ed0fa6e6cc4593ccb145f82 SHA1 57b4625fd9d0b3bf3b9477abfa2b16fc4f4f1c24 SHA256 56315757b8a5e0120b1b92730176be35a0071c05431ce7c31714ceb89e1cff04 +EBUILD solfege-3.18.3.ebuild 1328 RMD160 fabbd683441a7086d0e9eee2b7a64436e4f08d00 SHA1 a31d3407cef3466ab17399f0cb2145c137a30516 SHA256 34531269fef795b8067c931467b86fae1bf27f8e0e5bbcf99f9474ea37557e73 +MISC ChangeLog 6435 RMD160 3879d9a44b77c2de5ba5a021068488b859177286 SHA1 5d3c799fbe5cff7aafee0992a02e653c7a2364f1 SHA256 15858d6653dea5af243f1b0f549ade594c6afbad71a5c2bcbd0b7c9b066db827 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQEcBAEBAgAGBQJMshiNAAoJEEqz6FtPBkyjUkgIAJJVqj69NvM26ZTRgUYSQZtP -lkSdqmZoC/IGD3rl62xysHOKR+S9kXqwyIaVcu3JIFWqYJ1mDOzuOxt8l/PseVcl -tqrvD6vS9229aNeYEh4kmF9x1CpIFT9rSBXpjb2kfiPC09NLj+kieO+F2piVui+q -1KX24yFrHiY70R4II8KXWMozq1+dn2b6+Y5gzNjl/d5VAxR328t0tgiRJ2b8XS2O -+fHkIRbl/OOswlH933dMRrhcItlIvdmWNV2skbb+uw1F4yIeLQyNmtvX0DHjn37T -s2EKy6GmgnWxmizJ8ZGQs2AbJ7c3qYV8u+GGhLr9c+8x3pfgJTd5Y+du5QXDat0= -=tjWk +iQEcBAEBAgAGBQJMshw+AAoJEEqz6FtPBkyjyU8H/jzgvXcUkmgYuZpTfmwZJprb +MMZhA6134DFWmPoJ/hMUz187tXU5yYSjJcG6Is+eufWoTERKVekWZ9qXKvST7cQ4 +bX3XLQ1atsVt9Iw4Z6/2F72d4LkluXz5tNrWQ0jszpqkpsMPo3xaUU1rcNiHqJwT +dCQQZsWcRJNa6I+pKkdARr9FuzniDIAcAGLsSOXzEINVS/CLbI6qzMBThmD2erUu +O4glvbRSJ/hFt4ZEZKZdrrZQfcgiR1iqHkEEwV5/UL5luf12Z5XqgTxXaMJwB4hK +b0rFJuJUovbxWKgyfIzKMzSXiPTHz0V3IVHTdKxoA4k8Kf/m2X0Tq1MmxDoP2A4= +=a77L -----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 new file mode 100644 index 000000000000..297bffdf8f3e --- /dev/null +++ b/media-sound/solfege/files/solfege-3.18.3-swig2.patch @@ -0,0 +1,16 @@ +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.3.ebuild index 9402afa88a52..090c3d9561c8 100644 --- a/media-sound/solfege/solfege-3.18.3.ebuild +++ b/media-sound/solfege/solfege-3.18.3.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.1 2010/10/10 01:37:43 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.3.ebuild,v 1.2 2010/10/10 20:04:05 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" @@ -37,6 +37,8 @@ src_prepare() { sed -i \ -e '/^CFLAGS/s:-I/usr/src/linux/include::' \ solfege/soundcard/Makefile || die + + epatch "${FILESDIR}"/${P}-swig2.patch } src_configure() { |