minor fixups as suggested by ferdy (bug #144336)

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 27 insertions, 20 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 3c3d6dc771bb..5628260fb43f 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/glade
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.46 2006/08/17 20:29:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.47 2006/08/18 19:29:33 compnerd Exp $
+
+  18 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org> glade-3.0.0.ebuild:
+  Minor cleanups as suggested by ferdy (bug #144336)
 
 *glade-3.0.0 (17 Aug 2006)
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5d2188557bda..23764d3bce15 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -7,7 +7,7 @@ MD5 5a2537a4609ee178e84e4e7472ee93a6 files/glade-2.0.0-scrollkeeper.patch 490
 RMD160 bd8f2712cd87818f1d53a5249cdf9c0e3513d80b files/glade-2.0.0-scrollkeeper.patch 490
 SHA256 38510704625873ddc0e03bad492c4514f00122053f8d0543bcf9d63574b04482 files/glade-2.0.0-scrollkeeper.patch 490
 DIST glade-0.6.4.tar.gz 2593745
-DIST glade-2.10.1.tar.bz2 1697449
+DIST glade-2.10.1.tar.bz2 1697449 RMD160 831abdfe4cb3c7ec7b3ef27cc52c0c81b08e65c9 SHA1 b460d6bdeedc8740c909c98906e3ae8289db731f SHA256 371c3854fa6e32b4cd3719a970a8860d2bfc3f724e625b3d8df5d55d6cdd52c8
 DIST glade-2.12.1.tar.bz2 1689503 RMD160 302d729c207904063f01b89312181534fff44574 SHA1 19b0152da79c4ff24b5d5277370ffc3bda8ee07a SHA256 b49ddb2fdb5ba6d75aa94d406eda84ac3a873c59137d02e17300be398f8acec7
 DIST glade-2.6.8.tar.bz2 2447161
 DIST glade3-3.0.0.tar.bz2 715686 RMD160 42de553c08edc2e120238b27598839de6706c0d4 SHA1 dc273b6396cc32e716406c6ae7b5841bde882e4f SHA256 4f4315303aa725d7d7995b2db2ead5628e57009dccba436b57da5d3c14077549
@@ -27,14 +27,14 @@ EBUILD glade-2.6.8.ebuild 1224 RMD160 3dd95ef2532ddb82f0d04eadaafe71399c23bf98 S
 MD5 a39f59354bb76f42b0ab1e1278c91c7f glade-2.6.8.ebuild 1224
 RMD160 3dd95ef2532ddb82f0d04eadaafe71399c23bf98 glade-2.6.8.ebuild 1224
 SHA256 e34fcad63cab149881139f7fcd8c5394c663677228f83cfcc0b94f27593e381f glade-2.6.8.ebuild 1224
-EBUILD glade-3.0.0.ebuild 904 RMD160 e359a2cb9dd46eb3b4c2e90d16b9f2b5f0b5205a SHA1 3bf14ba57b1d65892ed6b85edebaf3e33d7b7bca SHA256 5eadfbe4fca373ada22253cd5fd70efaf1c4169a54987d43bacd0abb8c926e10
-MD5 7b855d1f17a373c9aa1778d4b2b5e0e1 glade-3.0.0.ebuild 904
-RMD160 e359a2cb9dd46eb3b4c2e90d16b9f2b5f0b5205a glade-3.0.0.ebuild 904
-SHA256 5eadfbe4fca373ada22253cd5fd70efaf1c4169a54987d43bacd0abb8c926e10 glade-3.0.0.ebuild 904
-MISC ChangeLog 5681 RMD160 ef43f8c634d0ef1b542c3e1ca68ae8ff7c6c3588 SHA1 a969766cde2454c940e73ca6d33e438269a127aa SHA256 3aab0f3858dd008f007edb3eabf323917629bc049ce2ced7c6367906e4a17421
-MD5 a8f946b817e5f8f3edf938ff870f384b ChangeLog 5681
-RMD160 ef43f8c634d0ef1b542c3e1ca68ae8ff7c6c3588 ChangeLog 5681
-SHA256 3aab0f3858dd008f007edb3eabf323917629bc049ce2ced7c6367906e4a17421 ChangeLog 5681
+EBUILD glade-3.0.0.ebuild 929 RMD160 436a7c89aa51dbced176f552d65def50dc4ad556 SHA1 806cc5a4c2cf027e8948822d7607f7ca882bab46 SHA256 d1e0ce2bdac44ed0710e371eae3cb0781ddd0941470a5f13a3ecbf1623ce6091
+MD5 57caf6ca873d0462db57fa8e75e89176 glade-3.0.0.ebuild 929
+RMD160 436a7c89aa51dbced176f552d65def50dc4ad556 glade-3.0.0.ebuild 929
+SHA256 d1e0ce2bdac44ed0710e371eae3cb0781ddd0941470a5f13a3ecbf1623ce6091 glade-3.0.0.ebuild 929
+MISC ChangeLog 5811 RMD160 58a9573412531cc5134e3cc4b4b513571e149477 SHA1 749c807aa259a89937ceb8819071ac497508e4ca SHA256 052156af1a07d000eaa2c036642a570f096647a1913be9e3c867f8b7b11a9727
+MD5 01caff36e09f4d73462a65212775979d ChangeLog 5811
+RMD160 58a9573412531cc5134e3cc4b4b513571e149477 ChangeLog 5811
+SHA256 052156af1a07d000eaa2c036642a570f096647a1913be9e3c867f8b7b11a9727 ChangeLog 5811
 MISC metadata.xml 221 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 SHA1 b78c278ada4bb68032eb139b0377fafbe1a23ca4 SHA256 3fc3c4c8d38e16d4437c4e745fbee3143d7bbbc45e134a9fe32ecbac4bbba2ac
 MD5 4f77f65f8a5bbf34fa7b14459034c51e metadata.xml 221
 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 metadata.xml 221
@@ -42,9 +42,9 @@ SHA256 3fc3c4c8d38e16d4437c4e745fbee3143d7bbbc45e134a9fe32ecbac4bbba2ac metadata
 MD5 b947cc014b4212b215eaaa95590ef136 files/digest-glade-0.6.4 64
 RMD160 dd2589f596b75fd8714365408dd5396b9a2f7c9d files/digest-glade-0.6.4 64
 SHA256 a2c55164cf8ec4da16775f830a9c7e106ae2738b41cc42c9997876948f5326aa files/digest-glade-0.6.4 64
-MD5 056b8141d4551da90174585cd29732e4 files/digest-glade-2.10.1 66
-RMD160 420813e63f4f0863882be9784d01943dc35186cc files/digest-glade-2.10.1 66
-SHA256 f6fcf1160aa4b2b09e760150798e5e47af01bed95196caa5eb1586fc8663ad02 files/digest-glade-2.10.1 66
+MD5 3e66b4870812975c7c19af9bbca535c8 files/digest-glade-2.10.1 244
+RMD160 04118d87c492d1fa7b333a9a78b50bd71a35e8db files/digest-glade-2.10.1 244
+SHA256 6759d3e90c4fb9573538acd39efebe025c7bcb23a0ccacaebe781c9cd3791c16 files/digest-glade-2.10.1 244
 MD5 28458b243f4fec4f644a77d9084e2472 files/digest-glade-2.12.1 244
 RMD160 53fd05dd28a8036ef5eb56ed8780a29d445560db files/digest-glade-2.12.1 244
 SHA256 e066d26695b21334c1abff096d6f02fe26076bcf88933f6d226e9c04bfbb8825 files/digest-glade-2.12.1 244
diff --git a/dev-util/glade/files/digest-glade-2.10.1 b/dev-util/glade/files/digest-glade-2.10.1
index 7b7a5311326a..a6ab26b94898 100644
--- a/dev-util/glade/files/digest-glade-2.10.1
+++ b/dev-util/glade/files/digest-glade-2.10.1
@@ -1 +1,3 @@
 MD5 7a0b3f9b81b207b1e106d1cdcc90116c glade-2.10.1.tar.bz2 1697449
+RMD160 831abdfe4cb3c7ec7b3ef27cc52c0c81b08e65c9 glade-2.10.1.tar.bz2 1697449
+SHA256 371c3854fa6e32b4cd3719a970a8860d2bfc3f724e625b3d8df5d55d6cdd52c8 glade-2.10.1.tar.bz2 1697449
diff --git a/dev-util/glade/glade-3.0.0.ebuild b/dev-util/glade/glade-3.0.0.ebuild
index bfcde852cfc1..d5a4ea3d35c9 100644
--- a/dev-util/glade/glade-3.0.0.ebuild
+++ b/dev-util/glade/glade-3.0.0.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.0.0.ebuild,v 1.1 2006/08/17 20:29:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.0.0.ebuild,v 1.2 2006/08/18 19:29:33 compnerd Exp $
 
 inherit eutils gnome2
 
 DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade/gnome.org/"
+HOMEPAGE="http://glade.gnome.org/"
 SRC_URI="mirror://gnome/sources/glade3/3.0/glade3-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
+IUSE="doc gnome"
 
 RDEPEND=">=dev-libs/glib-2.8.0
 		 >=x11-libs/gtk+-2.8.0
 		 >=dev-libs/libxml2-2.4
-		 >=gnome-base/libgnomeui-2.0
-		 >=gnome-base/libbonoboui-2.0"
+		 gnome?	(
+					>=gnome-base/libgnomeui-2.0
+					>=gnome-base/libbonoboui-2.0
+				)"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
 		>=dev-util/intltool-0.29
@@ -25,8 +27,8 @@ DEPEND="${RDEPEND}
 		doc? ( >=dev-util/gtk-doc-1.4 )"
 
 S="${WORKDIR}/glade3-${PV}"
-DOCS="AUTHORS BUGS ChangeLog HACKING INSTALL INTERNALS MAINTAINERS NEWS README TODO"
+DOCS="AUTHORS BUGS ChangeLog HACKING INTERNALS MAINTAINERS NEWS README TODO"
 
 pkg_config() {
-	G2CONF="${G2CONF} --enable-gnome"
+	G2CONF="${G2CONF} $(use_enable gnome)"
 }