Pin libunique to slot 1. Remove old revision.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

4 files changed, 10 insertions, 74 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 7e70fdf7b741..69228211b22d 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.34 2011/02/24 20:42:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.35 2011/02/26 19:20:13 eva Exp $
+
+  26 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-disk-utility-2.32.0.ebuild, gnome-disk-utility-2.32.0-r1.ebuild,
+  gnome-disk-utility-2.32.1.ebuild:
+  Pin libunique to slot 1. Remove old revision.
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org>
   gnome-disk-utility-2.32.0-r1.ebuild:
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
index d6650297a285..be55b690feb0 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild,v 1.3 2011/02/24 20:42:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild,v 1.4 2011/02/26 19:20:13 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,7 +19,7 @@ IUSE="avahi doc fat gnome-keyring nautilus remote-access"
 CDEPEND="
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1
+	>=dev-libs/libunique-1:1
 	>=x11-libs/gtk+-2.20:2
 	=sys-fs/udisks-1.0*[remote-access?]
 	>=dev-libs/libatasmart-0.14
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild
deleted file mode 100644
index dd6e81baf4bb..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild,v 1.4 2011/01/17 15:33:12 ssuominen Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
-HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="avahi doc fat gnome-keyring nautilus remote-access"
-
-CDEPEND="
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1
-	>=x11-libs/gtk+-2.20:2
-	=sys-fs/udisks-1.0*[remote-access?]
-	>=dev-libs/libatasmart-0.14
-	>=x11-libs/libnotify-0.3
-	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
-	gnome-keyring? ( || (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 ) )
-	nautilus? ( >=gnome-base/nautilus-2.24 )
-"
-RDEPEND="${CDEPEND}
-	fat? ( sys-fs/dosfstools )
-	!!sys-apps/udisks"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	gnome-base/gnome-common
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.13
-
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable avahi avahi-ui)
-		$(use_enable nautilus)
-		$(use_enable remote-access)
-		$(use_enable gnome-keyring)"
-	DOCS="AUTHORS NEWS README TODO"
-}
-
-src_prepare() {
-	# Keep avahi optional, upstream bug #631986
-	epatch "${FILESDIR}/${PN}-2.30.1-optional-avahi.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
index b5f51ea59a7f..a22e6699a95b 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.3 2011/01/31 18:57:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.4 2011/02/26 19:20:13 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ IUSE="avahi doc fat gnome-keyring nautilus remote-access"
 CDEPEND="
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libunique-1
+	>=dev-libs/libunique-1:2
 	>=x11-libs/gtk+-2.20:2
 	=sys-fs/udisks-1.0*[remote-access?]
 	>=dev-libs/libatasmart-0.14