sys-apps/gnome-disk-utility: moved to gentoo-x86 + sync live ebuild

3 files changed, 3 insertions, 68 deletions

diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
deleted file mode 100644
index 2f5189cf..00000000
--- a/sys-apps/gnome-disk-utility/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST gnome-disk-utility-3.10.0.tar.xz 1401460 SHA256 34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa SHA512 0de9aaea7835dfa12525aeb8ae5e3d7fd8db89b449d979267c1b50cf3b447c495c56f5340dc8cf355941dab6b68a29a25c8c152197cfbf0b348cf09c347d5459 WHIRLPOOL 2bb703e1c77a42516476fbfb3e8782f81dee80a717e03183a408c5527ae4d947dcafe0e6bed1fb630abd9cc63d1b47d74a136e38da611a54deee8a07816c4cab
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iEYEAREKAAYFAlJZ3YYACgkQ1fmVwcYIWAbKAgCgmLEx4NDG8WjjLmbJJT+0jscx
-gB4AoOD3g9q8oruGrgkimwZ6GEzqUEfe
-=gcan
------END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
deleted file mode 100644
index 04b9b88a..00000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat +gnome systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.5.8:3
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality
-	systemd? ( >=sys-apps/systemd-44 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/libdvdread-4.2.0
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix USE=-gnome, bug #478820
-	epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch
-	epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd-login)
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
index 1ed616b2..43d87517 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -43,6 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	dev-libs/libxslt
+	gnome-base/gnome-common
 	virtual/pkgconfig
 "