sys-apps/gnome-disk-utility: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

4 files changed, 25 insertions, 70 deletions

diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
deleted file mode 100644
index 61388a72..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.6.1.tar.xz 1214796 SHA256 e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32 SHA512 f513cb57d0807eb38b32ee6c0e70f3303c7afbe21d39a9b8e9fa35ce49b1932985b1a989f7608fc41063d62608356a6de9c6739af6794a82dfdf8ce0f10a51ac WHIRLPOOL 940e4e514e13eeb49e3a9862e40f482aa1352b271e11287d83b197f771a6dd753ed9e193a88f8b64e078448f750d86a5891ead44ed1055d4a28f1e7f0babee18
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCMPiQACgkQ1fmVwcYIWAZ3gQCfTDMo80bsNW07BKsSclcxQll8
-0MEAnAjBY40HRGTn9FVI/cxBMcIt7QGX
-=N8Su
------END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
deleted file mode 100644
index 25478776..00000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 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-3.4.1.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="fat"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
-fi
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-1.99.0:2
-	>=x11-libs/gtk+-3.5.8:3
-	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality"
-RDEPEND="${COMMON_DEPEND}
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-src_configure() {
-	DOCS="AUTHORS NEWS"
-	G2CONF="${G2CONF}
-		--disable-libsystemd-login
-		--disable-maintainer-mode
-		--disable-schemas-compile"
-	gnome2_src_configure
-}
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 07cbfd89..ef6bc725 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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-3.4.1.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -14,13 +14,13 @@ fi
 DESCRIPTION="Disk Utility for GNOME using udisks"
 HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 COMMON_DEPEND="
@@ -28,18 +28,19 @@ COMMON_DEPEND="
 	>=sys-fs/udisks-1.99.0:2
 	>=x11-libs/gtk+-3.5.8:3
 	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality"
+	dev-libs/libpwquality
+"
 RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )"
+	fat? ( sys-fs/dosfstools )
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	dev-libs/libxslt
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-libsystemd-login
-		--disable-maintainer-mode
-		--disable-schemas-compile"
+src_configure() {
+	G2CONF="${G2CONF} --disable-libsystemd-login"
+	gnome2_src_configure
 }
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
new file mode 100644
index 00000000..2c5efaeb
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="fat">Include FAT16/FAT32 support
+		(<pkg>sys-fs/dosfstools</pkg>)</flag>
+    <flag name="nautilus">Enable <pkg>gnome-base/nautilus</pkg> extension.</flag>
+    <flag name="remote-access">Enable access to remote udisks
+		daemons.</flag>
+  </use>
+</pkgmetadata>