Version bump. Update to EAPI 4.

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

5 files changed, 142 insertions, 3 deletions

diff --git a/media-sound/sonic-visualiser/ChangeLog b/media-sound/sonic-visualiser/ChangeLog
index a2db50619515..e1c938fbf998 100644
--- a/media-sound/sonic-visualiser/ChangeLog
+++ b/media-sound/sonic-visualiser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sonic-visualiser
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.18 2010/10/06 00:02:39 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.19 2011/05/21 10:43:36 radhermit Exp $
+
+*sonic-visualiser-1.8 (21 May 2011)
+
+  21 May 2011; Tim Harder <radhermit@gentoo.org> +sonic-visualiser-1.8.ebuild,
+  +files/sonic-visualiser-1.8-configure.patch,
+  +files/sonic-visualiser-1.8-gcc46.patch:
+  Version bump. Update to EAPI 4.
 
 *sonic-visualiser-1.7.2 (06 Oct 2010)
 
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 77d323af4202..ca64083c1d65 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sonic-visualiser-1.7.1-liboggz11.patch 1675 RMD160 dcba641395f5d24a55fed0c7ab10360e6744474e SHA1 8327d803362f44486cf863c720c5206caa95ab04 SHA256 b0d97830ec0054bc6dd9ac06427ca3796b17d5212a85895dcc125e70ede001d9
+AUX sonic-visualiser-1.8-configure.patch 317 RMD160 1b62385c1a5c416ee2c90587aa173e19d7c33421 SHA1 385efc4280ab54b7610dcef78845298d62051569 SHA256 816845c5eec0fd76e366c86f25ef1fbf913f8aa7d38b3693238bc777f259feca
+AUX sonic-visualiser-1.8-gcc46.patch 261 RMD160 8d25cd934dafe2b9c5474e47824e01a1896a9a8c SHA1 d49fcf4ccc3cb525f28e2fca5915782accbb8e2b SHA256 4ded2294206176900aa316ffddff551782bdada827e865e31dbe91266e7eafd2
 DIST sonic-visualiser-1.7.2.tar.bz2 1369113 RMD160 5336b6aecbf61cd8fa3f11388f8b62bab67416ca SHA1 ff7da36ae9c2d6451e9bc802d15e49552ee2a19f SHA256 f37b7a7e4740d1177d25e09f2044cd2272ad1e1b8c2d95ef2cd3202752467303
+DIST sonic-visualiser-1.8.tar.gz 1853221 RMD160 a29785459009678fa2105727451ae643daf6b7cc SHA1 c5e8a25cf81d01c0262445e1d08657ab2346e04a SHA256 07b671528c6e14a7d54cae99db7b1cd78f9dd6f7f06c86ed96948b641336339a
 EBUILD sonic-visualiser-1.7.2.ebuild 2420 RMD160 bf72ccd90c6fd25ec9f852dbc2afee0695c2f8cc SHA1 6ae8530d5c445abd8751e02fa12c940175a7071f SHA256 d60312315120f59f032d6f2d65aaf2df94d8ce3d07eab490b4aa07e3c898fdc7
-MISC ChangeLog 2856 RMD160 026f0bb8b3e2e5b766452dcccdb2f5be83038b6b SHA1 4cc1174162c08408800e79261cccb43835123d01 SHA256 ec2405b649d70493cae98deae775580091febb1c57f1c9ee7d3638fc2f03b934
+EBUILD sonic-visualiser-1.8.ebuild 2375 RMD160 39bdf32b6198b76f7d8a9921779ebe6dcc4a6c59 SHA1 1bbd36b4986313a687a4ad0654c8a49da0949968 SHA256 dc6981f60326f7e95782cf5cbae3abab95c855856925887173f886bb88ea62ee
+MISC ChangeLog 3103 RMD160 6a02e71aed1a69c7dbcbf3de86c1c96074fe63e5 SHA1 77116a796445e82bb191b7601e5e60e82f7b9d79 SHA256 e4d623737a17498f988b80a20596330260ba92b3fb8711c9101061d4b841b68e
 MISC metadata.xml 251 RMD160 6ef519c0c383e28234a231081c2594d4e9039639 SHA1 dc30854be192995bbd477c3ba7b393fe1ab25263 SHA256 48e0a6cccf2eef677daecb7242cd93052641d8eb8b5cb445dfa19fec5eb93242
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJN15diAAoJEEqz6FtPBkyjcQEIAJgwDd+z4w1yRvg4DRFKLePW
+mkDhwLAlqJRLlIykeB4EjCjZciFoGT5ZwYPpAYL83dgsx5eCT3bbz3Ccy4j/8WnP
+xiwZ443V27/UU1mRKdnFyjtP9rmR6Pql9WAslhGfPzIM5BPbq8XJvFDgfkSu7vDp
+fBLZi64F2Ki88H1vmPO8M8VkzoubNFa2uyeCASqU69qQgkKGFhgUVMsP3GA6xh4F
+fo9blKrEC6+kV/RCuRqlIbKCkTvmV1cPMU/R+2ggNOvcKsIPWUF5nKumxRTsp8Qs
+WwIZEhKt7sAuEZkbodi/JFxL/t4i/6MqJs8be+8iiQG1tO3NdjNPNpfZT+OGLAM=
+=BIOl
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
new file mode 100644
index 000000000000..02752b746acc
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
@@ -0,0 +1,11 @@
+--- sonic-visualiser-1.8/configure.orig
++++ sonic-visualiser-1.8/configure
+@@ -18,7 +18,7 @@
+ 	\$(MAKE) --directory=svgui
+ sub-svapp:
+ 	\$(MAKE) --directory=svapp
+-sub-sonic-visualiser:
++sub-sonic-visualiser: sub-svcore sub-svgui sub-svapp
+ 	\$(MAKE) --directory=sonic-visualiser
+ EOF
+ echo " *** Generated Makefile"
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
new file mode 100644
index 000000000000..47ff291daa97
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
@@ -0,0 +1,10 @@
+--- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.orig
++++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h
+@@ -16,6 +16,7 @@
+ #ifndef _RESIZEABLE_BITMAP_H_
+ #define _RESIZEABLE_BITMAP_H_
+ 
++#include <cstddef>
+ #include <vector>
+ #include <stdint.h>
+ 
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
new file mode 100644
index 000000000000..a58ff8817c7a
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild,v 1.1 2011/05/21 10:43:36 radhermit Exp $
+
+EAPI=4
+inherit eutils qt4-r2 autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="mirror://sourceforge/sv1/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw id3tag jack mad ogg osc portaudio pulseaudio"
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	fftw? ( sci-libs/fftw:3.0 )
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/raptor:0
+	media-libs/liblrdf
+	dev-libs/redland
+	media-libs/ladspa-sdk
+	osc? ( media-libs/liblo )
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad )
+	id3tag? ( media-libs/libid3tag )
+	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in sonic-visualiser svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	cd svcore
+	epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch
+
+	use fftw || sv_disable_opt fftw3f
+	use fftw || sv_disable_opt fftw3
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	for i in sonic-visualiser svapp svcore svgui ; do
+	   pushd "${S}"/$i > /dev/null
+	   eautoreconf
+	   popd > /dev/null
+	done
+}
+
+src_install() {
+	cd ${PN}
+	dobin ${PN}
+	dodoc README*
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu *.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}