From 2435b057910b3e4c5f5d32e55d2c46dbc0ab7120 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Thu, 14 Dec 2006 03:31:44 +0000 Subject: [PATCH] Added dependencies to necessary versions of docbook-{sgml,xml}-dtd (bug #157978) and other doc-related fixes. Pruning old ebuilds. Package-Manager: portage-2.1.2_rc3 --- gnome-extra/gnome-power-manager/ChangeLog | 12 ++- .../gnome-power-manager-2.16.2.ebuild | 83 ++++++++++++------- 2 files changed, 64 insertions(+), 31 deletions(-) diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog index 37beba2b6b7f..c90aa8040eae 100644 --- a/gnome-extra/gnome-power-manager/ChangeLog +++ b/gnome-extra/gnome-power-manager/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/gnome-power-manager # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.27 2006/12/12 16:45:14 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.28 2006/12/14 03:31:44 leonardop Exp $ + + 14 Dec 2006; Leonardo Boshell + gnome-power-manager-2.16.2.ebuild: + Added dependencies to necessary versions of docbook-sgml-dtd and + docbook-xml-dtd (bug #157978). Added hacks in src_unpack() to make the + dependency on docbook-sgml-dtd actually work in relation to the 'doc' USE + flag and install all html files from the 'docs' directory if the flag is + enabled. Moved gnome-doc-utils dependency out of the doc? block and added + version numbers to some dependencies. Sanitise spacing. Removed eutils + from inherit call. 12 Dec 2006; Chris Gianelloni gnome-power-manager-2.16.2.ebuild: diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild index d92c6e7703ed..0b6c4e93e41d 100644 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild +++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild,v 1.6 2006/12/12 16:45:14 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild,v 1.7 2006/12/14 03:31:44 leonardop Exp $ GNOME_TARBALL_SUFFIX="gz" -inherit gnome2 eutils +inherit gnome2 DESCRIPTION="Gnome Power Manager" HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/" @@ -15,39 +15,62 @@ KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86" IUSE="doc libnotify" RDEPEND=">=dev-libs/glib-2.6.0 - >=x11-libs/gtk+-2.10.0 - >=gnome-base/libgnome-2.14.0 - >=gnome-base/libgnomeui-2.10.0 - >=sys-apps/hal-0.5.7-r1 - >=gnome-base/libglade-2.5.0 - >=x11-libs/libwnck-2.10.0 - >=x11-libs/cairo-1.0.0 - >=gnome-base/gconf-2 - x11-libs/libX11 - x11-libs/libXext - || ( - >=dev-libs/dbus-glib-0.71 - ( =sys-apps/dbus-0.61 ) - ) - libnotify? ( - >=x11-libs/libnotify-0.4.3 - >=x11-misc/notification-daemon-0.2.1 - )" + >=x11-libs/gtk+-2.10.0 + >=gnome-base/libgnome-2.14.0 + >=gnome-base/libgnomeui-2.10.0 + >=sys-apps/hal-0.5.7-r1 + >=gnome-base/libglade-2.5.0 + >=x11-libs/libwnck-2.10.0 + >=x11-libs/cairo-1.0.0 + >=gnome-base/gconf-2 + || ( + >=dev-libs/dbus-glib-0.71 + ~sys-apps/dbus-0.62 ) + libnotify? ( + >=x11-libs/libnotify-0.4.3 + >=x11-misc/notification-daemon-0.2.1 ) + + x11-libs/libX11 + x11-libs/libXext" + +# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages +# (files under ${S}/man). +# +# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs. DEPEND="${RDEPEND} - sys-devel/gettext - dev-util/pkgconfig - >=dev-util/intltool-0.35 - doc? ( - app-text/xmlto - app-text/gnome-doc-utils - app-text/docbook-sgml-utils - )" + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + >=app-text/gnome-doc-utils-0.3.2 + ~app-text/docbook-xml-dtd-4.3 + doc? ( + app-text/docbook-sgml-utils + ~app-text/docbook-sgml-dtd-4.1 + app-text/xmlto + ~app-text/docbook-xml-dtd-4.4 + ~app-text/docbook-xml-dtd-4.1.2 )" DOCS="AUTHORS ChangeLog NEWS README TODO" + pkg_setup() { - G2CONF="${G2CONF} $(use_enable doc docbook-docs) $(use_enable libnotify) \ - --enable-actions-menu --with-dpms-ext" + G2CONF="$(use_enable doc docbook-docs) \ + $(use_enable libnotify) \ + --enable-actions-menu --with-dpms-ext" +} + +src_unpack() { + gnome2_src_unpack + + if use doc; then + # Actually install all html files, not just the index + sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \ + ${S}/docs/Makefile.in + else + # Remove the docbook2man rules here since it's not handled by a proper + # parameter in configure.in. + sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' ${S}/man/Makefile.in + fi } pkg_postinst() { -- 2.26.2