remove old. fix raptor deps. fix ugly has_version with liboggz since 1.1.1 is stable everywhere and only version left in tree.

(Portage version: 2.2_rc96/cvs/Linux x86_64)

5 files changed, 4 insertions, 293 deletions

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.6-gcc44.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.6-gcc44.patch
deleted file mode 100644
index 410bb3ff5803..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.6-gcc44.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=278551
-
-Upstream status: Mailed 25 Jul 2009
-
-Index: sonic-visualiser-1.6/rdf/RDFFeatureWriter.h
-===================================================================
---- sonic-visualiser-1.6.orig/rdf/RDFFeatureWriter.h
-+++ sonic-visualiser-1.6/rdf/RDFFeatureWriter.h
-@@ -23,6 +23,7 @@
- #include <string>
- #include <map>
- #include <set>
-+#include <stdint.h> /* uint64_t */
- 
- #include <QString>
- 
-Index: sonic-visualiser-1.6/system/System.h
-===================================================================
---- sonic-visualiser-1.6.orig/system/System.h
-+++ sonic-visualiser-1.6/system/System.h
-@@ -62,6 +62,7 @@ int gettimeofday(struct timeval *p, void
- 
- #include <sys/mman.h>
- #include <dlfcn.h>
-+#include <stdio.h> /* perror */
- 
- #define MLOCK(a,b)   ::mlock((a),(b))
- #define MUNLOCK(a,b) (::munlock((a),(b)) ? (::perror("munlock failed"), 0) : 0)
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild
deleted file mode 100644
index 17b09d8a4c24..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.6.ebuild
+++ /dev/null
@@ -1,87 +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/sonic-visualiser/sonic-visualiser-1.6.ebuild,v 1.3 2009/10/06 17:15:42 ayoy Exp $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="mirror://sourceforge/sv1/${P}.tar.bz2"
-
-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* )
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/raptor
-	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 )
-	!pulseaudio? ( !portaudio? ( media-sound/jack-audio-connection-kit ) )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound media-libs/liboggz )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	use !jack && use !pulseaudio && use !portaudio && ewarn "You must have at least one of: jack, pulseaudio, portaudio enabled. We will enable jack for you."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# remove crap
-	sed -i -e "s:-O3::" prf/sv.prf
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-}
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	sed -i -e "s/ $1//" "${S}/prf/sv.prf" || die "failed to remove $1 support"
-}
-
-src_compile() {
-	(use jack || ( use !pulseaudio && use !portaudio)) || sv_disable_opt jack
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use mad || sv_disable_opt mad
-	use fftw || sv_disable_opt fftw3f
-	use fftw || sv_disable_opt fftw3
-	use id3tag || sv_disable_opt id3tag
-	use pulseaudio || sv_disable_opt libpulse
-	use portaudio || sv_disable_opt portaudio
-	use osc || sv_disable_opt liblo
-
-	eqmake4
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dobin sv/sonic-visualiser
-	dodoc README README.OSC
-	dodir /usr/share/${PN}
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins sv/samples/*
-	# desktop entry
-	newicon "sv/icons/sv-48x48.png" "${PN}.png"
-	make_desktop_entry "${PN}" "Sonic Visualiser" "${PN}"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild
deleted file mode 100644
index 2431c302326d..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild
+++ /dev/null
@@ -1,87 +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/sonic-visualiser/sonic-visualiser-1.7.1.ebuild,v 1.1 2009/11/04 10:26:12 aballier Exp $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="mirror://sourceforge/sv1/${P}.tar.bz2"
-
-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* )
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/raptor
-	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 )
-	!pulseaudio? ( !portaudio? ( media-sound/jack-audio-connection-kit ) )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound media-libs/liboggz )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	use !jack && use !pulseaudio && use !portaudio && ewarn "You must have at least one of: jack, pulseaudio, portaudio enabled. We will enable jack for you."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# remove crap
-	sed -i -e "s:-O3::" prf/sv.prf
-	has_version '>=media-libs/liboggz-1.1.0' && epatch "${FILESDIR}/${P}-liboggz11.patch"
-}
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	sed -i -e "s/ $1//" "${S}/prf/sv.prf" || die "failed to remove $1 support"
-}
-
-src_compile() {
-	(use jack || ( use !pulseaudio && use !portaudio)) || sv_disable_opt jack
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use mad || sv_disable_opt mad
-	use fftw || sv_disable_opt fftw3f
-	use fftw || sv_disable_opt fftw3
-	use id3tag || sv_disable_opt id3tag
-	use pulseaudio || sv_disable_opt libpulse
-	use portaudio || sv_disable_opt portaudio
-	use osc || sv_disable_opt liblo
-
-	eqmake4
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dobin sv/sonic-visualiser
-	dodoc README README.OSC
-	dodir /usr/share/${PN}
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins sv/samples/*
-	# desktop entry
-	newicon "sv/icons/sv-48x48.png" "${PN}.png"
-	make_desktop_entry "${PN}" "Sonic Visualiser" "${PN}"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.7.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.7.2.ebuild
index e12c178283d9..102a495b7bcc 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.7.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.7.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2010 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.7.2.ebuild,v 1.1 2010/10/06 00:02:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.7.2.ebuild,v 1.2 2010/10/15 18:47:50 ssuominen Exp $
 
 EAPI=2
-
 inherit eutils qt4
 
 DESCRIPTION="Music audio files viewer and analiser"
@@ -22,7 +21,7 @@ RDEPEND="x11-libs/qt-core:4
 	fftw? ( =sci-libs/fftw-3* )
 	app-arch/bzip2
 	>=media-libs/dssi-0.9.1
-	media-libs/raptor
+	<media-libs/raptor-1.9.0
 	media-libs/liblrdf
 	dev-libs/redland
 	media-libs/ladspa-sdk
@@ -34,7 +33,7 @@ RDEPEND="x11-libs/qt-core:4
 	!pulseaudio? ( !portaudio? ( media-sound/jack-audio-connection-kit ) )
 	mad? ( media-libs/libmad )
 	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound media-libs/liboggz )
+	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
 	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
 	pulseaudio? ( media-sound/pulseaudio )"
 
@@ -48,7 +47,7 @@ pkg_setup() {
 src_prepare() {
 	# remove crap
 	sed -i -e "s:-O3::" prf/sv.prf
-	has_version '>=media-libs/liboggz-1.1.0' && epatch "${FILESDIR}/${PN}-1.7.1-liboggz11.patch"
+	epatch "${FILESDIR}/${PN}-1.7.1-liboggz11.patch"
 }
 
 sv_disable_opt() {
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.7.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.7.ebuild
deleted file mode 100644
index db67d0d81ea7..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.7.ebuild
+++ /dev/null
@@ -1,86 +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/sonic-visualiser/sonic-visualiser-1.7.ebuild,v 1.1 2009/10/12 07:53:08 aballier Exp $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="mirror://sourceforge/sv1/${P}.tar.bz2"
-
-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* )
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/raptor
-	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 )
-	!pulseaudio? ( !portaudio? ( media-sound/jack-audio-connection-kit ) )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound media-libs/liboggz )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	use !jack && use !pulseaudio && use !portaudio && ewarn "You must have at least one of: jack, pulseaudio, portaudio enabled. We will enable jack for you."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# remove crap
-	sed -i -e "s:-O3::" prf/sv.prf
-}
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	sed -i -e "s/ $1//" "${S}/prf/sv.prf" || die "failed to remove $1 support"
-}
-
-src_compile() {
-	(use jack || ( use !pulseaudio && use !portaudio)) || sv_disable_opt jack
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use mad || sv_disable_opt mad
-	use fftw || sv_disable_opt fftw3f
-	use fftw || sv_disable_opt fftw3
-	use id3tag || sv_disable_opt id3tag
-	use pulseaudio || sv_disable_opt libpulse
-	use portaudio || sv_disable_opt portaudio
-	use osc || sv_disable_opt liblo
-
-	eqmake4
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dobin sv/sonic-visualiser
-	dodoc README README.OSC
-	dodir /usr/share/${PN}
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins sv/samples/*
-	# desktop entry
-	newicon "sv/icons/sv-48x48.png" "${PN}.png"
-	make_desktop_entry "${PN}" "Sonic Visualiser" "${PN}"
-}