From 10c4608aa01fff5e4955bacff81a55fe7da277ac Mon Sep 17 00:00:00 2001
From: Jonathan Callen <abcd@gentoo.org>
Date: Fri, 8 Apr 2011 07:36:08 -0400
Subject: Move inherits earlier so they don't override DESCRIPTION

(Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838)
---
 sys-apps/gnome-disk-utility/Manifest               | 24 ++++++++++++++++++++--
 .../gnome-disk-utility-3.0.0.ebuild                |  4 +++-
 .../gnome-disk-utility-9999.ebuild                 |  4 +++-
 3 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'sys-apps')

diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index e642c341..4f71a6d1 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867
 DIST gnome-disk-utility-3.0.0.tar.bz2 2407254 RMD160 b746f26c4d20920bec8bb795a7d04f81a6009abe SHA1 bd28a3228fc9f4ddb08778a4152bc5ebd175697b SHA256 94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb
-EBUILD gnome-disk-utility-3.0.0.ebuild 1736 RMD160 425d9df22765dbd33d94e237db0ab5183bcc1c4d SHA1 efbb4c0d65da034b36a563d0bfbe0c84511bd028 SHA256 bd954b1f3f19963976c0428fcf52f5d8d9ad8dc8d5bf5be54c8864119f481c18
-EBUILD gnome-disk-utility-9999.ebuild 1762 RMD160 8ab2bb96e90049d1ad72084184aa57153e3b0422 SHA1 5bc0b578f4818640d04e7ae81c1ee7f8687fa131 SHA256 a6552bbd06a48c71733c8e4413f5f7bfb30f80c517f5daabb02a9b432f35d3c9
+EBUILD gnome-disk-utility-3.0.0.ebuild 1767 RMD160 8f3eadcd8eb28179d957bb917dc85ad57ed7a082 SHA1 ef2e5befe5fe1add109ad2aa6c53b2d626167b4d SHA256 9d20899db8edab5627bdc7d1fc60cb7a4deb8bd003e50575af1959d86b2b869a
+EBUILD gnome-disk-utility-9999.ebuild 1793 RMD160 cef46ea93dc278bd056f09f3a687011ed1ace55a SHA1 ff95855ec951f8fc1b9322e75bde17e3d5419992 SHA256 026befc32f6d9481ccfe87e07162dc4226f05a76b599cfe76a47af57be7070d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNnvMbAAoJELHSF2kinlg4bBkP/0QuJQ+bl8UQr4J7CzKLUUvV
+MgEacQTXdLyn3hJummQFt8vk47LTBqFWI4vtlmUqw18W72+fAJO9DDyi1/U5Nvrc
+07ZGNgR4ABS7DtTX7wctv7qboNiocX1J1FClYBBRErRmFXwjelm6uwVaxdWcK5mw
+MvIcpqYUqzdf3W9w8od51H1CzP5lW/qoUlzNa9WH5G9W0eFFARTmg1p4EzZNl/7+
+yy2Qd05h01nBlpV+dkOFbhu6EMFbz9QuRkbfDBLtE9oZlDUhyXpr3rJUatrsuh6W
+lmihBir0/cVh2SPoDy2B6HRAsYoqjCxbJMCqIN58kWV1Xo77uj80pqt2uxUNUpxz
+tcaGUQeKR9FZpI5pjbgNWrtckbTbvnt38LtK+c40llGwDCm/0lfSyiDBGlBAtrOv
+nG9+LIn2ywoSSuzknAA5bWt0hYXR6RNYZlvMKPPwA6rPcldZL0zDsfN3HSp0vg/H
+FgpbVDwMOjrd7sRhDglgBwLct6iCY+ZwBpKnrOaqAS23qLSmg8NhoCal1RWkBk9J
+na0ZjLaPZTpvSdXRfaPS6D5AdtW/HPhP8buxVsXHz9OrqhGy85n7wJziq451swmN
+dEviATQbSA/7y6pSpQjQcDjDMNpqs/9qikoO5FNoB1p+j+rqX1w3zkKkZ+5VAbv8
+R/ISZJwud9hjivib1vYv
+=2A5+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
index 29617664..d6518a65 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.0.ebuild
@@ -7,6 +7,9 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
 HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
@@ -15,7 +18,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="avahi doc fat gnome-keyring nautilus remote-access"
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
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 52b95233..95b5920e 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -7,6 +7,9 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
 HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
@@ -15,7 +18,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="avahi doc fat gnome-keyring nautilus remote-access"
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-- 
cgit v1.2.3-65-gdbad