old

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

10 files changed, 16 insertions, 435 deletions

diff --git a/media-sound/amsynth/ChangeLog b/media-sound/amsynth/ChangeLog
index 721223993643..69f78ebee59d 100644
--- a/media-sound/amsynth/ChangeLog
+++ b/media-sound/amsynth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amsynth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.44 2013/02/25 08:14:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.45 2013/02/25 08:15:34 ssuominen Exp $
+
+  25 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> -amsynth-1.2.0.ebuild,
+  -files/amsynth-1.2.0+gcc-4.3.patch, -files/amsynth-1.2.0-asneeded.patch,
+  -files/amsynth-1.2.0-cflags.patch, -files/amsynth-1.2.0-debug.patch,
+  -amsynth-1.2.2.ebuild, -files/amsynth-1.2.2-asneeded.patch,
+  -amsynth-1.2.3.ebuild:
+  old
 
 *amsynth-1.3.2 (25 Feb 2013)
 
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 0e4e1f7dc3a1..72eccb1a7100 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,31 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX amsynth-1.2.0+gcc-4.3.patch 2053 SHA256 e8f8bd2d5575aed85e3eafd1eae52a2f8292c3cef73dc1289fcfdbc0d8698729 SHA512 664a56b1758148333b5a48fdaec1a21e39f8b352201ac44a2005f94df0d1f089675d4f6bddacd6cee139a9993b4c3658d2974fa9003c41cf8d1f0122909487c0 WHIRLPOOL 12aa00dfe23f2dfaf818beae1ac11b4bf228464c85d5051a18f6b7f8f78bf683092a979d964c9867ef16171d68753dbec9c20b1a644ec7fbb3c1f8fd2063585d
-AUX amsynth-1.2.0-asneeded.patch 1326 SHA256 39c4cf8de92dcce9e90eda336bf545876207cf070e1be6573e3c2368a1579d06 SHA512 3c5f7cf0117f9b59842bda0a960c231be1f803ffc9786f04af39d955a9940e9984840a4d7b3e634033ebc4963fb8299939441540858a42ddc53dc3642d1c2ddd WHIRLPOOL 45a13bc42e99423525add97afba869759d8a87962e440c384d6043c0b73dd9acba5ea361bddc6c9f99ffdcd32c25f53b5d61d39daefe75223f791c789f43235d
-AUX amsynth-1.2.0-cflags.patch 542 SHA256 463c6f9df0084d398e37783d25e95340ce3029660e221f68842b06aef08e3a5d SHA512 16feebfb84c8af96c99a46e038a3afc65140f814b5485ce38cf9528f9921ee973f8fba214999323f69aa088c3704d59a3a729fc4ccb9b4d292dc2de135424291 WHIRLPOOL c0c2234b7ecebf3f682b9a4f16097fada90a3a45d3a99439d4ad052fd9b574218a8aa6a691050bf79afb7323acb89ca7031b377a0b0869c211d4107f652f1351
-AUX amsynth-1.2.0-debug.patch 1526 SHA256 87c5de38991eae846f8c202e649d5cfc05c69daae1c2b6e8b88ace2ca66d13b5 SHA512 2cb26ff36a6c1e1308fcacd214e05bf1d430d6dcd77b5667bac13b035818af411db6669cbbdc2304c048d4d40c6ae37ecaf18a3571a5aa91f4b00570d638aa35 WHIRLPOOL 5ade5d2cd5f6d31536339a464116daa7d6e07aa926ca35c3c7ba0846bdabfd2d9567782b04957ed6d6357295c20722d6d40036dd156613e9bed45fe5e9a67d11
-AUX amsynth-1.2.2-asneeded.patch 1782 SHA256 cab2efb93dae35f31184178cb652b19a6df9e9472589be4c330d888ee3469640 SHA512 22647d05892bedc6835c7fdb27f49e8a7f41543089409dfd12097f4b54d86f520b5e15a71d919934bd867842ef71bdb5c37ac945ab736c4df48d53c85dc3cd6d WHIRLPOOL 830dc0a747901c3a0bcc62542068490acfa6950c4678952ceecf880d875689f373a7da632c6a722ea434bca89b336768aed943bb50ff3d3c5a41a66b3587c5ff
 AUX amsynth-1.2.3-respect-cflags.patch 628 SHA256 32ccf83a7a4869708839ef2abadb104a799eb554d2b9fde689fc2dee57a39fbc SHA512 b8d22737650a31414fded771413ede840c6f18b7389b5499255915dabaecb98747ccb8d1b1cd103ead0fe6319f5117ef899b641623f13ccc94d5ae6e67e0e5fe WHIRLPOOL 23f496ae2af2eade39c505a9eac447d7acb596933e2dc079c8eadfe3403af5821bc6f6b5135b4cb624a6739846f613d461d737686370abca37add2e704f6aa4a
