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

Package-Manager: portage-2.0.53_rc5

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index afd1ff8b384b1a56229d520bd0ab474684f09721..fb56ccdc9b56e4691d7e61b7500f0283c453a5f4 100644 (file)
--- 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/Manifest b/gnome-base/gnome-applets/Manifest
index d485555ddbf6a904e05d51d7e653b2a142f32fc6..9dd10672ad4d0168f758fc33aa78a8cd85652b1f 100644 (file)
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,9 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 57883177d1621ea0419a99b69d83c1fd ChangeLog 18866
+MD5 204681ebb0ca0bb6a47a92df5c186fdb ChangeLog 19062
 MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
-MD5 90c7825724b0c78966d8bbf5f401e9b8 files/digest-gnome-applets-2.10.0 74
 MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
 MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1 74
 MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1-r1 74
@@ -13,17 +9,9 @@ MD5 ebcb8c6d8a9406b441de3e591d350960 files/gnome-applets-2.10.1-fbsd.patch 1494
 MD5 f7ba655004c33f5a85ce78bba4b818f4 files/gnome-applets-2.12.1-hal-switch.patch 772
 MD5 ed5d90f4b6499259a6bb64d87171272c files/gnome-applets-2.12.1-volume-mute.patch 2310
 MD5 859be0a7d42bbee51904ab93885199b9 gnome-applets-1.4.0.5.ebuild 1037
-MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
 MD5 f0f21c699a4e71e179115f815c3c80fa gnome-applets-2.10.1.ebuild 1741
 MD5 62bf724004b6320fab60e20a40395f15 gnome-applets-2.12.1-r1.ebuild 1970
-MD5 296d0bba348dd4fb6fff5b040a36ed8d gnome-applets-2.12.1-r2.ebuild 2045
+MD5 a6feeb26d8f6b73a13a39606f5af2b98 gnome-applets-2.12.1-r2.ebuild 2109
 MD5 6624f3e55d16f759d7cf4079187427ec gnome-applets-2.12.1.ebuild 1818
 MD5 b5c7329982e8397e6f95455994ecec06 gnome-applets-2.6.2.ebuild 1570
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUvzcomPajV0RnrERAjmNAJ0UxeN291uwr99/Tjw2iawTkPXJZQCfRa4e
-9XA0KonHM0shu8OC6gQxlq4=
-=oQgi
------END PGP SIGNATURE-----

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 (file)
index b21df9b..0000000
--- 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 (file)
index 518b457..0000000
--- 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 9a1e9fdf4ef7261c9ef36c98b1023c5bb4c85a26..e832fbe03e699d8cdd0e43fc0b4a0b386c05aee5 100644 (file)
--- 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() {