Pull in dev-util/dbus-test-runner and use virtualx.eclass for src_test() wrt #391179 by Jonathan Lovelace

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

4 files changed, 33 insertions, 20 deletions

diff --git a/dev-libs/libindicator/ChangeLog b/dev-libs/libindicator/ChangeLog
index 1c5b763768bd..ee428e58ac64 100644
--- a/dev-libs/libindicator/ChangeLog
+++ b/dev-libs/libindicator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libindicator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.14 2012/07/26 16:34:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.15 2012/07/30 20:51:21 ssuominen Exp $
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libindicator-12.10.0-r200.ebuild, libindicator-12.10.0-r300.ebuild:
+  Pull in dev-util/dbus-test-runner and use virtualx.eclass for src_test() wrt
+  #391179 by Jonathan Lovelace
 
   26 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   -libindicator-0.4.1-r201.ebuild, -libindicator-0.4.1-r300.ebuild:
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index e19d5c991d1e..28fca9b60f88 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST libindicator-12.10.0.tar.gz 427575 SHA256 dd8e5cb40407da9c837793af5c9e62e73c2054525733c7cd654c387bb010c2e4 SHA512 c0b9dc5a6c7b3ddd9392ae5a5db40f216439b869426e5b8a307a4adee5290376c2edc32f3a0268aafe63ae8b80dc0298b125c6c539c50a5c5545d7d727679007 WHIRLPOOL a7252a2646bdb250d4f756439d338e4defda6ff380d864cf97bcc2d2f023ef3f69ca37b28898cb2d5e87523d6cb5c4b690b735869435a020ad2fb49bb22b8fea
-EBUILD libindicator-12.10.0-r200.ebuild 979 SHA256 5af5fbbb5ec50fc72fd9e1c46d5a96646acd8399456631dddb4ea34416d89daf SHA512 6653278eb2cedbc89ee2a8b5d1145a5e21724927cdac9a6cef90fdbd0027780fd377fa7cb50ac7fe2ab5bca5c0ac65fe338d6ea7f70284ccad989900f5deb640 WHIRLPOOL 1944f213313f3512efd17668c49e30ec672130caed0adfc4cc6ac00e73a9c85906b42fa3e278d91ea4d992e2dbfd585879144e02fc3e0bd08588b9d22a6ce737
-EBUILD libindicator-12.10.0-r300.ebuild 900 SHA256 b22ee41d711f6e54062faee9388abd95418a9fb185d6205741a464d35c6fe2c5 SHA512 d0171cdada64bc8b0e2e5b2d9b6a5adcbf225d68ceb5242bf5710b71366cf04207aec9e54b71fe638ebc68e01475573649e726b8a2895be941161dce81b57793 WHIRLPOOL 50d79a59a33c7412a57f5520171519d71cddaf0dee43e9077b3677aabf4208ca36126930cc2aab50ab21222e15059d9cf7a6d55debe3f72f5e35be76db84fd72
-MISC ChangeLog 2490 SHA256 e950178bd170ef6f2a711c758b3fc94ccaeb744dedc3541719d38bc254fb505c SHA512 9e06d54a6dbfe58d8bf8703e6cf2fa41da02d3d6d54b85137bf11a2f8aafe74dbc500f4daa59537ee4ec79246dd3e16255cf2d0b34051cabe921fc353092ff51 WHIRLPOOL a2df40e998a4959141ac886d5fd541354d84e287263caf9acf1859d32ea1a95d39f8938fb3ae24c3a97fb0b02e2ae187e3200325c9214774eb2903506aa3ffc9
+EBUILD libindicator-12.10.0-r200.ebuild 1027 SHA256 4e222cda4a50f4617becf336af1f11c6d550c2513a673bf730c230a0f581c556 SHA512 588ee18aaf5b28e9a324d30c85f850dbcb73edd3a40e430ac8c471a70718ece42e56fdef3364c23d7dcf898643b335636334fecc7e06e69f2e21c00e923e1615 WHIRLPOOL 7a38986f9cc0dae7dff2cc2c2e9384c6cc6cc56ad49773df1e2506a7b756cb792d00c27b54a2a36552ec6fc0763984da7df1213ae1624bb7266b2fe2faf9d132
+EBUILD libindicator-12.10.0-r300.ebuild 956 SHA256 93dde5091361fed197ba1728e60d02df9fba648a5b4c8013ae339809cc58ece0 SHA512 bc0a7af666ac3b864c10e852a236d0fe1a41dcfb72a423bc7f5de16a9732aca10f31ff963679a19fd13ae7e91464b932ff958ecf0d5c0f473967510f962415bc WHIRLPOOL 6428380dc95d523fc0efe2a3e0ba44e0de9a25158174c054eb442fe8d802ada2ba59e70178ad6e2804776c02cac7faeb42c76beb4e01202c620e0c461911ee37
+MISC ChangeLog 2725 SHA256 72c11175674dc8c8b84826a543f0cebfb3bcae95509d6f04ea8f9827959f80d7 SHA512 9bd7674f60ea2da0feee58da21a952d2075a15d40a574751879a447f8fec4d02dc6a35b4fdb03f36e60b6de3d919449b482a0c4552a24cec1f721edce876b48f WHIRLPOOL fa27c16448a44fdc1ab3dd4185a3904021fcdd7bc5a9cd23371a5886b5fba7bac2fd24b10302391431bdc716f4c71f34c72cfd7f7e2878614db581afc32aeed3
 MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQEXGbAAoJEEdUh39IaPFND1AIAJKSMMRTVkUzqGX3e79taIsN