-DIST amSynth-1.2.0.tar.gz 616311 SHA256 5fff8dc65bd5550bbf408e3df1123c68e31517bbb7441cbe0b964ab271948b1c
-DIST amSynth-1.2.2.tar.gz 611764 SHA256 049adb4ae35325f1f0c2c487d6dc435735c7950f6829e2d0e97f969786e5a7c0
 DIST amSynth-1.2.3.tar.gz 622565 SHA256 c5bbb62dcbfe2470d1c31f65e88794a9230978bc962786794303f5b6c29a6f85 SHA512 fc429a6d69752812618dfade1b05b38895cc163f58f04e68d841bebf710dde03cff5953acad2ff7983c240d1b966c9d1dcf767b47a636873bdd4b96bd2ed7e6d WHIRLPOOL c7848ecd8b5ab9a2a55fdc717d6c47c5a54076144b805a79a75ce5ac9a3fea7b5cc92dfe5f8ab978d0bd3d4cb8674c35a111a3d0ec063b435b592e3e5293a9a9
 DIST amSynth-1.3.2.tar.gz 635901 SHA256 3ad50c20d690865ea0fdef6745cd04a9f758e9ae654ad874902d3da896e0fa75 SHA512 c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840692e2012ac9501ca83f5e5018a0218d9c35a99678e80 WHIRLPOOL 3b93486378a140ce7feb0789cc46a74375920ae717d38910e0b75011e4f1c827749f795ce38b7408d72adb4abfab090a104fc23f001977c68576bde05e1fa260
-EBUILD amsynth-1.2.0.ebuild 1452 SHA256 e80c794467ea0f65a93d3300b84765cbc19ad52dfc7da0eabe755608f9bd08ee SHA512 26bb22d15914ac850d991322e997e0728705a5d0ef344663dc6ea557108175bf9610b0d24e5292eef5e6df510c8d66d53319ebe2d1bbb07d4fa0fabd1ff1bc78 WHIRLPOOL b0f0b92799c3fb3d47200c50eae9c9c620d4974bcaf0e4282581c5ced55680a4dcc71118679ca5302ee06a63c0fc3d6cff80159b001c814ba633a6efc09254ee
-EBUILD amsynth-1.2.2.ebuild 1297 SHA256 efb1acd12f7ba7291eb57db617db9900f44ffde5242a6c33c4cb756bb373e631 SHA512 fb77acddb3cacbf80960c35bffb0d59f66844dec7da4ee69e70a8fe992d7f0980130926067021343e3770da2dd0a7d5a3d95e8874f0424bf586056b286444744 WHIRLPOOL 1212aa043d8f516e4d75e051036261299d5bd0663fe5bf218254c48787a85324fae32c2b986874ac2efc6a220b2c7d130e298485a8fb033c807086bbf828007e
 EBUILD amsynth-1.2.3-r1.ebuild 1296 SHA256 b7a4516aa52cd2b020a0619c5051cea90ddae905824f5364e45f2b5e96017871 SHA512 567d96cc1f96fd666f141db85bb6f8d2735600e912fa739cc58d973638c7a9c69027f0ff94da08e39077e3d26013f328fdce95650ebf8f4711e8320adf4daa14 WHIRLPOOL d46b124c0063a0dab10e5b02039961a671e56084e046a5525c2eeedf85629a521075ae2d8c04d390ab8ae2e95a50ab94d50819dfaff891094624dc0e79335af0
