Add missing docbook-dtd-4.1.2 dependency, bug #309707. Clean up old revision.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 20 insertions, 45 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 53814af5625b..b41a46380502 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.127 2010/03/14 17:42:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.128 2010/04/03 11:17:21 eva Exp $
+
+  03 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> -glade-3.4.5.ebuild,
+  glade-3.6.7.ebuild:
+  Add missing docbook-dtd-4.1.2 dependency, bug #309707. Clean up old
+  revision.
 
   14 Mar 2010; Raúl Porcel <armin76@gentoo.org> glade-3.6.7.ebuild:
   arm/ia64/sh/sparc stable wrt #298204
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 8d6b44725a90..f6842311a1cd 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST glade-2.12.2.tar.bz2 1785723 RMD160 6035749c249492279794d508d3558a8aac17b6f0 SHA1 a43d89b147296244ba4b2efc67e8772d5155afff SHA256 50712d1e5cb369ee1399e9c78ac410e3e69c7582ac9bf1e11d27a7348d3d0a58
-DIST glade3-3.4.5.tar.bz2 1777173 RMD160 3fa7df673d1ca2106f1327aebc8c714eafa42dab SHA1 6f6e144a07edd0446f031bc40abcde8e9437c7f6 SHA256 4e83ee1ce3832232f3dfcab9efaf4fa1f7f026d8c63051c68a82d76bbae39c77
 DIST glade3-3.6.7.tar.bz2 2244221 RMD160 ab8487a8914b31ba2cb22bf0261b6ad39b0d1629 SHA1 7621d5ae486ed42c35bb1d147b5693428481e733 SHA256 117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81
 EBUILD glade-2.12.2-r1.ebuild 887 RMD160 35c074d5652548b90d845ac19e2fe4949c634d45 SHA1 efdfd4ffe525b1e0a971e0c555a5889e0996af16 SHA256 6adce18083c0cb462b0d4041ed30bc191524b95b47a2551c8c8825edc7831188
-EBUILD glade-3.4.5.ebuild 1074 RMD160 658829251c286bea5f0fddd6eaec58283c9e2d27 SHA1 204108b348d89e654d5d82cc81dba2e96c8a9bd9 SHA256 bb44614714ca7b0ccbe62f6a0c6b41a7510faf65a86d9f1c7288002df2d4cf15
-EBUILD glade-3.6.7.ebuild 1301 RMD160 1454233c4694ea7ed3c6710461ebb7ae48a4aa82 SHA1 0976cd986a971698dffcd321753fb03727703c99 SHA256 12b888557ec41e4b6315d3ccc713cb0a81f6572594dfc9c319c36e4b740b8730
-MISC ChangeLog 15975 RMD160 d1bb7b51a9c039bb92cc4fb384c03e647b722109 SHA1 ca6c490bcdfe83d5939551f0411f6ce334ebba09 SHA256 2dd7497ec79f33606373f7b73100cc994502e1350472cfa2711768c67d204720
+EBUILD glade-3.6.7.ebuild 1329 RMD160 afc060eea36453845f66996d6b3366ea6177c463 SHA1 cf9f3c3c68f76cc47691c4d94fb59d42f8a191a8 SHA256 d2113a92c75df8c0d649b30c9c9337c717803bc32457310da92b478c375e5368
+MISC ChangeLog 16151 RMD160 dc53144d060954d11bbc8a2aec96e97a5d401482 SHA1 2153352425359aa347a470af2979d3e1674ba80d SHA256 5d43e615d96364416721e0af6b3d53c9593a0640651f4fc2f54c4c41868b64fd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku3I8cACgkQ1fmVwcYIWAbJVwCg27vbU+CKBx5xdYd94LYH8nTs
+3WMAoO2lgCqYnsNqnTZUzO0U73nXzRyR
+=3KAK
+-----END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-3.4.5.ebuild b/dev-util/glade/glade-3.4.5.ebuild
deleted file mode 100644
index 8b4ebe45e481..000000000000
--- a/dev-util/glade/glade-3.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.5.ebuild,v 1.11 2009/10/04 17:43:13 armin76 Exp $
-
-inherit eutils gnome2
-
-MY_PN="glade3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-libs/glib-2.8.0
-		 >=x11-libs/gtk+-2.12.0
-		 >=dev-libs/libxml2-2.4
-		 gnome?	(
-					>=gnome-base/libgnomeui-2.0
-					>=gnome-base/libbonoboui-2.0
-				)"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		  app-text/scrollkeeper
-		  app-text/gnome-doc-utils
-		doc? ( >=dev-util/gtk-doc-1.4 )"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="AUTHORS BUGS ChangeLog HACKING INTERNALS MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable gnome) --disable-scrollkeeper"
-}
diff --git a/dev-util/glade/glade-3.6.7.ebuild b/dev-util/glade/glade-3.6.7.ebuild
index 9a7c20904839..7084dfac1608 100644
--- a/dev-util/glade/glade-3.6.7.ebuild
+++ b/dev-util/glade/glade-3.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.6.7.ebuild,v 1.8 2010/03/14 17:42:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.6.7.ebuild,v 1.9 2010/04/03 11:17:21 eva Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.9
+	app-text/docbook-xml-dtd:4.1.2
 	doc? ( >=dev-util/gtk-doc-1.9 )
 "