summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-07-30 20:51:21 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-07-30 20:51:21 +0000
commit0391b9346f858d146c0ab4e1f37887862121b7b5 (patch)
tree0c8cfdbb17aa7e0091b67e549738203cd212201a /dev-libs/libindicator
parentVersion bump (diff)
downloadgentoo-2-0391b9346f858d146c0ab4e1f37887862121b7b5.tar.gz
gentoo-2-0391b9346f858d146c0ab4e1f37887862121b7b5.tar.bz2
gentoo-2-0391b9346f858d146c0ab4e1f37887862121b7b5.zip
Pull in dev-util/dbus-test-runner and use virtualx.eclass for src_test() wrt #391179 by Jonathan Lovelace
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libindicator')
-rw-r--r--dev-libs/libindicator/ChangeLog7
-rw-r--r--dev-libs/libindicator/libindicator-12.10.0-r200.ebuild14
-rw-r--r--dev-libs/libindicator/libindicator-12.10.0-r300.ebuild12
3 files changed, 23 insertions, 10 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/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