Remove check for raptor and let liblrdf, or redland pull it for us. This allows raptor2 to be used.

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

3 files changed, 16 insertions, 13 deletions

diff --git a/media-sound/sonic-visualiser/ChangeLog b/media-sound/sonic-visualiser/ChangeLog
index e1c938fbf998..f7b5d7298c9e 100644
--- a/media-sound/sonic-visualiser/ChangeLog
+++ b/media-sound/sonic-visualiser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sonic-visualiser
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.20 2011/07/29 09:35:13 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+  sonic-visualiser-1.8.ebuild:
+  Remove check for raptor and let liblrdf, or redland pull it for us. This
+  allows raptor2 to be used.
 
 *sonic-visualiser-1.8 (21 May 2011)
 
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index ca64083c1d65..758d1a15c92f 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -7,17 +7,13 @@ AUX sonic-visualiser-1.8-gcc46.patch 261 RMD160 8d25cd934dafe2b9c5474e47824e01a1
 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
-EBUILD sonic-visualiser-1.8.ebuild 2375 RMD160 39bdf32b6198b76f7d8a9921779ebe6dcc4a6c59 SHA1 1bbd36b4986313a687a4ad0654c8a49da0949968 SHA256 dc6981f60326f7e95782cf5cbae3abab95c855856925887173f886bb88ea62ee
-MISC ChangeLog 3103 RMD160 6a02e71aed1a69c7dbcbf3de86c1c96074fe63e5 SHA1 77116a796445e82bb191b7601e5e60e82f7b9d79 SHA256 e4d623737a17498f988b80a20596330260ba92b3fb8711c9101061d4b841b68e
+EBUILD sonic-visualiser-1.8.ebuild 2461 RMD160 ec29259694b390edc92b350cb9040eb8b8fb19be SHA1 652a776264319a24443dbf256e0dd4e39f971abf SHA256 e3d35902a86ec77f065ec5a40f5bb633684d10ba1a355a59bbbb6ee946bb4a9e
+MISC ChangeLog 3293 RMD160 3f0bd7c787df051c9908e9e9cd81eb32ef2942bc SHA1 39fae16a62e07f707c06ca1e09fa941d3fba8a0e SHA256 938b6495ba9d7500102a34e0b0493392f12d5b05c5d4eea825871ccd6fa368cd
 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
+iF4EAREIAAYFAk4yflIACgkQXkR9YqOcLPEKJgD/TzGhSSp+zFql9aPG3TafJgHE
+BDcFIueDjmJ33OXpjqwA/RAlIgzav8SU0b3cZpc0ZJj7Uh/w/5z21dPiQp/MUyUw
+=8c/W
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
index a58ff8817c7a..1a06920dd609 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.8.ebuild,v 1.2 2011/07/29 09:35:13 ssuominen Exp $
 
 EAPI=4
 inherit eutils qt4-r2 autotools fdo-mime
@@ -21,7 +21,6 @@ RDEPEND="x11-libs/qt-core:4
 	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
@@ -49,6 +48,9 @@ sv_disable_opt() {
 }
 
 src_prepare() {
+	# remove unnecessary check for raptor: http://code.soundsoftware.ac.uk/issues/136
+	sv_disable_opt raptor
+
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-gcc46.patch
 	cd svcore