old

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

9 files changed, 8 insertions, 417 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/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;\