Version bump wrt #280649.

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

4 files changed, 129 insertions, 2 deletions

diff --git a/media-sound/amsynth/ChangeLog b/media-sound/amsynth/ChangeLog
index f57879655f93..89b8b7a4c784 100644
--- a/media-sound/amsynth/ChangeLog
+++ b/media-sound/amsynth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amsynth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.32 2009/08/01 06:21:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.33 2009/08/28 18:18:30 ssuominen Exp $
+
+*amsynth-1.2.2 (28 Aug 2009)
+
+  28 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> +amsynth-1.2.2.ebuild,
+  +files/amsynth-1.2.2-asneeded.patch:
+  Version bump wrt #280649.
 
   01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> amsynth-1.2.0.ebuild:
   Remove built_with_use check for media-libs/alsa-lib[midi].
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 64a9838cd1c7..3798f3ec6367 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -2,7 +2,10 @@ AUX amsynth-1.2.0+gcc-4.3.patch 2053 RMD160 f95c85ee18b3106bb332ffaa1126016f7d49
 AUX amsynth-1.2.0-asneeded.patch 1326 RMD160 b162bafcca8924540960c1b85c6080f19bdbabaf SHA1 d40428cda5af6df537cb4e5f22587d97ecfec88a SHA256 39c4cf8de92dcce9e90eda336bf545876207cf070e1be6573e3c2368a1579d06
 AUX amsynth-1.2.0-cflags.patch 542 RMD160 9725b28818b7cc6c7d4090ba1aea2dadecd5d1e7 SHA1 4725f56e6e946623fa9e043a481a8e4c54fb360e SHA256 463c6f9df0084d398e37783d25e95340ce3029660e221f68842b06aef08e3a5d
 AUX amsynth-1.2.0-debug.patch 1526 RMD160 85303509b7e400b892cf4b29ef54e1125908861a SHA1 d8909b260396771c78fe1ab4e351375eb4001698 SHA256 87c5de38991eae846f8c202e649d5cfc05c69daae1c2b6e8b88ace2ca66d13b5
+AUX amsynth-1.2.2-asneeded.patch 1782 RMD160 e9d0c1d22d551d4ec6999fdb2be26082b746a9c0 SHA1 e732ef3f7adf1025fba7951525e0083f1b426a97 SHA256 cab2efb93dae35f31184178cb652b19a6df9e9472589be4c330d888ee3469640
 DIST amSynth-1.2.0.tar.gz 616311 RMD160 b24b493e1532f3b1ad574856cfaadf8418e32900 SHA1 3e92417f6898f24a0996fef45827937fbf28e9ef SHA256 5fff8dc65bd5550bbf408e3df1123c68e31517bbb7441cbe0b964ab271948b1c
+DIST amSynth-1.2.2.tar.gz 611764 RMD160 70b044ca848e503929b9cebbf671b23f70053214 SHA1 3435c05be4a836666e7bf16ac44fee6def218c5d SHA256 049adb4ae35325f1f0c2c487d6dc435735c7950f6829e2d0e97f969786e5a7c0
 EBUILD amsynth-1.2.0.ebuild 1463 RMD160 4c9b1c01936a9d242a001da4860435ee24ae8009 SHA1 3d8a9e432f2dabef9cea7f176eab4131e811e0ce SHA256 6c939a3409bc74736b1a51c30532ae1e2d122de19a9c6db1a37682d1a1b7d279
-MISC ChangeLog 4396 RMD160 383874eddc823f728d82801abdb0c948fe23d59c SHA1 5fdfda75393a3f1b36956e6791b375dda9041d36 SHA256 ae99cf64478b8a6233a2b423b0714ed5b1d00c7dd220df9e0d9bfc111057554f
+EBUILD amsynth-1.2.2.ebuild 1310 RMD160 d2f5bf5c15f2db82d8377b4fbb85d3b2f270ab7b SHA1 2f7c1a57ed3febfbf6a3b11d962c26990102de77 SHA256 35d50939c1ba991d210583d8442307c7bbad3b0b64cbccd01a44095b8e8f6ee5
+MISC ChangeLog 4571 RMD160 36500d3c09d639e3f57062d235bc352f8eb7fc03 SHA1 7d04a62bb0da2a71e3291fc2ed745ad77bc23dec SHA256 3231d20683db6931fa3fb3d67804ecb2f2cb6f8f7f9bf3cf20f0cea7ff0b6406
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/amsynth/amsynth-1.2.2.ebuild b/media-sound/amsynth/amsynth-1.2.2.ebuild
new file mode 100644
index 000000000000..0178ad0e4f69
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 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.1 2009/08/28 18:18:30 ssuominen 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 ~sparc ~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}
+	dev-util/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/files/amsynth-1.2.2-asneeded.patch b/media-sound/amsynth/files/amsynth-1.2.2-asneeded.patch
new file mode 100644
index 000000000000..8e6ba99e293d
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.2.2-asneeded.patch
@@ -0,0 +1,64 @@
+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;\