-EBUILD amsynth-1.2.3.ebuild 1198 SHA256 fc3558910eed0c8c39abddab43ac8aea2a6a3ba27d518ae165fdaf98a82d7c74 SHA512 d9dec5febd3c65e5650aba734214a77d4587d439dc3f0484656a40de9599aa6f463293264381d676afb83509780ecaff25103e32c33ed37343a64fdba0ddaded WHIRLPOOL d122c28b6dca512d9a210cb2aa32485dde7b65945e61ec520adbfd0ef82c543609f0e278f36ae301b1cd604ac3cdf3e4dd50b421fb0045240153c8c6ff587b6e
 EBUILD amsynth-1.3.2.ebuild 1146 SHA256 7569814cf27974f64e435862473e4521094d4c3af972c2a406e3058429b8b78c SHA512 d5e192bc2fd0c6af1ba399d77471d2d6d76975ffd19cad8e639f1b8a340fb49062462ab05265792b2da9d67c7c91980849e7bafdf56d275122eddaa91ffdc3e6 WHIRLPOOL 587d6c7755332b63e6d7daff3fded790993ef28e2c543041b4f4cb0896878c9ea57063d8192f0f4fe0e24369ffa1fc43cca32ad51a37f12ed9eb262d80483d89
-MISC ChangeLog 6241 SHA256 8b370e3a3518b3f0e6fa2b55591f3c73068a46210953f79a2261077cf2f0c37d SHA512 e907a8015a4d7c748e5608878a0f94e68fe73a30d3b81de3628babf698d81f151dcb5952c2a05694b52338a68e22f26627b3b1ebf954958fc796ca3980f7eb9b WHIRLPOOL eda799a7510d831c37c9419f5a87bec3ed8afe0c4cafe054fcceefabf5eaddd43e8a8da8e3ab0141943518ad69277dec05042312b9729395d8e2d4a5fbd66df4
+MISC ChangeLog 6558 SHA256 65a4029a1351e5139ad7ff846fec6485734f14d43f70d0402f594d55b9c8d2c8 SHA512 5e87cbe65a169f477ce90f6704c54b2669097956186a4e6b51f225b69f7c06cc946a37d2643fb24cbe3b801dd6341cd92fe8c17a6a9734763f1bb3f4674c395d WHIRLPOOL a1b2c11916530ec6a9116b0f48d743c547800fd61cbff764dee784f655dffb7a26a569850a0f1319983a9bbf57b1fe3fbb851d24073c43b3546c305789427b16
 MISC metadata.xml 246 SHA256 b241afd343589da5de213ad4c15355c746f9d9fa0b337f8d9e25e384a57fc189 SHA512 24c4a0bc484d374507b2e3f40fd325611fde729af572144a8b2a43dd56d560600ee8d1c2d69d7b3eabca4bd6ecfe5fed56e734f2687aa89329e3d280c294ee3b WHIRLPOOL 9dcec8e4fde658014f9df746556272c7ead5d7dbb6c2a51016e6eb11a0b5e88c0660fc2272e75b8e6e26b086514ab3a7b03276ea7f012dc5a4deb1ff005ca82d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRKx0oAAoJEEdUh39IaPFN1sAH+gJcTVPfwsYKc8D+5zewcOY6
