Version bump.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 157 insertions, 2 deletions

diff --git a/media-libs/rtaudio/ChangeLog b/media-libs/rtaudio/ChangeLog
index f72a784492b0..301908981812 100644
--- a/media-libs/rtaudio/ChangeLog
+++ b/media-libs/rtaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/rtaudio
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rtaudio/ChangeLog,v 1.1 2012/11/27 07:35:52 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rtaudio/ChangeLog,v 1.2 2013/06/15 11:43:29 radhermit Exp $
+
+*rtaudio-4.0.12 (15 Jun 2013)
+
+  15 Jun 2013; Tim Harder <radhermit@gentoo.org> +rtaudio-4.0.12.ebuild,
+  +files/rtaudio-4.0.12-configure.patch, +files/rtaudio-4.0.12-makefile.patch:
+  Version bump.
 
 *rtaudio-4.0.11 (27 Nov 2012)
 
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
new file mode 100644
index 000000000000..7680f75d40d3
--- /dev/null
+++ b/media-libs/rtaudio/files/rtaudio-4.0.12-configure.patch
@@ -0,0 +1,73 @@
+--- rtaudio-4.0.12/configure.ac
++++ rtaudio-4.0.12/configure.ac
+@@ -25,9 +25,9 @@
+ AC_PROG_CXX(g++ CC c++ cxx)
+ AC_PROG_RANLIB
+ AC_PATH_PROG(AR, ar, no)
+-if [[ $AR = "no" ]] ; then
+-    AC_MSG_ERROR("Could not find ar - needed to create a library");
+-fi
++AS_IF([test "x$AR" == "x" ], [
++  AC_MSG_ERROR("Could not find ar - needed to create a library")
++])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -83,39 +83,46 @@
+   ;;
+ 
+   *-*-linux*)
+-  AC_ARG_WITH(jack, [  --with-jack = choose JACK server support (mac and linux only)], [
++  AC_ARG_WITH([jack], AS_HELP_STRING([--with-jack], [choose JACK server support (mac and linux only)]))
++
++  AS_IF([test "x$with_jack" != "xno"], [
+     api="$api -D__UNIX_JACK__"
+     AC_MSG_RESULT(using JACK)
+     AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
+-    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )
++    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))])
+ 
+   # Look for ALSA flag
+-  AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [
++  AC_ARG_WITH([alsa], AS_HELP_STRING([--with-alsa], [choose native ALSA API support (linux only)]))
++
++  AS_IF([test "x$with_alsa" != "xno"], [
+     api="$api -D__LINUX_ALSA__"
+     req="$req alsa"
+     AC_MSG_RESULT(using ALSA)
+-    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
++    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
+ 
+   # Look for PULSE flag
+-  AC_ARG_WITH(pulse, [  --with-pulse = choose PulseAudio API support (linux only)], [
++  AC_ARG_WITH([pulse], AS_HELP_STRING([--with-pulse], [choose PulseAudio API support (linux only)]))
++
++  AS_IF([test "x$with_pulse" != "xno"], [
+     api="$api -D__LINUX_PULSE__"
+     req="$req libpulse-simple"
+     AC_MSG_RESULT(using PulseAudio)
+     PKG_CHECK_MODULES([PULSE], [libpulse-simple], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))
+-        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ], )
++        LIBS="$LIBS `pkg-config --libs libpulse-simple`" ])
+ 
+   # Look for OSS flag
+-  AC_ARG_WITH(oss, [  --with-oss = choose OSS API support (linux only)], [
++  AC_ARG_WITH([oss], AS_HELP_STRING([--with-oss], [choose OSS API support (linux only)]))
++
++  AS_IF([test "x$with_oss" != "xno"], [
+     api="$api -D__LINUX_OSS__"
+-    AC_MSG_RESULT(using OSS)], )
++    AC_MSG_RESULT(using OSS)])
+ 
+   # If no audio api flags specified, use ALSA
+-  if [test "$api" == "";] then
++  AS_IF([test "x$api" == "x"], [
+     AC_MSG_RESULT(using ALSA)
+     AC_SUBST( api, [-D__LINUX_ALSA__] )
+     req="$req alsa"
+-    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
+-  fi
++    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
+ 
+   AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
+   ;;
diff --git a/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch b/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
new file mode 100644
index 000000000000..adf109de5de9
--- /dev/null
+++ b/media-libs/rtaudio/files/rtaudio-4.0.12-makefile.patch
@@ -0,0 +1,16 @@
+--- rtaudio-4.0.12/Makefile.in
++++ rtaudio-4.0.12/Makefile.in
+@@ -24,9 +24,11 @@
+ tests:
+ 	cd tests && $(MAKE) all
+ 
+-$(LIBRARIES): $(OBJECTS)
++$(STATIC): $(OBJECTS)
+ 	$(AR) ruv $(STATIC) $(OBJECTS)
+-	ranlib $(STATIC)
++	$(RANLIB) $(STATIC)
++
++$(SHARED): $(OBJECTS)
+ 	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
+ 	$(LN) -sf @sharedname@ $(SHARED)
+ 	$(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
diff --git a/media-libs/rtaudio/rtaudio-4.0.12.ebuild b/media-libs/rtaudio/rtaudio-4.0.12.ebuild
new file mode 100644
index 000000000000..6821533dc5c8
--- /dev/null
+++ b/media-libs/rtaudio/rtaudio-4.0.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rtaudio/rtaudio-4.0.12.ebuild,v 1.1 2013/06/15 11:43:29 radhermit Exp $
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O"
+HOMEPAGE="http://www.music.mcgill.ca/~gary/rtaudio/"
+SRC_URI="http://www.music.mcgill.ca/~gary/${PN}/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack pulseaudio static-libs"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0.11-cflags.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+
+	if ! use static-libs ; then
+		sed -i '/^LIBRARIES =/s/$(STATIC)//' Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# OSS support requires OSSv4
+	econf \
+		--without-oss \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with pulseaudio pulse)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	dolib.so librtaudio.so*
+	use static-libs && dolib.a librtaudio.a
+
+	dobin rtaudio-config
+	doheader *.h
+	dodoc readme doc/release.txt
+
+	if use doc ; then
+		dohtml -r doc/html/*
+		dodoc -r doc/images
+	fi
+}