version bump, by Christopher Harvey <chris@basementcode.com>, bug #309037, with some modifications and patches by me.

Package-Manager: portage-2.2.0_alpha11/cvs/Linux x86_64

8 files changed, 189 insertions, 3 deletions

diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog
index 4533470688b1..ae8c16a2a794 100644
--- a/media-libs/stk/ChangeLog
+++ b/media-libs/stk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/stk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.5 2010/08/17 19:06:22 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.6 2011/01/02 14:23:05 aballier Exp $
+
+*stk-4.4.2 (02 Jan 2011)
+
+  02 Jan 2011; Alexis Ballier <aballier@gentoo.org> +stk-4.4.2.ebuild,
+  +files/stk-4.4.2/010_all_removeForcedFlags.patch,
+  +files/stk-4.4.2/020_all_noExamplesOrDemo.patch,
+  +files/stk-4.4.2/030_all_sharedlib.patch,
+  +files/stk-4.4.2/040_all_soname.patch, +files/stk-4.4.2/050_all_abiver.patch:
+  version bump, by Christopher Harvey <chris@basementcode.com>, bug #309037,
+  with some modifications and patches by me.
 
   17 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
   files/stk-4.3.1-gcc44.patch:
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index b85bbe6770ec..241a5e66ef34 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,10 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stk-4.3.1-cflags-lib.patch 1687 RMD160 d81cc35b588f48b3fc0b624efe2871134956c81e SHA1 9176b2a49e45a21d247b184e53ec7a8d1f7aecd4 SHA256 ae1a1bca7d4f4ba0f94e61ef52c525b024e684f1ab4df701f5265b24c0644d92
 AUX stk-4.3.1-fpic.patch 1327 RMD160 f8bb978968cd194e80cb099fb33bd479dcea7fb0 SHA1 86858582fb8d235d0aaa16fc29e0d7c88255be2f SHA256 d1215c76d362298c530dfcd1e0ca3a3b4c19a9b84c60129549919cea2f9c0e95
 AUX stk-4.3.1-gcc43.patch 8066 RMD160 db8cbe250fc36f3855c22a7449e0b90b29e2e372 SHA1 265a9f591b86fcc55e17c625bba82232a79cbf40 SHA256 ddd36ac2a288d363d57ec1960ec9be68f01282131dd7b90b3be2d2e124274d43
 AUX stk-4.3.1-gcc44.patch 573 RMD160 6c10d2dbff2adcc53e72df904a73e3f8a239098f SHA1 0c8e1adf66b4d6546f44c4377910d0100481c159 SHA256 a82cecb632a4ba4dc0987c7782da53086ec33ea5673a6928fba307a61667a29c
 AUX stk-4.3.1-ldflags.patch 14109 RMD160 53aac79e1acd8072436abc226a1a785824a4150e SHA1 c3aa6b7319bdd1ade81ad4514ccfe756c034428d SHA256 b6471df0ffbefbb71e184f84da9df2e7d6647261907d338dab18edcd7efadc18
 AUX stk-4.3.1-missing.patch 184 RMD160 7934473e75e5dfb7a7abbaba321b0ac24d6ad485 SHA1 306fdf8dbe2f265dfc3a983d851c26915ecac413 SHA256 413f49d39320c4c5af3da6c45f2927fc75eac101cd64c8d0fcc1a054907ed3cb
+AUX stk-4.4.2/010_all_removeForcedFlags.patch 982 RMD160 9e5fb0804f3858e5c8ce8f67801040ff89853165 SHA1 3920d767b0e95538acae4eb48f730d302a131a89 SHA256 a99175d83a03b8d69f27f2cc80b3fb195a41a0877f2cb58a3fca936bb5798bd8
+AUX stk-4.4.2/020_all_noExamplesOrDemo.patch 818 RMD160 8f80a99574a65b601f7c791148bf701b0463136a SHA1 524c3e6f7f13663b2f6f7a08be8a1ee2fb17b344 SHA256 09e2d2e037c33fc6e81e5bf56a07ac3c33a1438e2451a666e22c1194a37fcb83
+AUX stk-4.4.2/030_all_sharedlib.patch 419 RMD160 2fcc0722718527f348655a7b86bc65c03d3a466a SHA1 6603cefd8e911d7bf692c565814b2b4f008c175a SHA256 5937829e3e0ba5c3cb1ff044c3ee6077dd2bf0a7a6eb9fe3819280fb5de7f5e6
+AUX stk-4.4.2/040_all_soname.patch 702 RMD160 68bee7b11306796444139126367467aced206f78 SHA1 6c847b5a3cecff1305c0142db8a21788b684bc16 SHA256 23acc1786d01c5bf650f8475c0d2156daea992f87a960b8082acb5240b113eeb
+AUX stk-4.4.2/050_all_abiver.patch 313 RMD160 6876387419de3bd702e483cf700e535b07b07825 SHA1 c27bc39b8840d9b87c10cf666d848ae733327807 SHA256 e52e9f8a5d0aa2a50d8f6bee485ee89582b13e4bc80c7043cae977faa57683af
 DIST stk-4.3.1.tar.gz 1952667 RMD160 f0cde3c13af08f4ae58174272bfd09df6f00fec1 SHA1 56922c001f9fc8f7c5cefe5f0c2e64ffa273dffe SHA256 e87fae4fe4e4681185afb752f5ce90cf8fcf16600a0c76d025a3f638be32cee0
