diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2008-04-02 15:02:26 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2008-04-02 15:02:26 +0000 |
| commit | d20ec0b5e221ae541c3a993ed33b226a5e56cf35 (patch) | |
| tree | a8751252b5efef56f56b03a79c74fad1354080d6 /app-text/evince | |
| parent | Version bump wrt bug #215761, fixed paths and honour CFLAGS, LDFLAGS and CC. ... (diff) | |
| download | gentoo-2-d20ec0b5e221ae541c3a993ed33b226a5e56cf35.tar.gz gentoo-2-d20ec0b5e221ae541c3a993ed33b226a5e56cf35.tar.bz2 gentoo-2-d20ec0b5e221ae541c3a993ed33b226a5e56cf35.zip | |
Remove gtk-doc hack in favor of gtk-doc-am dep
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-text/evince')
| -rw-r--r-- | app-text/evince/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/evince/evince-2.22.0.ebuild | 5 | ||||
| -rw-r--r-- | app-text/evince/files/evince-2.22.0-gtk-doc-die-die-die.patch | 27 |
3 files changed, 7 insertions, 31 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/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 |