Added patch to fix generation of SGML manuals (bug #133825)

(Portage version: 2.1_rc3-r1)
 (Unsigned Manifest commit)

3 files changed, 22 insertions, 83 deletions

diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 139d3edeb631..8408dec4f0d8 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,27 +1,31 @@
-AUX 60gtk-doc-gentoo.el 101 RMD160 4f6d96f748a26c20ec88ac98874141b14a61d679 SHA1 622966b8d5d1714a4e0b9444972ac7f58a213749 SHA256 e5a9c6783fe09d369367cf40c1568a27a933181f8fbe5b7511b309c87602870a size 101
+AUX 60gtk-doc-gentoo.el 101 RMD160 4f6d96f748a26c20ec88ac98874141b14a61d679 SHA1 622966b8d5d1714a4e0b9444972ac7f58a213749 SHA256 e5a9c6783fe09d369367cf40c1568a27a933181f8fbe5b7511b309c87602870a
 MD5 d1c8289d32d8c1c5eced0cc472dec0d8 files/60gtk-doc-gentoo.el 101
 RMD160 4f6d96f748a26c20ec88ac98874141b14a61d679 files/60gtk-doc-gentoo.el 101
 SHA256 e5a9c6783fe09d369367cf40c1568a27a933181f8fbe5b7511b309c87602870a files/60gtk-doc-gentoo.el 101
-DIST gtk-doc-1.4.tar.bz2 148758 RMD160 3debf766339504a25e65ae111f37ce32a73c424b SHA256 9b4b69a4cfeecda77b4480b123495f13b2e94b5dd259043b788fcfef20e2d1ad size 148758
-DIST gtk-doc-1.5.tar.bz2 174409 RMD160 95592dbe3f4bb71a926c7d0538f752c157b2362f SHA256 7d53d2fdcba897bb9d60601952dcae00a39b875e92bc150f42c8aa90cd3b4242 size 174409
-DIST gtk-doc-1.6.tar.bz2 177476 RMD160 f1bb0d5396173ef00d18ee68d7c013a7734e3454 SHA256 c7f2051ddb46881122cf15f11395f31b94fe3c1690c8dd8148698d069555de08 size 177476
-EBUILD gtk-doc-1.4-r1.ebuild 1287 RMD160 f32a7c6b116ad7cb8b55194fecd276d444f27a03 SHA1 dd7cde01f1b1b3508d68404194c2d8df359bab57 SHA256 11d7f13eaa0bb4bdc0e7a4a682f64d9895be048e3fee4df26bad6a875d134d33 size 1287
+AUX gtk-doc-1.6-no_dupe_ids.patch 13787 RMD160 e2fcd6e6e309181482c52ad9566c35a61299939f SHA1 8dee35af47524f2e9c6897e1a00b6c98b69f3a06 SHA256 8e40e546c791061bce6c6493e03ecc3745fa4786b5a146bc3c276531fb072e84
+MD5 c69039539a6dc5d21f0844f88346766f files/gtk-doc-1.6-no_dupe_ids.patch 13787
+RMD160 e2fcd6e6e309181482c52ad9566c35a61299939f files/gtk-doc-1.6-no_dupe_ids.patch 13787
+SHA256 8e40e546c791061bce6c6493e03ecc3745fa4786b5a146bc3c276531fb072e84 files/gtk-doc-1.6-no_dupe_ids.patch 13787
+DIST gtk-doc-1.4.tar.bz2 148758 RMD160 3debf766339504a25e65ae111f37ce32a73c424b SHA256 9b4b69a4cfeecda77b4480b123495f13b2e94b5dd259043b788fcfef20e2d1ad
+DIST gtk-doc-1.5.tar.bz2 174409 RMD160 95592dbe3f4bb71a926c7d0538f752c157b2362f SHA256 7d53d2fdcba897bb9d60601952dcae00a39b875e92bc150f42c8aa90cd3b4242
+DIST gtk-doc-1.6.tar.bz2 177476 RMD160 f1bb0d5396173ef00d18ee68d7c013a7734e3454 SHA1 f42a5517eb2317b3bf0f3d77caf40e5dad78bdf8 SHA256 c7f2051ddb46881122cf15f11395f31b94fe3c1690c8dd8148698d069555de08
+EBUILD gtk-doc-1.4-r1.ebuild 1287 RMD160 f32a7c6b116ad7cb8b55194fecd276d444f27a03 SHA1 dd7cde01f1b1b3508d68404194c2d8df359bab57 SHA256 11d7f13eaa0bb4bdc0e7a4a682f64d9895be048e3fee4df26bad6a875d134d33
 MD5 01e8dfecb33b74486d65a2a6b0dc63e5 gtk-doc-1.4-r1.ebuild 1287
 RMD160 f32a7c6b116ad7cb8b55194fecd276d444f27a03 gtk-doc-1.4-r1.ebuild 1287
 SHA256 11d7f13eaa0bb4bdc0e7a4a682f64d9895be048e3fee4df26bad6a875d134d33 gtk-doc-1.4-r1.ebuild 1287
-EBUILD gtk-doc-1.5.ebuild 1241 RMD160 5b47fd427ec1916a932b873c725b3fade8677721 SHA1 9d216808d45583babf5815ec493e26371fa1cd7e SHA256 5afe237707894755b071f5ebaeccff6c6409228a1a3cc64ecf3ebb98a2e93914 size 1241
+EBUILD gtk-doc-1.5.ebuild 1241 RMD160 5b47fd427ec1916a932b873c725b3fade8677721 SHA1 9d216808d45583babf5815ec493e26371fa1cd7e SHA256 5afe237707894755b071f5ebaeccff6c6409228a1a3cc64ecf3ebb98a2e93914
 MD5 d14eeb4723482480ffa14141e9cea716 gtk-doc-1.5.ebuild 1241
 RMD160 5b47fd427ec1916a932b873c725b3fade8677721 gtk-doc-1.5.ebuild 1241
 SHA256 5afe237707894755b071f5ebaeccff6c6409228a1a3cc64ecf3ebb98a2e93914 gtk-doc-1.5.ebuild 1241
-EBUILD gtk-doc-1.6.ebuild 1336 RMD160 a8f99cdc0bdf81ba9b36e6d0a556e6ac57e93fc1 SHA1 5f90b3257b0c9e7360b939bdf71c4bebf18d8382 SHA256 89b27a4f2d08d41dac946735e29ddc511844839946dfd6c8ae6efa71a8293968 size 1336
-MD5 8eaf1e584f7ee3261ec637fb3d5f49a7 gtk-doc-1.6.ebuild 1336
-RMD160 a8f99cdc0bdf81ba9b36e6d0a556e6ac57e93fc1 gtk-doc-1.6.ebuild 1336
-SHA256 89b27a4f2d08d41dac946735e29ddc511844839946dfd6c8ae6efa71a8293968 gtk-doc-1.6.ebuild 1336
-MISC ChangeLog 7648 RMD160 a1d697b0e1fbd6205ec88c8f30b2e9ebe7456cff SHA1 da75a563442848dd4ddf741a43a58cd5f588400a SHA256 8a7fbba08039aa55d85989f049196e6255eee4c9ae50150f31a4faf251616b6a size 7648
-MD5 b319a0154a98b3c52209571766da7440 ChangeLog 7648
-RMD160 a1d697b0e1fbd6205ec88c8f30b2e9ebe7456cff ChangeLog 7648
-SHA256 8a7fbba08039aa55d85989f049196e6255eee4c9ae50150f31a4faf251616b6a ChangeLog 7648
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
+EBUILD gtk-doc-1.6-r1.ebuild 1531 RMD160 665aee9b4cb0be560f46d8fc672005a75b84bc9c SHA1 008d26bd3ba43bf115c0e6f87775f22766018d7f SHA256 d7d5a7768ae7ac8e99a144c0c5428adc3cea07b3dab2ff7f60868d904f0a0144
+MD5 ae612f6f9850969b8fe22a5e79ae14c9 gtk-doc-1.6-r1.ebuild 1531
+RMD160 665aee9b4cb0be560f46d8fc672005a75b84bc9c gtk-doc-1.6-r1.ebuild 1531
+SHA256 d7d5a7768ae7ac8e99a144c0c5428adc3cea07b3dab2ff7f60868d904f0a0144 gtk-doc-1.6-r1.ebuild 1531
+MISC ChangeLog 7862 RMD160 2f3b81afad27f77fb939a0825932dc2a90484617 SHA1 30ccb293c9eeea363fcde4d3254f3e2dbacdd9b8 SHA256 120e209e1e260b241baa1316fd62590abeebaccecf832f185a89589e11095bc0
+MD5 bc318e0f7397ec0114d4dfe4ee6dbc02 ChangeLog 7862
+RMD160 2f3b81afad27f77fb939a0825932dc2a90484617 ChangeLog 7862
+SHA256 120e209e1e260b241baa1316fd62590abeebaccecf832f185a89589e11095bc0 ChangeLog 7862
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
@@ -31,6 +35,6 @@ SHA256 443b599ac81d728ab5f1a2858e052c4cb01aea0d12c2d30824a525a1417bface files/di
 MD5 5ac76b0f4bac4d83cabeea3e9e0c5d85 files/digest-gtk-doc-1.5 238
 RMD160 bd43ddbcc1f4e19cc48a7fdc9401d83cb1f5acee files/digest-gtk-doc-1.5 238
 SHA256 bfc3d02e084858ee0bf76bfdfa30051164116cdb540205aec9f97ae70afd60e3 files/digest-gtk-doc-1.5 238
-MD5 f41aab59b6bccde997b69af32bd925e1 files/digest-gtk-doc-1.6 238
-RMD160 c266a9496eee4f685c9fcecb6cb541c78762d5cd files/digest-gtk-doc-1.6 238
-SHA256 fb560f2074c3a8314bb975e084ace5cc09c7a90c998bcc993a872f316efa45d1 files/digest-gtk-doc-1.6 238
+MD5 f41aab59b6bccde997b69af32bd925e1 files/digest-gtk-doc-1.6-r1 238
+RMD160 c266a9496eee4f685c9fcecb6cb541c78762d5cd files/digest-gtk-doc-1.6-r1 238
+SHA256 fb560f2074c3a8314bb975e084ace5cc09c7a90c998bcc993a872f316efa45d1 files/digest-gtk-doc-1.6-r1 238
diff --git a/dev-util/gtk-doc/files/digest-gtk-doc-1.6 b/dev-util/gtk-doc/files/digest-gtk-doc-1.6
deleted file mode 100644
index 2922f681e446..000000000000
--- a/dev-util/gtk-doc/files/digest-gtk-doc-1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 09c7a89efff2e0bbaba02a12bff58dfd gtk-doc-1.6.tar.bz2 177476
-RMD160 f1bb0d5396173ef00d18ee68d7c013a7734e3454 gtk-doc-1.6.tar.bz2 177476
-SHA256 c7f2051ddb46881122cf15f11395f31b94fe3c1690c8dd8148698d069555de08 gtk-doc-1.6.tar.bz2 177476
diff --git a/dev-util/gtk-doc/gtk-doc-1.6.ebuild b/dev-util/gtk-doc/gtk-doc-1.6.ebuild
deleted file mode 100644
index bfe0c37ac4ae..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 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.6.ebuild,v 1.1 2006/05/23 01:17:30 leonardop Exp $
-
-inherit 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 ~x86"
-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/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.3.5"
-
-SITEFILE="60gtk-doc-gentoo.el"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-
-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() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}