Adding docbook-xml-dtd-4.3 dependency (bug #109326)

(Portage version: 2.0.53_rc5)

4 files changed, 14 insertions, 76 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index afd1ff8b384b..fb56ccdc9b56 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.138 2005/10/17 01:22:20 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.139 2005/10/20 11:07:43 leonardop Exp $
+
+  20 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-applets-2.12.1-r2.ebuild:
+  Adding docbook-xml-dtd-4.3 dependency, since charpick's documentation
+  requires it (bug #109326).
 
 *gnome-applets-2.12.1-r2 (17 Oct 2005)
 
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.10.0 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.10.0
deleted file mode 100644
index b21df9b2f1cf..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c230df43a21a0d788197b5b0f3e688f1 gnome-applets-2.10.0.tar.bz2 5662438
diff --git a/gnome-base/gnome-applets/gnome-applets-2.10.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.10.0.ebuild
deleted file mode 100644
index 518b45704a97..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.10.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.10.0.ebuild,v 1.16 2005/08/22 04:17:16 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ~ppc64 sparc x86"
-IUSE="doc apm acpi ipv6 gstreamer"
-
-RDEPEND=">=x11-libs/gtk+-2.5
-	>=dev-libs/glib-2.5
-	>=gnome-base/libgnome-2.8
-	>=gnome-base/libgnomeui-2.8
-	>=gnome-base/gnome-vfs-2.8
-	>=gnome-base/gconf-2.8
-	>=gnome-base/gnome-panel-2.9.4
-	>=gnome-base/libgtop-2.9.4
-	>=gnome-base/libglade-2.4
-	>=gnome-base/gail-1.3
-	>=x11-libs/libxklavier-1.13
-	>=x11-libs/libwnck-2.9.3
-	>=app-admin/system-tools-backends-1.1.3
-	dev-libs/libxslt
-	apm? ( sys-apps/apmd )
-	acpi? ( sys-power/acpid )
-	gstreamer? ( >=media-libs/gstreamer-0.8.2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable gstreamer) --enable-flags"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	for APPLET in accessx-status battstat \
-				  charpick cpufreq drivemount \
-				  geyes gkb-new gswitchit \
-				  gtik gweather \
-				  mini-commander mixer modemlights multiload \
-				  null_applet stickynotes trashapplet; do
-			docinto ${APPLET}
-			dodoc ${APPLET}/{ChangeLog,AUTHORS,NEWS,TODO} ${APPLET}/README*
-	done
-
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild
index 9a1e9fdf4ef7..e832fbe03e69 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild,v 1.1 2005/10/17 01:22:20 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.12.1-r2.ebuild,v 1.2 2005/10/20 11:07:43 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
+DESCRIPTION="Applets for the GNOME Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.28
 	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.3"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 USE_DESTDIR="1"
@@ -58,15 +59,15 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
 	# add hal configure switch
 	epatch ${FILESDIR}/${P}-hal-switch.patch
 	# Fix volume-applet sometimes mutes
 	epatch ${FILESDIR}/${P}-volume-mute.patch
 
-	autoconf
+	autoconf || die "autoconf failed"
 }
 
 src_install() {