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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 23 insertions, 68 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/Manifest b/dev-libs/libunique/Manifest
index 024fb4de6a7f..e9fd35a2568a 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -8,15 +8,14 @@ AUX libunique-1.1.6-include-terminator.patch 1150 SHA256 32ade6dbddac23e3ff181d1
 AUX run-tests 500 SHA256 586a7bea8db8c69761549d4d27024d08d68c4e2dafd59e50efb35bfc42a9afc2 SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547 WHIRLPOOL d5dbe0064706f56a5ee006d5616812a14dfce41b5ec4c7a5861b1d1b9513bffe68f2a6c2071fa1f062dcaed4a81205c888dd1e8c0ad248ccae07ea9c68e6f08e
 DIST libunique-1.1.6.tar.bz2 335534 SHA256 e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde WHIRLPOOL ed5305ebf2e1e052c94c575e035c636ed4f80137c5a1d6cf57a80bbe74cdf55274e9ae29562c31f8dbb1c8aab665d39acfadfeeeac29af6d5fe8d8db33243b0d
 DIST libunique-3.0.2.tar.xz 294712 SHA256 a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038 SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4 WHIRLPOOL 81d8ccdc22c27221525d59e0e7186aff632e2fdaa53ed4b05e38af814b889e3b1d470f7c9b3a8dcf98322145b92f8759f02b82771db4908a6aacb6e1bd761744
-EBUILD libunique-1.1.6-r1.ebuild 1983 SHA256 450dea45677a97167729621a9f8f6559400de5bcb06c7672e58a4d60557ebeba SHA512 b0dcc1695888ce26ff6539a1cc02b9dd4bb77db4dc3a57f8a63ad3e2afaeb0fec4daf1cce1b82c9d9948018cf1f1902592f535957b34b7c971c0339134120d53 WHIRLPOOL 1fc076b1fba19f05ba22310d8528ff7303c01f1a53f3d7d91b92bc23b6773e87c85adb4f2c6733e4cf19ecf02579016c4b651180c2297571661e81bc04e9738c
-EBUILD libunique-1.1.6.ebuild 1408 SHA256 d53ed57d17ec33344a864bdfae315492ac820db6e1f4c1169a0eb496dba51d8f SHA512 9e533877d2f155087b735da360021116ba8db0b30155dc5a3e018fe7bfaab305f55dd315fedf72f0798432b1523d3bad63c9af15bb49a7b0f1f55c13c50e60b1 WHIRLPOOL b88ab382aa45665277726ad1f441b23d31d6f184d780c44f2589b64a278ff28ddeaf28d3525dff2ed000eb2b49a449a27153264b4c61ffb52e1ac9c668fe4d89
-EBUILD libunique-3.0.2.ebuild 1603 SHA256 29a73d1993ff2178330b6ca9dd0d03b123c20e17ac848eef261eb90c5c6e9df1 SHA512 2f95ea6a504cf6055dbfb06c65f14bcfbdb353679a0d96d97bb7f8fd478f8d6d86b632408126da5d9a37d6083d21e62cf58d9c362d25fded30e945fc6828f52f WHIRLPOOL e48ce9548bd153033a8bea33148cb4734aa3ebb12cdb5716aed51c6d89b759899188db4ba128661899033789c88dfb9624f4b7246e25cfc48572f9f58282c876
-MISC ChangeLog 8014 SHA256 a20637880acee7ed6a2f35041e22902e429a410de2e4eab37463d7a6a54c975d SHA512 c248418b44b4f27bbc4e8652a797edaf54b526e2cbcf91e5c0a85d9b48a7f6866d772d20785cae5c2b9014e8b6d1eb670b0e307c7c59367f8f63f57a8da8908e WHIRLPOOL c2f0968130bb59195352685d90c722fa39a3d19e7718a93f631693af75ad4c96874e12eb863980be0466ea641e7e40739b647c1344cd2974396ab0daf24d9aba
+EBUILD libunique-1.1.6-r1.ebuild 1999 SHA256 48e4ee554a1a08e00f4c41f72ab210018e6ba2b4b3e1a635b5a8133b02199670 SHA512 6d2f080b229586e60481e924e16719d5cb0fc52133a13db6fcfcbf59bfb334f9fb5bbb4250d7b8d83da93c84973321b2818b1c7d96b762bd1722ddaf921d8e0a WHIRLPOOL 9d7180d27794346954ec4401d06e1c353d661f5f5c97e4e629877c19a542e297cc11eda3b33cf89f3f2263cbfaa0d7ccf45cce21186b7e47e31150079f28a8ac
+EBUILD libunique-3.0.2.ebuild 1620 SHA256 d08d07155dddb7b8f6d4e0b9a887bbde6805581d8b72f6c652d09f4614abbbd9 SHA512 1ef63ccd7f9c6749b021a192fb810498dc496497bc512deb16b013e675dbc39560933e731780410a1bbbd5b9a56627c50b6bdc492493889fbdff5e7ccc815662 WHIRLPOOL 88242901f0020734870342f62d83bcce18482b4ac82fd8f17b189fea6abc3c01654035676ed376b93e3c4597c485a4fdd8fde23181ddfa00ea5c721c1e6fa212
+MISC ChangeLog 8292 SHA256 6662184b8c5f734251f39dc9c0b30509ded9e10a3ab4c1071b6ee25807637b7e SHA512 28dc5bc0141cc2849aebb5bdefca9086fb2ecfb2428451f198f3edd37075a634fb3a2679543bd4d478e079eeb6544d57a67969a4b7fb753292ca0fdb49b2699e WHIRLPOOL 3c965616fd53ff6d1221fee3b0869aaaf95d49820f326cf60f1234e663a31fd029dbfb5099ca44968c854ab735fe4572f0f6ce721429cdd8fdf62e28d8b4defb
 MISC metadata.xml 524 SHA256 3fed9bec27e312e7f8a69a581b5d7b931d53137631b65f401ee149818daf9116 SHA512 0849d60f9ee4874a7f49dd6ace561dd3e8e33cb34fe7ea82e4b0e94da0b563f9ef7d9bcddf8ecc0bdd02f6a491752c4375f9659da155d5386ade3d4e14bb3399 WHIRLPOOL 146c41525755cd95b8e1f4bec4a5352e93f90d7ea77411adeaa9aee2d0fb70787fc8aad975c98943a77da0976cea1096bab1e1fe13a91ef918a4fc937c771be1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJ8eIACgkQl5yvQNBFVTUOUQCfdQ6YngwNSVW1kr65BYMq3n6c
-isEAmwbZMfgI4JXd1aMz3eDDOL/whFib
-=ANS6
+iEYEAREIAAYFAlDy4lsACgkQ1fmVwcYIWAbBngCgrKuKtgtXEo925NbYfnsmzTO2
+N6UAn2lg0026tqOQgDEjxBWeO5ZBs2Gm
+=UOcr
 -----END PGP SIGNATURE-----
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
 "