dev-util/gtk-doc: Don't install the gnome/yelp help files (bug #224519)

Package-Manager: portage-2.1.5.4
RepoMan-Options: --force

3 files changed, 91 insertions, 12 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index fdd23c06f13f..afff1ac846a4 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.96 2008/05/25 12:34:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.97 2008/06/06 14:57:39 remi Exp $
+
+*gtk-doc-1.10-r2 (06 Jun 2008)
+
+  06 Jun 2008; Rémi Cardona <remi@gentoo.org> +gtk-doc-1.10-r2.ebuild:
+  Don't install the gnome/yelp help files (bug #224519)
 
   25 May 2008; Markus Meier <maekke@gentoo.org> gtk-doc-1.10-r1.ebuild:
   amd64/x86 stable, bug #223297
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 06e0eff5fb73..419bcc6ea2fa 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 61gtk-doc-gentoo.el 283 RMD160 9adc999d70cd5da21b0f02de2ecabca831d9e5cc SHA1 b5857c1b6a11fda687aa6aebb12c34daca2efcc3 SHA256 211c75484f2a4651a1e65a00c066640c3bf782030cfff5872a7af51bafd027c8
 AUX gtk-doc-1.10-no-m4.patch 1238 RMD160 afebe8f0587973b0aad062ab753992e4e1440227 SHA1 b1bb61557339b6873dfb9060c0b286df94fe199d SHA256 3091e4ccd666597cbfe87da13b8fdc8460028be60f9e97174e8b7b21cfcff602
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
 DIST gtk-doc-1.10.tar.bz2 404379 RMD160 b7f7563ddec9ff140fc6fc6feea5b7f49cb1ff32 SHA1 861c977b011efd1bf91957d1a02fb792f39e5509 SHA256 5aeefd055c47d4e8b906e7f74b7769ebafbe3873d90cb9987b2ec503a9b558eb
 DIST gtk-doc-1.8.tar.bz2 186203 RMD160 fbb3e36e3cdf9904439262b2bafab86017691984 SHA1 cb47355347fd92025f348ae63b7f688225aaaabe SHA256 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3
 EBUILD gtk-doc-1.10-r1.ebuild 1929 RMD160 0b36b3ebe4ed44411e0044b79040e720e2de5281 SHA1 08806081fbe5c621b566cb1b753617c4c08e3fa8 SHA256 0565cddf4c77d09616e13ed7ecca60e78ecdaee7cf9449fc83d4a0612e3b5214
+EBUILD gtk-doc-1.10-r2.ebuild 2036 RMD160 636dcc8a19ff4f400bb19853161593b1b86eb658 SHA1 38a49a395ab556c3e7a511ea83791594aa57eed8 SHA256 8bafbc50be5a93a812c5c1272a11089e8bb220bc665d2908155013eefd178ac6
 EBUILD gtk-doc-1.8-r2.ebuild 1705 RMD160 09d679b66801021a96d942210fcd6a09ca4cb677 SHA1 d004bfa8ce1c6eaa1a63026c5b648f140ee940f6 SHA256 6c9a22a180e145e0189bc4a1addf0614d9c32ffe42fef539c70edc65cfd336fb
-MISC ChangeLog 13350 RMD160 a629e064ab9bf0b977fec1822f2b73af4853c147 SHA1 f9030acf585787ec5fd8097908994b8919e623b9 SHA256 b146513a544d2eea60ffbe7e80fdb4f4c3787e3a4c44455aa66ffe74d94e6e1c
+MISC ChangeLog 13509 RMD160 69679af31acbe2186cd7122b620ddaad5ee5c58c SHA1 321e73f2ee636bc1d64ef6ddd1519ec08f76742a SHA256 d02cfb830f7502cc7c74e15a96115f7204f6133009c552b1955f8ec83f979699
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg5XR0ACgkQkKaRLQcq0GIEPACgqeMKeLY803kbTn7doUA+HXTO
-D48AoLO1qUNtBNFaN2eeeoCZcaQB5UZB
-=I4CT
------END PGP SIGNATURE-----
diff --git a/dev-util/gtk-doc/gtk-doc-1.10-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.10-r2.ebuild
new file mode 100644
index 000000000000..4f755c5e2e70
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.10-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.10-r2.ebuild,v 1.1 2008/06/06 14:57:39 remi Exp $
+
+inherit eutils elisp-common gnome2
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="doc emacs"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )"
+
+DEPEND="${RDEPEND}
+	=dev-util/gtk-doc-am-${PV}*
+	>=dev-util/pkgconfig-0.19
+	>=app-text/scrollkeeper-0.3.5"
+
+SITEFILE=61${PN}-gentoo.el
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+# Revisit this in next version. Might be related to upstream bug 521784 and/or 485806
+RESTRICT="test"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	# Don't install gtk-doc.m4; it's in gtk-doc-am now
+	epatch "${FILESDIR}"/${PN}-1.10-no-m4.patch
+
+	# Don't install the gnome/yelp help files (bug #224519)
+	sed -e "s/SUBDIRS = manual//" -i help/Makefile.in
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		elog "gtk-doc does no longer define global key bindings for Emacs."
+		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
+		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}