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

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

5 files changed, 110 insertions, 28 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/Manifest b/media-sound/jackbeat/Manifest
index 83aac99bb7c6..22c130514493 100644
--- a/media-sound/jackbeat/Manifest
+++ b/media-sound/jackbeat/Manifest
@@ -1,4 +1,19 @@
-DIST jackbeat-0.6.3.tar.gz 368355 RMD160 892f997cad7449236bb42e4a49cd58cc8461d9e5 SHA1 d571bf1d82ad0f1aaf918ae7c53a1a5876904759 SHA256 72b55fa664665e06f448a666c6b8a56638bcbf293afc35e4e842ba66bf2c9d34
-EBUILD jackbeat-0.6.3.ebuild 711 RMD160 79cdc91a685c62064643c34513c3972736a4c42a SHA1 94c712e09a1a4caf3036009f33d538bf27c84fdd SHA256 db6d22965dee0bba65b8e927a4ba4f36472b5eb7608b08897948722ebed73d6f
-MISC ChangeLog 664 RMD160 cb51f601d5b2722409a5ac7ca0aa20625d6fa671 SHA1 11c18cc70c214bccce48fc01e2e6b01f52d33df8 SHA256 84162441a627f69d9ea6928a8bceb89c5e1c5376b3f24f17a70b59dc2965be89
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX jackbeat-0.7.6-automagic-pulse.patch 1150 RMD160 605076ec681e1bbf4ae839df151633eedcbf854e SHA1 aef45d43147bac57826501108a233f2c936a3132 SHA256 df094ccf521c549e62f2eefa142208f39bb9017b08d04474a151eb0f89a49771
+DIST jackbeat-0.7.6.tar.gz 455771 RMD160 a80fb163710da2dcfe89341332906262f5217f6b SHA1 b6a0efed349f14f166dd2c71c973d5fab914c289 SHA256 0f17d9fab398e87564da89a7e174005a3dd7e16980bb49f395a7f82c866ae6c4
+EBUILD jackbeat-0.7.6.ebuild 1157 RMD160 a4f9c6b604bee4cebeaad1cdb114c39c35d8386f SHA1 8aee52507b43acb5e109849823a51d8c42222a7f SHA256 70cab1958c97026331de30a06d4df0549b62863edc9039ef5e62aa384b17dd0c
+MISC ChangeLog 912 RMD160 e3cc67ff021e6cfa7b84bd2f467d28c349899ec0 SHA1 651da2142a753c7ab0acb1b6c4e04eefa93f59ac SHA256 f7f09f0328580a9da8db36ce7e2b55fc78e747c5b0cf68ecdb8b65e61867d172
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNkYAaAAoJEEqz6FtPBkyjptIIAIk52aZVqftJlT116+vnAA6S
+x7fpvX4N6SMBEBPp58ReCRhNVfCtAbtnrf5PC+vX5jwhGVu61jfV0N61MTO9kZQi
+q9tTsTMnyRQChobjDozcsXflVaM+P2/bGz7oxqxEFAyjaYhNPOH/9t9sdy+qKx0P
+pj4E7GhYvafhoAgYUhtrXbTbfgI35GkVnN6QUn0lTH4rZUVU4OXALZkzde377NwP
+zesASdWOsYRvuwsLGkFwYNBUsNDQjohh1bYJK/JYwuweylCQI19UJv2YweKGVbPi
+b3shY8CFxvw15rTzdp6I58N3tmyDr4c1iv7QI/I61COxQ9EV9bKQ7RSiZ461e5c=
+=2uPK
+-----END PGP SIGNATURE-----
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)
+}