Add dbus[X] to dependencies for tests, bug #402461. Does not really affect dependency tree since libunique is targeted for use by X applications.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 17 insertions, 61 deletions

diff --git a/dev-libs/libunique/ChangeLog b/dev-libs/libunique/ChangeLog
index 0573dd641e33..df4ecfda4f91 100644
--- a/dev-libs/libunique/ChangeLog
+++ b/dev-libs/libunique/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libunique
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.60 2012/10/26 02:14:55 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.61 2013/01/13 16:35:38 eva Exp $
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -libunique-1.1.6.ebuild,
+  libunique-1.1.6-r1.ebuild, libunique-3.0.2.ebuild:
+  Add dbus[X] to dependencies for tests, bug #402461. Does not really affect
+  dependency tree since libunique is targeted for use by X applications.
 
   26 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
   libunique-1.1.6-r1.ebuild:
diff --git a/dev-libs/libunique/libunique-1.1.6-r1.ebuild b/dev-libs/libunique/libunique-1.1.6-r1.ebuild
index e4b021dac5f6..1a5f7864ccb8 100644
--- a/dev-libs/libunique/libunique-1.1.6-r1.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6-r1.ebuild,v 1.10 2012/10/26 02:14:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6-r1.ebuild,v 1.11 2013/01/13 16:35:38 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -19,7 +19,9 @@ IUSE="dbus doc +introspection"
 RDEPEND=">=dev-libs/glib-2.12:2
 	>=x11-libs/gtk+-2.11:2[introspection?]
 	x11-libs/libX11
-	dbus? ( >=dev-libs/dbus-glib-0.70 )"
+	dbus? (
+		>=dev-libs/dbus-glib-0.70
+		sys-apps/dbus[X] )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/dev-libs/libunique/libunique-1.1.6.ebuild b/dev-libs/libunique/libunique-1.1.6.ebuild
deleted file mode 100644
index 4c1350f5968a..000000000000
--- a/dev-libs/libunique/libunique-1.1.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6.ebuild,v 1.18 2012/05/04 18:35:54 jdhore Exp $
-
-EAPI="2"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="a library for writing single instance application"
-HOMEPAGE="http://live.gnome.org/LibUnique"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus doc +introspection"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=x11-libs/gtk+-2.11:2[introspection?]
-	x11-libs/libX11
-	dbus? ( >=dev-libs/dbus-glib-0.70 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
-# For eautoreconf
-#	dev-util/gtk-doc-am
-
-DOCS="AUTHORS NEWS ChangeLog README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-flags
-		--disable-static
-		--enable-bacon
-		$(use_enable introspection)
-		$(use_enable dbus)"
-}
-
-src_test() {
-	cd "${S}/tests"
-
-	# Fix environment variable leakage (due to `su` etc)
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	# Force Xemake to use Xvfb, bug 279840
-	unset XAUTHORITY
-	unset DISPLAY
-
-	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
-	Xemake -f run-tests || die "Tests failed"
-}
diff --git a/dev-libs/libunique/libunique-3.0.2.ebuild b/dev-libs/libunique/libunique-3.0.2.ebuild
index 1bdbbe407d71..ca379654cdcf 100644
--- a/dev-libs/libunique/libunique-3.0.2.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.2.ebuild,v 1.11 2012/05/04 18:35:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.2.ebuild,v 1.12 2013/01/13 16:35:38 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -17,7 +17,9 @@ SLOT="3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE="doc +introspection"
 
-RDEPEND=">=dev-libs/glib-2.25.7:2
+RDEPEND="
+	>=dev-libs/glib-2.25.7:2
+	sys-apps/dbus[X]
 	>=x11-libs/gtk+-2.90.0:3[introspection?]
 	x11-libs/libX11
 "