-z4FZxoUv7dv8iJBXVVYKBzm/+53uM0VAvy/ym7h9IrnJMLZDq29ACFpivzdegxWM
-DQlE1TXszzukSeG0Q0WfvbAypLsZnjN71SB3HLGkSqJgncM9bwbdvcH4FTLrvdtS
-mEYE7Hvn8pVvvjehtlp06CRKv/PA2z8ROYd61Ebj0/uDCuKazxNz9bSS5gZ481Sa
-i6COEBKLv36M+vbWP1Q324V3f0I9BOrFkV9Bmtgwy39hVZyclzo/tDdb5XxCeIjA
-ZfZddfeC2U3fDI4D5Iwg617qcqL8+8XZWAGfBJ3QcnUiC0YV75LR1r7/MBJ6Kyc=
-=zhUa
+iQEcBAEBAgAGBQJQFvOmAAoJEEdUh39IaPFNRVYH/1ZGikRba4fMHS4okkG5nduZ
+7wR91aw2jquHIZRZhLrLBKc/6zxdjJruGh6sOgSVMQ7HnjsWiM9WvQp5cFO7R+ZH
+JT3tlGlFzT56UsPaVgpQBayfFFqLaRvVdb1fckRnp3nNtHEYUV1E0rH7Y+s/vF0B
+JSL9n95obxqB6EYjexhYaoDoTp04+e/wn3XqN4RrRz+NwTHknk77vAZ8UqJuc4Ql
+2C80Ozk1S6NchptnZFYaXyCBCRtaFBu8/ybrqkpkWsvTLNzt512jRt3t9en1DVaX
+THs2Ip1xBqrZdovbqKrN56GcMna2gVuNmywoPkEaYq0NCJJ6Llv/yXrXXwEFP8M=
+=U2uK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
index 5ae04e546738..b6f13dfef27c 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild,v 1.1 2012/07/26 14:59:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.0-r200.ebuild,v 1.2 2012/07/30 20:51:21 ssuominen Exp $
 
 EAPI=4
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic virtualx
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="http://launchpad.net/libindicator"
@@ -12,13 +12,13 @@ SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22
 	>=x11-libs/gtk+-2.18:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	!<${CATEGORY}/${PN}-0.4.1-r201"
+	test? ( dev-util/dbus-test-runner )"
 
 src_configure() {
 	append-flags -Wno-error
@@ -29,11 +29,15 @@ src_configure() {
 		--with-gtk=2
 }
 
+src_test() {
+	Xemake check #391179
+}
+
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 	prune_libtool_files --all
 
 	rm -vf \
 		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/libindicator/80indicator-debugging
+		"${ED}"/usr/share/${PN}/*indicator-debugging
 }
diff --git a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
index ea0ce205d91f..44537c80eea7 100644
--- a/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild,v 1.1 2012/07/26 14:59:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild,v 1.2 2012/07/30 20:51:21 ssuominen Exp $
 
 EAPI=4
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic virtualx
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="http://launchpad.net/libindicator"
@@ -12,13 +12,13 @@ SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22
 	>=x11-libs/gtk+-3.2:3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	!<${CATEGORY}/${PN}-0.4.1-r201"
+	test? ( dev-util/dbus-test-runner )"
 
 src_configure() {
 	append-flags -Wno-error
@@ -29,6 +29,10 @@ src_configure() {
 		--with-gtk=3
 }
 
+src_test() {
+	Xemake check #391179
+}
+
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS