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

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

6 files changed, 5 insertions, 301 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index f921890a24fb..77d323af4202 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,12 +1,5 @@
-AUX sonic-visualiser-1.6-gcc44.patch 892 RMD160 36183fc89c5045f12788146c879b43deadf33c5e SHA1 664f0da9db43adff51c2031d572ac5784e314afb SHA256 6aca63bf62d2dee0e6c247692b9b23e2feb70ceb6e76604307f6dd69fee0acad
 AUX sonic-visualiser-1.7.1-liboggz11.patch 1675 RMD160 dcba641395f5d24a55fed0c7ab10360e6744474e SHA1 8327d803362f44486cf863c720c5206caa95ab04 SHA256 b0d97830ec0054bc6dd9ac06427ca3796b17d5212a85895dcc125e70ede001d9
-DIST sonic-visualiser-1.6.tar.bz2 1351382 RMD160 ce32c9b790025db3d11c2d46fe5801c5c86dd93d SHA1 6a84ee27cd360db50dea62479713a353b708e14b SHA256 c58932712c5f334f99b18477647ee58b583b50d6a47277a5952246ab8ec278b5
-DIST sonic-visualiser-1.7.1.tar.bz2 1367179 RMD160 0986d15f0f504f9011b11a7becd055df593ea5f7 SHA1 0a510fc46bf792f17aca48e8bfc4e96ea9441de0 SHA256 e13c93d5203b22fd054d5cbcea91529a690e05c38b427c574ba721aa9d1b4986
 DIST sonic-visualiser-1.7.2.tar.bz2 1369113 RMD160 5336b6aecbf61cd8fa3f11388f8b62bab67416ca SHA1 ff7da36ae9c2d6451e9bc802d15e49552ee2a19f SHA256 f37b7a7e4740d1177d25e09f2044cd2272ad1e1b8c2d95ef2cd3202752467303
-DIST sonic-visualiser-1.7.tar.bz2 1356255 RMD160 c9bf6bb432db8ffa41b0ac1e47cefc32cdd09ed5 SHA1 7cb7dfa514136957c6d33744239d60c021273768 SHA256 ab477eb12393d88980d7f885b397dbbd1f048d407f4f037a827a98d955acc967
-EBUILD sonic-visualiser-1.6.ebuild 2411 RMD160 3db46c61ed59579a2f9729493e41df208afd2036 SHA1 eefd13ae8c4e8f5d3699a3084a0ea9cc94d6ef9f SHA256 15eeb85ae7ec76e1fe63f5cea947f29a6dc06640bacfb02c590293be26243a68
-EBUILD sonic-visualiser-1.7.1.ebuild 2465 RMD160 2de64fedfbb33249b917149cb1a7c459f619b3e0 SHA1 7c726bac2ee0e4c685123c77d4c031c735abe995 SHA256 90eeee89aee44f47a757ebe93ab16772a0287e3adef98b2f8e711e259d212ac4
-EBUILD sonic-visualiser-1.7.2.ebuild 2444 RMD160 54e10aef9ffcfb5709733f146da8c03e092451b7 SHA1 9032ed8c440f1e0860338b6fb57f1258566a7659 SHA256 fec439ea1789af487550afbecfd7c167f9313d02344c0a6253944aaa8e546b60
-EBUILD sonic-visualiser-1.7.ebuild 2376 RMD160 61a4370ba2d6564e061d67f5afa0ae77085ca79d SHA1 1561b899a2e8f5139292cc9427e3ee21c137e572 SHA256 c4f363ae2d07d3aa34acb16d243b1e7e126811cc47439af565c7f85663dfd602
+EBUILD sonic-visualiser-1.7.2.ebuild 2420 RMD160 bf72ccd90c6fd25ec9f852dbc2afee0695c2f8cc SHA1 6ae8530d5c445abd8751e02fa12c940175a7071f SHA256 d60312315120f59f032d6f2d65aaf2df94d8ce3d07eab490b4aa07e3c898fdc7
 MISC ChangeLog 2856 RMD160 026f0bb8b3e2e5b766452dcccdb2f5be83038b6b SHA1 4cc1174162c08408800e79261cccb43835123d01 SHA256 ec2405b649d70493cae98deae775580091febb1c57f1c9ee7d3638fc2f03b934
 MISC metadata.xml 251 RMD160 6ef519c0c383e28234a231081c2594d4e9039639 SHA1 dc30854be192995bbd477c3ba7b393fe1ab25263 SHA256 48e0a6cccf2eef677daecb7242cd93052641d8eb8b5cb445dfa19fec5eb93242
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}"
-}