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

(Portage version: 2.2.0_alpha11/cvs/Linux x86_64)

7 files changed, 171 insertions, 2 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/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
+}