Version bump and remove old. Update to EAPI 4 and fix dependencies.

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

4 files changed, 92 insertions, 25 deletions

diff --git a/media-sound/jackbeat/ChangeLog b/media-sound/jackbeat/ChangeLog
index a17b0502e516..08bd3bf88413 100644
--- a/media-sound/jackbeat/ChangeLog
+++ b/media-sound/jackbeat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jackbeat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jackbeat/ChangeLog,v 1.3 2009/03/09 16:55:37 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jackbeat/ChangeLog,v 1.4 2011/03/29 06:45:36 radhermit Exp $
+
+*jackbeat-0.7.6 (29 Mar 2011)
+
+  29 Mar 2011; Tim Harder <radhermit@gentoo.org> -jackbeat-0.6.3.ebuild,
+  +jackbeat-0.7.6.ebuild, +files/jackbeat-0.7.6-automagic-pulse.patch:
+  Version bump and remove old. Update to EAPI 4 and fix dependencies.
 
   09 Mar 2009; Raúl Porcel <armin76@gentoo.org> jackbeat-0.6.3.ebuild:
   Add ~x86 wrt #261715
diff --git a/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch b/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
new file mode 100644
index 000000000000..5f1aca5d3a32
--- /dev/null
+++ b/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
@@ -0,0 +1,36 @@
+--- jackbeat-0.7.6/configure.ac.orig
++++ jackbeat-0.7.6/configure.ac
+@@ -67,20 +67,25 @@
+ AC_SUBST(JACK_LIBS)
+ AM_CONDITIONAL(HAVE_JACK, [test "$have_jack" = "1"])
+ 
+-PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
+-AC_SUBST(PULSE_CFLAGS)
+-AC_SUBST(PULSE_LIBS)
+-if test "$have_pulse" = "1"
++AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes])
++
++if test "x$with_pulse" != xno
+ then
+-  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
++  PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
++else
++  AC_MSG_CHECKING([for PULSE])
++  AC_MSG_RESULT([disabled])
+ fi
+-AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
+ 
+-if test "$have_pulse" = "" && test "$is_linux" = "1"
++if test "$have_pulse" != ""
+ then
+-  AC_MSG_WARN([Can't find libpulse, PulseAudio will not be supported])
++  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
+ fi
+ 
++AC_SUBST(PULSE_CFLAGS)
++AC_SUBST(PULSE_LIBS)
++AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
++
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
+ 
+ if test x$have_pkg_gtk = xtrue
diff --git a/media-sound/jackbeat/jackbeat-0.6.3.ebuild b/media-sound/jackbeat/jackbeat-0.6.3.ebuild
deleted file mode 100644
index 235af38ef767..000000000000
--- a/media-sound/jackbeat/jackbeat-0.6.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jackbeat/jackbeat-0.6.3.ebuild,v 1.2 2009/03/09 16:55:37 armin76 Exp $
-
-DESCRIPTION="An audio sequencer for Linux"
-HOMEPAGE="http://www.samalyse.com/jackbeat/"
-SRC_URI="http://www.samalyse.com/jackbeat/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-sound/jack-audio-connection-kit
-	>=x11-libs/gtk+-2.6
-	>=media-libs/libsndfile-1.0.15
-	>=dev-libs/libxml2-2.6
-	>=media-libs/libsamplerate-0.1.2"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO
-}
diff --git a/media-sound/jackbeat/jackbeat-0.7.6.ebuild b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
new file mode 100644
index 000000000000..bedb26244478
--- /dev/null
+++ b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jackbeat/jackbeat-0.7.6.ebuild,v 1.1 2011/03/29 06:45:36 radhermit Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="An audio sequencer for Linux"
+HOMEPAGE="http://www.samalyse.com/jackbeat/"
+SRC_URI="http://www.samalyse.com/jackbeat/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jack pulseaudio"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.6:2
+	gnome-base/libglade:2.0
+	>=media-libs/liblo-0.22
+	>=media-libs/libsamplerate-0.1.2
+	>=media-libs/libsndfile-1.0.15
+	media-libs/alsa-lib
+	media-libs/portaudio
+	jack? ( >=media-sound/jack-audio-connection-kit-0.101 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagic-pulse.patch
+
+	# Don't install license file
+	sed -i -e "s:help::" pkgdata/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with jack) \
+		$(use_with pulseaudio pulse)
+}