From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 29 Nov 2011 16:30:02 +0000 (+0000)
Subject: Only run testsuite if swh-plugins is installed and change hardcoded /usr/local path... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bf31c4f781a236456b7e0616c00867d887e30d80;p=gentoo.git

Only run testsuite if swh-plugins is installed and change hardcoded /usr/local path to /usr wrt #392221 by Jeremy Murphy

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

diff --git a/media-libs/liblrdf/ChangeLog b/media-libs/liblrdf/ChangeLog
index 18fcde4a1cc4..b8deef708b84 100644
--- a/media-libs/liblrdf/ChangeLog
+++ b/media-libs/liblrdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/liblrdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.52 2011/11/25 23:41:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.53 2011/11/29 16:30:02 ssuominen Exp $
+
+  29 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.5.0.ebuild:
+  Only run testsuite if swh-plugins is installed and change hardcoded /usr/local
+  path to /usr wrt #392221 by Jeremy Murphy
 
   25 Nov 2011; Markos Chandras <hwoarang@gentoo.org> liblrdf-0.5.0.ebuild:
   Stable on amd64 wrt bug #391805
diff --git a/media-libs/liblrdf/Manifest b/media-libs/liblrdf/Manifest
index 34feb9294a1a..1f235925b2af 100644
--- a/media-libs/liblrdf/Manifest
+++ b/media-libs/liblrdf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX liblrdf-0.4.0-dontbuild-tests.patch 479 RMD160 f8468291bedb71e369c47570b9a005e0dad43505 SHA1 f67d222e4a96b5d9ae81e863a02bf1ef6e8e5918 SHA256 e3418adcd2f627152880bff26f5e59e2b79fd6096a6f265dcc6fad9d0e4cd4dd
 AUX liblrdf-0.4.0-raptor2-pkgconfig.patch 290 RMD160 e388b7350d872a1a146fcfdc4bb4088805560433 SHA1 745f8233e6edafa4646bcd1df7e33f00f3889179 SHA256 b88bcb62ff3f69713111d6f2ebb2ebd7e5b0a4b7ca2968fbab8711716df553ec
@@ -8,23 +8,17 @@ AUX liblrdf-0.4.0-rename_clashing_md5_symbols.patch 684 RMD160 45fcaf4b0c9d02433
 DIST liblrdf-0.4.0.tar.gz 336959 RMD160 2cb371c99552ac3045b72e20786494575ded37d8 SHA1 17ce55f692bc52ed12605091b99106255f964b5f SHA256 95e98e86ba06ed73a5571cbcff3ee88e481b403b6eb727e9eb182870efd9b204
 DIST liblrdf-0.5.0.tar.gz 283109 RMD160 cfaeb99114071c1478c69b35fa9acb5d85e8fd69 SHA1 1b9fef83ccd9a57372e0859fc79e6cb882d61961 SHA256 013002b91ef209827fe99552b8c7f0b569cddb3d6f1439bedbd8bafe1956a93c
 EBUILD liblrdf-0.4.0-r20.ebuild 993 RMD160 1aa7a8e4ee6a41ab528ddc935186d30cfd29db6c SHA1 a07351c25629ed7890fd63c607faa115a3786923 SHA256 280b1df12f4534f5b91314d6cfe8d1a7089ff572f99781522569f32723ad113b
