4 files changed, 16 insertions, 114 deletions
diff --git a/dev-libs/libunique/ChangeLog b/dev-libs/libunique/ChangeLog
index ae881db421e1..eff823b756ee 100644
--- a/dev-libs/libunique/ChangeLog
+++ b/dev-libs/libunique/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libunique
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.36 2011/03/16 10:12:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.37 2011/04/09 13:09:23 eva Exp $
+
+  09 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> -libunique-1.0.8.ebuild,
+  -files/libunique-1.0.8-automagic-dbus.patch:
+  Clean up old revision.
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   libunique-1.0.8.ebuild, libunique-1.1.6.ebuild:
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index d710532f2e39..e31054cb3db9 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -1,8 +1,15 @@
-AUX libunique-1.0.8-automagic-dbus.patch 1798 RMD160 32c0d996c48340e6a8695f26058fb533b802c221 SHA1 16bfce90172a38512fe383699c0f7363bb33fe3e SHA256 cdf93f2febf1c8122c815ebc66202a85dcce9ea523249726e23c819dcb69deb9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX run-tests 500 RMD160 e299f662ca2a79cad7fafd5aa186b2ac9ca3752a SHA1 b0dc327cd70ff0c721bb7ad1ca8b5ac46bf70455 SHA256 586a7bea8db8c69761549d4d27024d08d68c4e2dafd59e50efb35bfc42a9afc2
-DIST libunique-1.0.8.tar.bz2 327444 RMD160 ad58825f8c44a131b7aaa6df1569e5a85e8a017a SHA1 fcd38201e561f5d62c86b0242b5cfd721a452631 SHA256 d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6
 DIST libunique-1.1.6.tar.bz2 335534 RMD160 2c6894a574eb0f5c91b47cd6214b3f9da63cbcde SHA1 d44ad06503efaaa0c660c5f8a817e90fbe254d1f SHA256 e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
-EBUILD libunique-1.0.8.ebuild 1408 RMD160 374b335b484a9f9c560fd5fca6871eb29d53f0c1 SHA1 f1acd8e1a26accc2dd0acf9cc90eac9747c4b870 SHA256 2b51483fa2df9acd7645db71545fed228998bae59baa6d538d480f3c35e78715
 EBUILD libunique-1.1.6.ebuild 1397 RMD160 5e140c4a86b1a96e4b200c41ea92f9e24ea4fa70 SHA1 3c72b0998decb5917be3dcc14fcb64733afed48d SHA256 00f1c00f88ccb867d4a85c81676b10bcac0ee459af4f6d79fb36127a726a68a4
-MISC ChangeLog 4560 RMD160 a92c1e03b065c2b28a7c70a2a13888b85defd343 SHA1 ab00919344c7bbdb8ecfe7ba4026b2bdb6d399d4 SHA256 73fd3592688e2208fe10ba4ac78e185d8e6a28a8c9dd8a12fcac72363e073633
+MISC ChangeLog 4707 RMD160 fd32b395d53a4b92f2786b36bf63989ccc3ef36a SHA1 02d62f2f5b89653e13d36304dbdd8e524be1cf74 SHA256 104a091a25153596ae106947ea027cf08e9958ecafab958d28c8fa1c0b2bda21
 MISC metadata.xml 524 RMD160 e577176f51e67fe729cd025a5bdf1b1f79eeae0a SHA1 ebde47d0175507854c365ffa5c4052e600b28749 SHA256 3fed9bec27e312e7f8a69a581b5d7b931d53137631b65f401ee149818daf9116
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2gWokACgkQ1fmVwcYIWAbY1gCeKv5jAPuv99Bi3heTgnfxgipp
+KrMAoKj2DtkkMMENDO/v7bfcatjh775z
+=a9Us
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch b/dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch
deleted file mode 100644
index 9b0e9b14e981..000000000000
--- a/dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# Make dbus support configurable
-# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=578777
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=265828
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2009-03-22 05:42:31.000000000 +0530
-+++ b/configure.ac	2009-04-12 16:27:06.816454299 +0530
-@@ -76,16 +76,24 @@
-                           glib-2.0 >= $GLIB_REQUIRED dnl
-                           gtk+-2.0 >= $GTK_REQUIRED)
- 
--dnl D-Bus backend dependencies
--if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then
--  have_dbus=yes
--  PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
--  AC_SUBST(DBUS_CFLAGS)
--  AC_SUBST(DBUS_LIBS)
--  AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) 
--  AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
--else
--  have_dbus=no
-+AC_ARG_ENABLE([dbus],
-+	[AC_HELP_STRING([--enable-dbus],
-+	[Enable with D-Bus support @<:@default=yes@:>@])],
-+	[have_dbus=$enableval],
-+	[have_dbus=yes])
-+
-+if test x$have_dbus = xyes; then
-+  dnl D-Bus backend dependencies
-+  if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then
-+    have_dbus=yes
-+    PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-+    AC_SUBST(DBUS_CFLAGS)
-+    AC_SUBST(DBUS_LIBS)
-+    AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) 
-+    AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
-+  else
-+    have_dbus=no
-+  fi
- fi
- 
- AM_CONDITIONAL([HAVE_DBUS], [test x$have_dbus = xyes])
-@@ -171,7 +179,8 @@
- 
- echo "
- Configuration:
--            Maintainer flags: $enable_maintainer_flags
--                 Debug level: $enable_debug
--         Build documentation: $enable_gtk_doc
-+	Maintainer flags:	$enable_maintainer_flags
-+	Debug level: 		$enable_debug
-+	Build documentation: 	$enable_gtk_doc
-+	D-Bus support:		$have_dbus
- "
diff --git a/dev-libs/libunique/libunique-1.0.8.ebuild b/dev-libs/libunique/libunique-1.0.8.ebuild
deleted file mode 100644
index c1ffb4cb41f1..000000000000
--- a/dev-libs/libunique/libunique-1.0.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.0.8.ebuild,v 1.21 2011/03/16 10:12:25 nirbheek Exp $
-
-EAPI="2"
-
-inherit autotools eutils 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 debug doc"
-
-RDEPEND=">=dev-libs/glib-2.12.0:2
-	>=x11-libs/gtk+-2.11.0:2
-	x11-libs/libX11
-	dbus? ( >=dev-libs/dbus-glib-0.70 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.17
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.6 )"
-
-DOCS="AUTHORS NEWS ChangeLog README TODO"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Make dbus support configurable, bug #265828
-	epatch "${FILESDIR}/${P}-automagic-dbus.patch"
-	eautoreconf
-}
-
-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"
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable dbus)
-		$(use_enable debug)"
-}