Remove gtk-doc hack in favor of gtk-doc-am dep

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 37 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 93afa5a9abb1..6b2a24f5f014 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.136 2008/03/27 23:10:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.137 2008/04/02 15:02:25 dang Exp $
+
+  02 Apr 2008; Daniel Gryniewicz <dang@gentoo.org>
+  -files/evince-2.22.0-gtk-doc-die-die-die.patch, evince-2.22.0.ebuild:
+  Remove gtk-doc hack in favor of gtk-doc-am dep
 
 *evince-2.22.0 (27 Mar 2008)
 
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index ec3b6f67b5c8..4ebe40fddb07 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -3,19 +3,18 @@ Hash: SHA1
 
 AUX evince-0.6.1-dbus-switch.patch 974 RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 SHA1 246f5c18ba30de97922af003757283179134c7bf SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
-AUX evince-2.22.0-gtk-doc-die-die-die.patch 690 RMD160 f87a71134f563e5382dc0ca0d2699d97ba4bfa31 SHA1 44bfb772f727dd9b39883a92b52161d7860f73df SHA256 ee2b141ac41c37925430d6ba050100e7fad6060e9bc69c02fa0231c2eabb7bd6
 DIST evince-2.20.1.tar.bz2 1613601 RMD160 30e93bedf50ea968fea917f439bdd061203ba3d0 SHA1 785813845e30794c31a688507d1628067241d5d1 SHA256 9435c67974b59979b8d84224ed63128cd428fc9bb746f6b333c400619c7f182e
 DIST evince-2.20.2.tar.bz2 1614179 RMD160 25daf214a29a2ead7161574852fd89c5bb6a848b SHA1 9d8d847314d728e579009eae76f2a84e17c9c893 SHA256 c6e9f2d8a90f95bc235b21ffb5be0d183ce2bfaaea84a4eafdb2449a2349129c
 DIST evince-2.22.0.tar.bz2 1618429 RMD160 5f54c3e8f7a980f35af2d2480f2f56971ffd6c95 SHA1 7c9fcc1fde30e673f7f5c96502ddf4dad6635cf4 SHA256 293778da77d42d8474bb401dc1a50d8e7d67b40b84ddce5fd39f871fef06a7ca
 EBUILD evince-2.20.1.ebuild 1993 RMD160 bda83541d4245e77ad0413cf4d7197f36d3ff6a6 SHA1 3227d13b11f4b3f3d6b1066e9fa7d60c5bed048e SHA256 14aaeef9bd31348fd1f6bcd1363cbc0368967f6fbe35015e0443a727a1c35cc2
 EBUILD evince-2.20.2.ebuild 1976 RMD160 1a8ba56fbc551fa1385da14c9eb3a52e96601711 SHA1 14ff1e86dd85251b9d099cc3f8826e8cac928fee SHA256 fbb03826cf2f457e3c7b1007cfebb1e5d15f8c3479d50ff8c3cc2d57792991cb
-EBUILD evince-2.22.0.ebuild 2054 RMD160 533fabd7a5db97658060a546690d430e780a5cbc SHA1 461389fe5249583dcf42528a7aeb1cb40c00f00d SHA256 62c676f9d537a8bb5648c770445ee8c783462878643db3dc6f53e63d4e83a95d
-MISC ChangeLog 19101 RMD160 d57a50c874dfb968fc0e4791f48b2a2bcac63b9f SHA1 1c2b1275aa3cafe232c93729eede4a6f0ba2fd85 SHA256 b7f01bf9454361c21c9c644d0aa3fafd6ec53feb714fc7ccb6f81c201ab319dd
+EBUILD evince-2.22.0.ebuild 2003 RMD160 4bc3169b575d251aba0bb98a0ba54a160c340063 SHA1 acf9980c87b5e693847e24af94b466fc8d89b155 SHA256 907fe6496b3a136ca1d2603441a08801e6ae463278e678d4fa8849139d4acd01
+MISC ChangeLog 19275 RMD160 fd425f30950606d16f07e954c23625dd46bfe985 SHA1 cc58ed54fdd6c09ec09880522900e903664c2fe5 SHA256 4ff10bb5454bea54986693bf0d68df1ae8a4cc54adf85aa10c3334b953602cd1
 MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfsG3AACgkQ1fmVwcYIWAYpRwCg5qHwZcb4ksCAdOG9tnhOIMvx
-7RMAoOt+1RK71Tu0zo9XeKId0d72sr8t
-=37dO
+iD8DBQFH8586omPajV0RnrERAv46AJ9tk8wFlEu6AHqqX2F5aUOeZEdnIgCaAqTN
+tcZNVw3Si93lm85aHUHpuBE=
+=6miR
 -----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.22.0.ebuild b/app-text/evince/evince-2.22.0.ebuild
index 26c02db339ea..d1a61cd9e426 100644
--- a/app-text/evince/evince-2.22.0.ebuild
+++ b/app-text/evince/evince-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.0.ebuild,v 1.1 2008/03/27 23:10:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.0.ebuild,v 1.2 2008/04/02 15:02:25 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=sys-devel/automake-1.9
 	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -72,7 +73,5 @@ src_unpack() {
 	# Make dbus actually switchable
 	epatch "${FILESDIR}"/${PN}-0.6.1-dbus-switch.patch
 
-	use doc || epatch "${FILESDIR}/${PN}-2.22.0-gtk-doc-die-die-die.patch"
-
 	eautoreconf
 }
diff --git a/app-text/evince/files/evince-2.22.0-gtk-doc-die-die-die.patch b/app-text/evince/files/evince-2.22.0-gtk-doc-die-die-die.patch
deleted file mode 100644
index 6103c4c34ee1..000000000000
--- a/app-text/evince/files/evince-2.22.0-gtk-doc-die-die-die.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig	2008-03-11 19:09:44.000000000 -0700
-+++ configure.ac	2008-03-11 19:10:37.000000000 -0700
-@@ -29,7 +29,11 @@
- GNOME_CXX_WARNINGS
- GNOME_DEBUG_CHECK
- 
-+dnl Crazy hack for dropping dep on gtk-doc
-+AC_DEFUN(GTK_DOC_CHECK, [])
- GTK_DOC_CHECK(1.0)
-+AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
-+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
- 
- GETTEXT_PACKAGE=evince
- AC_SUBST(GETTEXT_PACKAGE)
---- help/Makefile.old.am	2008-03-15 12:54:08.000000000 +0100
-+++ help/Makefile.am	2008-03-15 12:54:40.000000000 +0100
-@@ -1,4 +1,9 @@
--SUBDIRS = reference
-+
-+SUBDIRS =
-+
-+if ENABLE_GTK_DOC
-+SUBDIRS += reference
-+endif
- 
- include $(top_srcdir)/gnome-doc-utils.make
- dist-hook: doc-dist-hook