version bump

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

6 files changed, 144 insertions, 1 deletions

diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog
index 1a31cff29e5d..ace3c7173410 100644
--- a/media-libs/stk/ChangeLog
+++ b/media-libs/stk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/stk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.11 2012/05/05 08:02:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.12 2012/09/21 12:24:03 aballier Exp $
+
+*stk-4.4.4 (21 Sep 2012)
+
+  21 Sep 2012; Alexis Ballier <aballier@gentoo.org> +stk-4.4.4.ebuild,
+  +files/stk-4.4.4/010_all_removeForcedFlags.patch,
+  +files/stk-4.4.4/020_all_noExamplesOrDemo.patch,
+  +files/stk-4.4.4/030_all_sharedlib.patch,
+  +files/stk-4.4.4/040_all_sharedliblink.patch:
+  version bump
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> stk-4.4.2.ebuild,
   stk-4.4.3.ebuild, stk-4.4.3-r1.ebuild:
diff --git a/media-libs/stk/files/stk-4.4.4/010_all_removeForcedFlags.patch b/media-libs/stk/files/stk-4.4.4/010_all_removeForcedFlags.patch
new file mode 100644
index 000000000000..3fcc28fb763c
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.4/010_all_removeForcedFlags.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.3/configure.ac
+===================================================================
+--- stk-4.4.3.orig/configure.ac
++++ stk-4.4.3/configure.ac
+@@ -65,7 +65,7 @@ if test "$debug" = "yes"; then
+ else
+   AC_SUBST( debug, [no] )
+   AC_SUBST( cppflag, [] )
+-  AC_SUBST( cxxflag, [-O3] )
++  AC_SUBST( cxxflag, [] )
+   AC_SUBST( object_path, [Release] )
+ fi
+ AC_MSG_RESULT($debug)
diff --git a/media-libs/stk/files/stk-4.4.4/020_all_noExamplesOrDemo.patch b/media-libs/stk/files/stk-4.4.4/020_all_noExamplesOrDemo.patch
new file mode 100644
index 000000000000..c7e6c5581252
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.4/020_all_noExamplesOrDemo.patch
@@ -0,0 +1,32 @@
+Index: stk-4.4.4/Makefile.in
+===================================================================
+--- stk-4.4.4.orig/Makefile.in
++++ stk-4.4.4/Makefile.in
+@@ -4,27 +4,12 @@ RM = /bin/rm
+ 
+ all :
+ 	cd src && $(MAKE)
+-	cd projects/demo && $(MAKE) libdemo
+-	cd projects/effects && $(MAKE) libeffects
+-	cd projects/ragamatic && $(MAKE) libragamat
+-	cd projects/eguitar && $(MAKE) libeguitar
+-	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/eguitar && $(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/eguitar && $(MAKE) distclean
+-	cd projects/examples && $(MAKE) distclean
+ 
diff --git a/media-libs/stk/files/stk-4.4.4/030_all_sharedlib.patch b/media-libs/stk/files/stk-4.4.4/030_all_sharedlib.patch
new file mode 100644
index 000000000000..726847bc8a10
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.4/030_all_sharedlib.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.3/src/Makefile.in
+===================================================================
+--- stk-4.4.3.orig/src/Makefile.in
++++ stk-4.4.3/src/Makefile.in
+@@ -64,7 +64,7 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
+ %.o : ../src/include/%.cpp
+ 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
+ 
+-all : $(STATICLIB)
++all : $(STATICLIB) $(SHAREDLIB)
+ 
+ $(STATICLIB) : $(OBJECTS)
+ 	$(RM) -f $(STATICLIB)
diff --git a/media-libs/stk/files/stk-4.4.4/040_all_sharedliblink.patch b/media-libs/stk/files/stk-4.4.4/040_all_sharedliblink.patch
new file mode 100644
index 000000000000..6f267b79bd67
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.4/040_all_sharedliblink.patch
@@ -0,0 +1,13 @@
+Index: stk-4.4.3/src/Makefile.in
+===================================================================
+--- stk-4.4.3.orig/src/Makefile.in
++++ stk-4.4.3/src/Makefile.in
+@@ -74,7 +74,7 @@ $(SHAREDLIB) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+ 	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+-#	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
++	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+ 
+ $(OBJECTS) : Stk.h
+ 
diff --git a/media-libs/stk/stk-4.4.4.ebuild b/media-libs/stk/stk-4.4.4.ebuild
new file mode 100644
index 000000000000..eb7f5e7f55f8
--- /dev/null
+++ b/media-libs/stk/stk-4.4.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.4.4.ebuild,v 1.1 2012/09/21 12:24:03 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}
+	virtual/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
+	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
+}