-EBUILD liblrdf-0.5.0.ebuild 913 RMD160 765294d0e1e635789bf7d13ac86b03c066076be9 SHA1 04f6d4db5a3c36735cb1d631c38e060877fede07 SHA256 eed0a086ac890048338d310237d7fc90f6f6a1ed8d78d84d0b8adbd412796f66
-MISC ChangeLog 6757 RMD160 3ce6be07d17b0f9e389d935c95873cba20013961 SHA1 3dfcb9bfe60312a6af1b972f15d3760aa8dbb0bc SHA256 2ee316a1466fffa9df8735f29e537bb65a9ada0d07fd06c0cdba7ac5aa52bb3e
+EBUILD liblrdf-0.5.0.ebuild 1068 RMD160 8166066f567781b0ede4bfaf4f38f7dcf5340605 SHA1 165f71ddfee6e253de62c65c2605156b5d2b2317 SHA256 0d84516a2b3e5476f99b3385975b8cfeb4631b44f684a4102647c6c52b07b5bd
+MISC ChangeLog 6960 RMD160 519bba803159567fe817388fecce747787be360a SHA1 23c861f70ac6b9a631243e466ec6449c1c2a749e SHA256 2528562aa8a0f353f9a7afc4b359c0003c546f37bf8d93338dfb72c709821e6b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO0CefAAoJEPqDWhW0r/LCUIUP/j0CcrHkcfjATiX/VXeAggFz
-5KM9CK7hfC5EOU/cCFZXG3nq/KkalbH8ubA79+u1fHJdEim8mnGVAGxSSYSqnqpN
-UnzVTcdRJfo1Y26/O3hQGBBsv4xFSEo67mcyxKVe2OLP4tIiS+fbPLPOvfiTKnCa
-uzcaB9h/bZPfp8uycMYie1BJnXSmvtY84IM9dRyMPNlfqrlH8KBBR4QI7EnVl8W6
-N0WY2E7v08+f7CMhLryt11vnsU+heU+gdSUbrabluMH2EnZC0xm8bVKNn7e99fkH
-TnQmyq9dGWsIIc9/UDqk7LsY7EX5rEK94/waOtRNwq+5KsaxQSsQCXid9Zda3OLr
-x5bBMfJPnGU/1cYOivz1WOBI2MSfnBw+8uw1jxFxLWvcehtzY0UztxSOnM6Kl5lY
-VBMOdbAQJ8GO7FTAUYIidJwOr4r/Kv1eyK3NKxzcxE0ID9/eO70o/aTgsvHxUk3A
-mJJ9LgmaazQPCKp3MjsTu4whDcIK/TOvp65QWR7dZCwILTbp7pBuczmITpMiSSt8
-0MpPfqMKaDmr2zLgivzfmKi+rCzp7K0iBFlvGWFbjdxgz2FjEdVR8kAmQT5ZhbLf
-8c5/F0W5tWi0YTrbRsZH8CEO8ROoiz0kgzkU53ZFL7wyEGtQ1n+dfGi3XYUgJtVl
-LpeZIjHm0ldUDpRtWN+2
-=PbNX
+iQEcBAEBAgAGBQJO1Qf0AAoJEEdUh39IaPFNKo8H/3Sof9IShPAMZ+6TQVF1FEPq
+8kam+Ln3NhsHMkr7z568r+CwnokTJVpYyCdchc9r6b2bRsQUHBg+KxlW6rQwUk5A
+X1Rsi8D/FL44nZCw5O0LDkRG3smQo5lZKYPpep+h8ygEFE7BdppiUwkqK+rmbe8w
+W9Zas8zv4eSronzu9cF41yWwartBstQyTZK/GLYxD+fjjxjs5iqA+YcP57Sl54mK
+bZmwZLvRy0fCWQE8R/jeX7UTZ0zYbkTWBEeGp7VJb238edvdZ+Zo8v37ksghNHht
+BBRh0FQb77NQ0Soq5W2z39M34KikamFd2s6QlzeyjeCgXCxIgIQqLEOacdQC/Fw=
+=pvyu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/liblrdf/liblrdf-0.5.0.ebuild b/media-libs/liblrdf/liblrdf-0.5.0.ebuild
index 7f469a47b2f9..42c454aa5556 100644
--- a/media-libs/liblrdf/liblrdf-0.5.0.ebuild
+++ b/media-libs/liblrdf/liblrdf-0.5.0.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-libs/liblrdf/liblrdf-0.5.0.ebuild,v 1.2 2011/11/25 23:41:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.5.0.ebuild,v 1.3 2011/11/29 16:30:02 ssuominen Exp $
 
 EAPI=4
 inherit autotools
@@ -28,6 +28,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c || die #392221
 	eautoreconf
 }
 
@@ -35,6 +36,10 @@ src_configure() {
 	econf $(use_enable static-libs static)
 }
 
+src_test() {
+	has_version media-plugins/swh-plugins && default #392221
+}
+
 src_install() {
 	default
 	rm -f "${ED}"usr/lib*/liblrdf.la