fixing documentation generation (bug #181870)

Package-Manager: portage-2.1.2.9

3 files changed, 26 insertions, 21 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index d0a9e5f20188..cb8c11814140 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.186 2007/06/11 18:31:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.187 2007/06/17 11:26:43 eva Exp $
+
+  17 Jun 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gedit-2.18.1-r1.ebuild:
+  fixing python-module optional documentation generation (bug #181870)
 
 *gedit-2.18.1-r1 (11 Jun 2007)
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 45d4d22b874e..94e75945e5a0 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gedit-2.16.2-no_python_module_docs.patch 730 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 SHA1 70f11ceb222c58a85f5ce4d08474dbc70b3abfe5 SHA256 7cff8d687f0def86ccabd6bc584e9a57de23e48e9b8fb7d5f241f60ac7c3b38c
 MD5 c9080dd00ae9152286919d162aeddc26 files/gedit-2.16.2-no_python_module_docs.patch 730
 RMD160 81afcad6cca9d0be7311fca0da788d93368beef4 files/gedit-2.16.2-no_python_module_docs.patch 730
@@ -26,18 +23,18 @@ EBUILD gedit-2.18.0-r1.ebuild 1243 RMD160 c3ca4fe89440d9f6677e257b2dd6ae88d0ec09
 MD5 825b13bc60638d2604cd156c678ba1c8 gedit-2.18.0-r1.ebuild 1243
 RMD160 c3ca4fe89440d9f6677e257b2dd6ae88d0ec096b gedit-2.18.0-r1.ebuild 1243
 SHA256 018a0b4a51f6b62e25f3bc3604ef65e69641283a6bf1e264a52c869debd3c90a gedit-2.18.0-r1.ebuild 1243
-EBUILD gedit-2.18.1-r1.ebuild 1253 RMD160 c72f1c02e2d54dbe7bd98f9bf4deb9473d2ebaab SHA1 657dd395007e2f4dfee29cab24b105317de8bcaa SHA256 ed743e40fd40b681a328a196f0c86a5e5627021db3ea8ba865515971a6e9319b
-MD5 64104b9ecff79d0ef70e5af311ee274f gedit-2.18.1-r1.ebuild 1253
-RMD160 c72f1c02e2d54dbe7bd98f9bf4deb9473d2ebaab gedit-2.18.1-r1.ebuild 1253
-SHA256 ed743e40fd40b681a328a196f0c86a5e5627021db3ea8ba865515971a6e9319b gedit-2.18.1-r1.ebuild 1253
+EBUILD gedit-2.18.1-r1.ebuild 1521 RMD160 c5a285ec871ba9304b30f1007cc53f30bdf9424c SHA1 68aec6f6c2d4d2ac3c97aecbd900692c65e689bc SHA256 3d2cddc6b64d2b8f4cb2a2a3ea6b01e84ab278c72218a25bf76837421e2082d8
+MD5 9921a7551b29e44931b26cf30467e156 gedit-2.18.1-r1.ebuild 1521
+RMD160 c5a285ec871ba9304b30f1007cc53f30bdf9424c gedit-2.18.1-r1.ebuild 1521
+SHA256 3d2cddc6b64d2b8f4cb2a2a3ea6b01e84ab278c72218a25bf76837421e2082d8 gedit-2.18.1-r1.ebuild 1521
 EBUILD gedit-2.18.1.ebuild 1229 RMD160 b9f568fdfdbb224d5a261e7b202a3c2f99756d51 SHA1 b5246e6875de4f9dde9fbfae9da7f24c25b1c2bd SHA256 291e532613986f4cf519a52e416b426a9a0bdff31c0e3b94bbe1c52c663d4760
 MD5 275c34a03f76a59dbfb15a97ecdaf627 gedit-2.18.1.ebuild 1229
 RMD160 b9f568fdfdbb224d5a261e7b202a3c2f99756d51 gedit-2.18.1.ebuild 1229
 SHA256 291e532613986f4cf519a52e416b426a9a0bdff31c0e3b94bbe1c52c663d4760 gedit-2.18.1.ebuild 1229
-MISC ChangeLog 21828 RMD160 3610cce740c05f87973160d0b9f87c2479eb661a SHA1 580eeb9db16d42fcfa79ee7cf85db50dff4c3a6b SHA256 01f0a9593f5a812f99ec7dbb5e8af3b4e6e405b768d69bd5b60bd90b5333a848
-MD5 6b29c2f6a0f80fb21bddd28862f1d56a ChangeLog 21828
-RMD160 3610cce740c05f87973160d0b9f87c2479eb661a ChangeLog 21828
-SHA256 01f0a9593f5a812f99ec7dbb5e8af3b4e6e405b768d69bd5b60bd90b5333a848 ChangeLog 21828
+MISC ChangeLog 21979 RMD160 f9b99e7c599eaeaf087a15dcf61b2267df3cc2e7 SHA1 77fcdbfe2843762ad298b5632c8852fed6f93bb7 SHA256 43f3d216f0596c068e8e927bb7b364f868394c52846f33697f9a445dd1bec4f2
+MD5 e0071ccbac24ff6bf565a00fa0d9ef73 ChangeLog 21979
+RMD160 f9b99e7c599eaeaf087a15dcf61b2267df3cc2e7 ChangeLog 21979
+SHA256 43f3d216f0596c068e8e927bb7b364f868394c52846f33697f9a445dd1bec4f2 ChangeLog 21979
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -60,10 +57,3 @@ SHA256 4c5f2d5ba4fae2d024af7a02e67996a2b3adf0f2637d10ca51af8671372b2af6 files/di
 MD5 152f6002383852fd57de1986907e45bd files/digest-gedit-2.18.1-r1 244
 RMD160 56d095f21bd03e85ce96da449e9322629924ef5b files/digest-gedit-2.18.1-r1 244
 SHA256 4c5f2d5ba4fae2d024af7a02e67996a2b3adf0f2637d10ca51af8671372b2af6 files/digest-gedit-2.18.1-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGbZUjomPajV0RnrERArmnAJ941honwUlYSD22vK7Sqund59OEZgCfddhD
-g4Zsjhr9425RbDGNWilQBFk=
-=1ERv
------END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-2.18.1-r1.ebuild b/app-editors/gedit/gedit-2.18.1-r1.ebuild
index bd2660120298..2f406fc630bf 100644
--- a/app-editors/gedit/gedit-2.18.1-r1.ebuild
+++ b/app-editors/gedit/gedit-2.18.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.18.1-r1.ebuild,v 1.1 2007/06/11 18:31:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.18.1-r1.ebuild,v 1.2 2007/06/17 11:26:43 eva Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -47,3 +47,14 @@ fi
 pkg_setup() {
 	G2CONF="$(use_enable python) $(use_enable spell)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove symbols that are not meant to be part of the docs, and
+	# break compilation if USE="doc -python" (bug #158638).
+	if use !python && use doc; then
+		epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch
+	fi
+}
+