+DIST stk-4.4.2.tar.gz 2056848 RMD160 7226186bea51f59a0a08ef51dc366cf41a6fc39b SHA1 f610edc8c1367a96a78314d4113b105369ea5fa7 SHA256 8bef3ab3de10dc587afac47aa7710f3579bd39d6aaf2f155305ad94f81e3c17a
 EBUILD stk-4.3.1.ebuild 1561 RMD160 89aa5c16ee91e621f0b0a1e768e331351c7a59a3 SHA1 aea8cf5124088380cdc4de5643577cda6e02e58c SHA256 d9debcad40c4ad925c5972c93b2ad74a833d0eb09b30c0f4b3de8dee4d7b8660
-MISC ChangeLog 1102 RMD160 e985f3acefc2ccd85ecc7a5d4f42645497314af6 SHA1 c2fcff60b9d8172571b8fa0b8809c8c4042570bb SHA256 cb1e020b2697c89b0ee0677cf6047318ae8e2c31a678e9974045ddf0d59c64c0
+EBUILD stk-4.4.2.ebuild 1674 RMD160 b5e1201ef0f8bb4963355362c738e76f92f4a259 SHA1 92a9b0ee5cd12ca5c4fa46060185eadc4bc86400 SHA256 ba6af8b9b158823a384452f1e5999a109b916be6867856b8141279acce8ca876
+MISC ChangeLog 1548 RMD160 e14cbcc0bf8ae6fbd32a9c97d48b05c6adb8d7e4 SHA1 a8dee56e3d08f6d5e4dbf4b69f9104de7887fbb6 SHA256 278a5f3021eb44c105fc8ad6372237b589ce7d9dfd668e6396a324af2238a206
 MISC metadata.xml 352 RMD160 8d338d54feb3c0f60dc71c3a44460e39a93f115a SHA1 fee1c5535bc79eb5119956e449e8212d4ed16785 SHA256 f2c8dc1810e2ee90a144d4670591484d8ad5ce927df0f493016548ea5cbaf343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0gik4ACgkQvFcC4BYPU0rpXACfWchAT96WCa2aM38V4s91BOOU