-GMfPPoWpWcdcOcEfozDF+mQD4LtDBYDT3XsGMoePEJqO85gY7kkhstgs8MYiN5XT
-UGDWerohrLraSvGbskcPbbuAcr8h1iEbL4zqRX67gVq093EFeTg5FpHpd3LlcCeC
-P14oSgL38PcwXAdXkq0c+ZyxS4a+cyffxHlV9AN5VBeCAjNmvCLAeS+rF0OWF+7I
-gk8H0f16YMvBff2D9pUAF1x7nRfzUqRuvp4QhMRseZFhc9PLCq6QdD6mRA/t8pvc
-fo6e6mE3D3jDJD+tYwC9MYcZdVAfamu4uNLSv+QM12szZuXouf2wX3FuIWMStZ0=
-=3oKZ
+iQEcBAEBCAAGBQJRKx1sAAoJEEdUh39IaPFNDWMIAIQHL30+nY40vPrYis9rqzjR
+LktN7J4ofTCXmm+/xoS4bLYdXgyhhoX+QWoHJKVNVA/++t3bP08D/B1jWqyHw47J
+fDQbDkx+s0k0CcC5ZVqCOJTjXoUKmeZGURawQVpwgxs1Cxm8CNMChE21MUOlC+UP
+s3xROVd3r9RKuCHbvxMBA/8SskYdWHhe39aaJa3A98aeERdrQ/itWf0ydmb4+4+c
+uDOf47c0TteEWrvsM6OVfp8sJiWdFXbWBjPDu+p76jfMhJXXfBig1vTlHGX7j4rG
+ZKYu3mJLaqrzXOqTdK5NPROy8mJkLiw7LwqcDh64yW/pnuism6sSAi0S/Uc93lM=
+=rnlt
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amsynth/amsynth-1.2.0.ebuild b/media-sound/amsynth/amsynth-1.2.0.ebuild
deleted file mode 100644
index eeaacc70ffb0..000000000000
--- a/media-sound/amsynth/amsynth-1.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.0.ebuild,v 1.12 2012/05/05 08:05:35 mgorny Exp $
-
-EAPI=2
-inherit autotools eutils
-
-MY_P=${P/_rc/-rc}
-MY_P=${MY_P/amsynth/amSynth}
-
-DESCRIPTION="Virtual analogue synthesizer."
-HOMEPAGE="http://amsynthe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amsynthe/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa debug jack oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1.0 )
-	alsa? ( >=media-libs/alsa-lib-0.9 media-sound/alsa-utils )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-debug.patch
-	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with sndfile) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	elog
-	elog "amSynth has been installed normally. If you would like to use"
-	elog "the virtual keyboard option, then do:"
-	elog "# emerge vkeybd"
-	elog "and make sure you emerged amSynth with alsa support (USE=alsa)"
-	elog
-}
diff --git a/media-sound/amsynth/amsynth-1.2.2.ebuild b/media-sound/amsynth/amsynth-1.2.2.ebuild
deleted file mode 100644
index 41e506379ae4..000000000000
--- a/media-sound/amsynth/amsynth-1.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.2.ebuild,v 1.4 2012/05/05 08:05:35 mgorny Exp $
-
-EAPI=2
-MY_P=${P/ams/amS}
-inherit autotools eutils
-
-DESCRIPTION="Virtual analogue synthesizer."
-HOMEPAGE="http://amsynthe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amsynthe/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug jack oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1 )
-	alsa? ( media-libs/alsa-lib
-		media-sound/alsa-utils )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with sndfile) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	elog
-	elog "amSynth has been installed normally. If you would like to use"
-	elog "the virtual keyboard option, then do:"
-	elog "# emerge vkeybd"
-	elog "and make sure you emerged amSynth with alsa support (USE=alsa)"
-	elog
-}
diff --git a/media-sound/amsynth/amsynth-1.2.3.ebuild b/media-sound/amsynth/amsynth-1.2.3.ebuild
deleted file mode 100644
index 113b620813a9..000000000000
--- a/media-sound/amsynth/amsynth-1.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.3.ebuild,v 1.6 2012/05/05 08:05:35 mgorny Exp $
-
-EAPI=2
-
-MY_P=${P/ams/amS}
-DESCRIPTION="Virtual analogue synthesizer."
-HOMEPAGE="http://amsynthe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/amsynthe/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug jack oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1 )
-	alsa? ( media-libs/alsa-lib
-		media-sound/alsa-utils )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with sndfile) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	elog
-	elog "amSynth has been installed normally. If you would like to use"
-	elog "the virtual keyboard option, then do:"
-	elog "# emerge vkeybd"
-	elog "and make sure you emerged amSynth with alsa support (USE=alsa)"
-	elog
-}
diff --git a/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch b/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch
deleted file mode 100644
index cd49c9fefdd2..000000000000
--- a/media-sound/amsynth/files/amsynth-1.2.0+gcc-4.3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=1947310&group_id=47275&atid=448967
-
-Index: amSynth-1.2.0/src/Config.cc
-===================================================================
---- amSynth-1.2.0.orig/src/Config.cc
-+++ amSynth-1.2.0/src/Config.cc
-@@ -6,6 +6,7 @@
- 
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
- 
- using namespace std;
- 
-Index: amSynth-1.2.0/src/drivers/MidiInterface.cc
-===================================================================
---- amSynth-1.2.0.orig/src/drivers/MidiInterface.cc
-+++ amSynth-1.2.0/src/drivers/MidiInterface.cc
-@@ -8,6 +8,7 @@
- #include "OSSMidiDriver.h"
- 
- #include <iostream>
-+#include <strings.h>
- 
- #define MIDI_BUF_SIZE 64
- void sched_realtime (); // defined in main.cc
-Index: amSynth-1.2.0/src/GUI/PresetControllerView.cc
-===================================================================
---- amSynth-1.2.0.orig/src/GUI/PresetControllerView.cc
-+++ amSynth-1.2.0/src/GUI/PresetControllerView.cc
-@@ -8,7 +8,6 @@
- #include <stdio.h>
- #include <iostream>
- 
--using SigC::slot;
- using sigc::bind;
- using std::cout;
- using namespace std;
-Index: amSynth-1.2.0/src/MidiController.cc
-===================================================================
---- amSynth-1.2.0.orig/src/MidiController.cc
-+++ amSynth-1.2.0/src/MidiController.cc
-@@ -8,6 +8,7 @@
- #ifdef _DEBUG
- #include <iostream>
- #endif
-+#include <cstdlib>
- 
- using namespace std;
- 
-Index: amSynth-1.2.0/src/Parameter.cc
-===================================================================
---- amSynth-1.2.0.orig/src/Parameter.cc
-+++ amSynth-1.2.0/src/Parameter.cc
-@@ -4,6 +4,8 @@
- 
- #include "Parameter.h"
- 
-+#include <cstdlib>
-+
- #ifdef _DEBUG
- #include <iostream>
- #endif
-Index: amSynth-1.2.0/src/VoiceAllocationUnit.cc
-===================================================================
---- amSynth-1.2.0.orig/src/VoiceAllocationUnit.cc
-+++ amSynth-1.2.0/src/VoiceAllocationUnit.cc
-@@ -9,6 +9,7 @@
- #include "Effects/Distortion.h"
- 
- #include <iostream>
-+#include <cstring>
- #include <math.h>
- #include <assert.h>
- 
diff --git a/media-sound/amsynth/files/amsynth-1.2.0-asneeded.patch b/media-sound/amsynth/files/amsynth-1.2.0-asneeded.patch
deleted file mode 100644
index ec1f1bb7e8af..000000000000
--- a/media-sound/amsynth/files/amsynth-1.2.0-asneeded.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: amSynth-1.2.0/configure.in
-===================================================================
---- amSynth-1.2.0.orig/configure.in
-+++ amSynth-1.2.0/configure.in
-@@ -148,21 +148,25 @@ dnl	Set compiler options accordingly
- dnl
- dnl
- 
-+LIBSADDED=""
-+
- if test "$with_oss" = "yes";  then
- 	CXXFLAGS="$CXXFLAGS -Dwith_oss"
- fi
- if test "$with_alsa" = "yes"; then 
- 	CXXFLAGS="$CXXFLAGS -Dwith_alsa"
--	LDFLAGS="$LDFLAGS -lasound"
-+	LIBSADDED="$LIBSADDED -lasound"
- fi
- if test "$with_jack" = "yes"; then 
- 	CXXFLAGS="$CXXFLAGS -Dwith_jack"
- fi
- if test "$with_sndfile" = "yes"; then
- 	CXXFLAGS="$CXXFLAGS -Dwith_sndfile"
--	LDFLAGS="$LDFLAGS -lsndfile"
-+	LIBSADDED="$LIBSADDED -lsndfile"
- fi
- 
-+AC_SUBST(LIBSADDED)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile 
-Index: amSynth-1.2.0/src/Makefile.am
-===================================================================
---- amSynth-1.2.0.orig/src/Makefile.am
-+++ amSynth-1.2.0/src/Makefile.am
-@@ -16,7 +16,7 @@ amSynth_SOURCES = \
- 
- SUBDIRS = drivers VoiceBoard GUI Effects
- 
--amSynth_LDADD = drivers/libdrivers.a VoiceBoard/libVoiceBoard.a GUI/libGUI.a Effects/libEffects.a
-+amSynth_LDADD = drivers/libdrivers.a VoiceBoard/libVoiceBoard.a GUI/libGUI.a Effects/libEffects.a @LIBSADDED@
- 
- amSynth_CFLAGS = $(CFLAGS) -DENABLE_BINRELOC
- amSynth_CXXFLAGS = $(CXXFLAGS) -DENABLE_BINRELOC
diff --git a/media-sound/amsynth/files/amsynth-1.2.0-cflags.patch b/media-sound/amsynth/files/amsynth-1.2.0-cflags.patch
deleted file mode 100644
index a2d7e0b8e6a8..000000000000
--- a/media-sound/amsynth/files/amsynth-1.2.0-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: amSynth-1.2.0/configure.in
-===================================================================
---- amSynth-1.2.0.orig/configure.in
-+++ amSynth-1.2.0/configure.in
-@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
- 
- 
- addCXXFLAGS="-D_REENTRANT"
--CXXFLAGS="-Wall"
-+CXXFLAGS="$CXXFLAGS -Wall"
- 
- AC_PROG_CXX
- AC_PROG_INSTALL
-@@ -117,12 +117,6 @@ else
- 	profiling=no
- fi
- 
--if test $profiling = "no"; then 
--  if test $debugging = "no"; then
--    CXXFLAGS="$CXXFLAGS -O3 -ffast-math -fno-exceptions -fomit-frame-pointer"
--  fi 
--fi
--
- 
- dnl
- dnl
diff --git a/media-sound/amsynth/files/amsynth-1.2.0-debug.patch b/media-sound/amsynth/files/amsynth-1.2.0-debug.patch
deleted file mode 100644
index e409fb7a8874..000000000000
--- a/media-sound/amsynth/files/amsynth-1.2.0-debug.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: amSynth-1.2.0/src/MidiController.cc
-===================================================================
---- amSynth-1.2.0.orig/src/MidiController.cc
-+++ amSynth-1.2.0/src/MidiController.cc
-@@ -5,6 +5,9 @@
- #include "MidiController.h"
- #include <fstream>
- #include <assert.h>
-+#ifdef _DEBUG
-+#include <iostream>
-+#endif
- 
- using namespace std;
- 
-Index: amSynth-1.2.0/src/Parameter.cc
-===================================================================
---- amSynth-1.2.0.orig/src/Parameter.cc
-+++ amSynth-1.2.0/src/Parameter.cc
-@@ -71,15 +71,15 @@ Parameter::setValue(float value)
- 			controlValue = offset + ::pow( _value, (float)base );
- #ifdef _DEBUG
- 		default:
--		cout << "<Parameter> mode is undefined" << endl;
-+		std::cout << "<Parameter> mode is undefined" << std::endl;
- 		break;
- #endif
- 	}
- 	
- #ifdef _DEBUG
--	cout << "<Parameter::setValue( " << foo 
-+	std::cout << "<Parameter::setValue( " << foo 
- 	<< " ) min=" << _min << " max=" << _max << " value set to " << _value 
--	<< " controlValue set to " << controlValue << endl;
-+	<< " controlValue set to " << controlValue << std::endl;
- #endif
- 	
- 	// TODO: only update() Listeners it there _was_ a change?
-@@ -88,7 +88,7 @@ Parameter::setValue(float value)
- 		for (unsigned i=0; i<updateListeners.size(); i++)
- 		{
- #ifdef _DEBUG
--			cout << "updating UpdateListener " << updateListeners[i] << endl;
-+			std::cout << "updating UpdateListener " << updateListeners[i] << std::endl;
- #endif
- 			updateListeners[i]->UpdateParameter (mParamId, controlValue);
- 		}
diff --git a/media-sound/amsynth/files/amsynth-1.2.2-asneeded.patch b/media-sound/amsynth/files/amsynth-1.2.2-asneeded.patch
deleted file mode 100644
index 8e6ba99e293d..000000000000
--- a/media-sound/amsynth/files/amsynth-1.2.2-asneeded.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur amSynth-1.2.2.orig/configure.in amSynth-1.2.2/configure.in
---- amSynth-1.2.2.orig/configure.in	2009-07-12 19:40:37.000000000 +0300
-+++ amSynth-1.2.2/configure.in	2009-08-28 21:13:09.000000000 +0300
-@@ -5,7 +5,7 @@
- 
- 
- addCXXFLAGS="-D_REENTRANT"
--CXXFLAGS="-Wall"
-+CXXFLAGS="$CXXFLAGS -Wall"
- 
- AC_PROG_CXX
- AC_PROG_INSTALL
-@@ -117,11 +117,6 @@
- 	profiling=no
- fi
- 
--if test $profiling = "no"; then 
--  if test $debugging = "no"; then
--    CXXFLAGS="$CXXFLAGS -O3 -ffast-math -fno-exceptions -fomit-frame-pointer"
--  fi 
--fi
- 
- 
- dnl
-@@ -153,17 +148,19 @@
- fi
- if test "$with_alsa" = "yes"; then 
- 	CXXFLAGS="$CXXFLAGS -Dwith_alsa"
--	LDFLAGS="$LDFLAGS -lasound"
-+	LIBS="$LIBS -lasound"
- fi
- if test "$with_jack" = "yes"; then 
- 	CXXFLAGS="$CXXFLAGS -Dwith_jack"
--	LDFLAGS="$LDFLAGS -ljack"
-+	LIBS="$LIBS -ljack"
- fi
- if test "$with_sndfile" = "yes"; then
- 	CXXFLAGS="$CXXFLAGS -Dwith_sndfile"
--	LDFLAGS="$LDFLAGS -lsndfile"
-+	LIBS="$LIBS -lsndfile"
- fi
- 
-+AC_SUBST(LIBS)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile 
-diff -ur amSynth-1.2.2.orig/src/Makefile.am amSynth-1.2.2/src/Makefile.am
---- amSynth-1.2.2.orig/src/Makefile.am	2009-07-12 19:40:37.000000000 +0300
-+++ amSynth-1.2.2/src/Makefile.am	2009-08-28 21:14:08.000000000 +0300
-@@ -16,12 +16,10 @@
- 
- SUBDIRS = drivers VoiceBoard GUI Effects
- 
--amSynth_LDADD = drivers/libdrivers.a VoiceBoard/libVoiceBoard.a GUI/libGUI.a Effects/libEffects.a
-+amSynth_LDADD = drivers/libdrivers.a VoiceBoard/libVoiceBoard.a GUI/libGUI.a Effects/libEffects.a -lstdc++ -lm -lpthread $(DEPS_LIBS) $(LIBS)
- 
- amSynth_CFLAGS = $(CFLAGS) -DENABLE_BINRELOC
- amSynth_CXXFLAGS = $(CXXFLAGS) -DENABLE_BINRELOC
--amSynth_LIBS = -lstdc++ -lm -lpthread
--amSynth_LDFLAGS = $(DEPS_LIBS)
- 
- install-exec-hook):
- 	chown root $(DESTDIR)$(bindir)/amSynth;\