+u+8AoJtEIqJHidLgo5uYrqxtm0NS0r/P
+=zq/3
+-----END PGP SIGNATURE-----
diff --git a/media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch b/media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch
new file mode 100644
index 000000000000..bb86e929ae36
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch
@@ -0,0 +1,25 @@
+--- stk-4.4.2/configure.ac	2010-02-04 15:52:39.000000000 -0500
++++ configure.ac	2010-03-11 23:55:44.000000000 -0500
+@@ -51,7 +51,7 @@
+ AC_ARG_ENABLE(debug,
+   [  --enable-debug = enable various debug output],
+   [AC_SUBST( cppflag, ["-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"] ) AC_SUBST( cxxflag, ["-g"] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
+-  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
++  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
+ 
+ # Checks for functions
+ if test $realtime = yes; then
+@@ -63,12 +63,7 @@
+ CPPFLAGS="$CPPFLAGS $cppflag"
+ 
+ # For debugging and optimization ... overwrite default because it has both -g and -O2
+-CXXFLAGS="$cxxflag"
+-
+-# Check compiler and use -Wall if gnu.
+-if [test $GXX = "yes" ;] then
+-  AC_SUBST( cxxflag, [-Wall] )
+-fi
++CXXFLAGS="$cxxflag $CXXFLAGS"
+ 
+ CXXFLAGS="$CXXFLAGS $cxxflag"
+ 
diff --git a/media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch b/media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch
new file mode 100644
index 000000000000..ca17140035b4
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch
@@ -0,0 +1,27 @@
+--- Makefile.in~	2010-02-04 15:52:39.000000000 -0500
++++ Makefile.in	2010-03-11 22:53:24.000000000 -0500
+@@ -2,24 +2,12 @@
+ 
+ all :
+ 	cd src && $(MAKE)
+-	cd projects/demo && $(MAKE) libdemo
+-	cd projects/effects && $(MAKE) libeffects
+-	cd projects/ragamatic && $(MAKE) libragamat
+-	cd projects/examples && $(MAKE) -f libMakefile
+ 
+ clean : 
+ 	-rm -f *~
+ 	cd src && $(MAKE) clean
+-	cd projects/demo && $(MAKE) clean
+-	cd projects/effects && $(MAKE) clean
+-	cd projects/ragamatic && $(MAKE) clean
+-	cd projects/examples && $(MAKE) clean
+ 
+ distclean: clean
+ 	-rm -rf config.log config.status autom4te.cache Makefile
+ 	cd src && $(MAKE) distclean
+-	cd projects/demo && $(MAKE) distclean
+-	cd projects/effects && $(MAKE) distclean
+-	cd projects/ragamatic && $(MAKE) distclean
+-	cd projects/examples && $(MAKE) distclean
+ 
diff --git a/media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch b/media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch
new file mode 100644
index 000000000000..148403effee2
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.2/src/Makefile.in
+===================================================================
+--- stk-4.4.2.orig/src/Makefile.in
++++ stk-4.4.2/src/Makefile.in
+@@ -64,7 +64,7 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+ %.o : ../src/include/%.cpp
+ 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
+ 
+-all : $(LIBRARY)
++all : $(LIBRARY) $(SHAREDLIB).$(RELEASE)
+ 
+ $(LIBRARY) : $(OBJECTS)
+ 	$(RM) -f $(LIBRARY)
diff --git a/media-libs/stk/files/stk-4.4.2/040_all_soname.patch b/media-libs/stk/files/stk-4.4.2/040_all_soname.patch
new file mode 100644
index 000000000000..0ec576c963cf
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.2/040_all_soname.patch
@@ -0,0 +1,16 @@
+Index: stk-4.4.2/src/Makefile.in
+===================================================================
+--- stk-4.4.2.orig/src/Makefile.in
++++ stk-4.4.2/src/Makefile.in
+@@ -72,10 +72,9 @@ $(LIBRARY) : $(OBJECTS)
+ 
+ $(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+-	$(CC) $(LDFLAGS) -fPIC -shared -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+ 	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+ 	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+-#	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+ 
+ $(OBJECTS) : Stk.h
+ 
diff --git a/media-libs/stk/files/stk-4.4.2/050_all_abiver.patch b/media-libs/stk/files/stk-4.4.2/050_all_abiver.patch
new file mode 100644
index 000000000000..cca9c13a0d62
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.2/050_all_abiver.patch
@@ -0,0 +1,15 @@
+Index: stk-4.4.2/src/Makefile.in
+===================================================================
+--- stk-4.4.2.orig/src/Makefile.in
++++ stk-4.4.2/src/Makefile.in
+@@ -3,8 +3,8 @@
+ 
+ LIBRARY = libstk.a
+ SHAREDLIB = libstk.so
+-MAJOR = 4
+-RELEASE = 4.4.2
++MAJOR = 44
++RELEASE = 44.2
+ 
+ AR = ar -rsc
+ RM = /bin/rm
diff --git a/media-libs/stk/stk-4.4.2.ebuild b/media-libs/stk/stk-4.4.2.ebuild
new file mode 100644
index 000000000000..297cf6c32ce6
--- /dev/null
+++ b/media-libs/stk/stk-4.4.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.4.2.ebuild,v 1.1 2011/01/02 14:23:05 aballier Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="http://ccrma.stanford.edu/software/stk/"
+SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${PF}"
+	eautoreconf
+}
+
+src_configure() {
+	#breaks with --disable-foo...uses as --enable-foo
+	local myconf
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	fi
+	if use oss; then
+		myconf="${myconf} --with-oss"
+	fi
+	if use alsa; then
+		myconf="${myconf} --with-alsa"
+	fi
+	if use jack; then
+		myconf="${myconf} --with-jack"
+	fi
+
+	econf ${myconf} \
+		RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+	dodoc README || die "Failed to install README"
+	# install the lib
+	dolib src/libstk.* || die "Failed to install libstk.*"
+	# install headers
+	insinto /usr/include/stk || die "Failed to create header directory."
+	doins include/*.h include/*.msg include/*.tbl \
+		|| die "Failed to install msg, tbl and h files."
+	# install rawwaves
+	insinto /usr/share/stk/rawwaves || die "Failed to create rawwave directory."
+	doins rawwaves/*.raw || die "Failed to install rawwave files."
+	# install docs
+	if use doc; then
+		dohtml -r doc/html/* || die "Failed to install docs."
+	fi
+}