diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-01-20 14:19:49 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-01-20 14:19:49 +0000 |
| commit | ea4044eb7745ffc75c3f7430e1584564f03cfd92 (patch) | |
| tree | 61b6eb3e4fb8766e7b49654ee067f681b860ad16 /gnome-extra | |
| parent | Marking ttf-sil-abyssinica-1.0 ppc64 for bug 206706 (diff) | |
| download | gentoo-2-ea4044eb7745ffc75c3f7430e1584564f03cfd92.tar.gz gentoo-2-ea4044eb7745ffc75c3f7430e1584564f03cfd92.tar.bz2 gentoo-2-ea4044eb7745ffc75c3f7430e1584564f03cfd92.zip | |
fix gtk-doc mess (bug #206771)
(Portage version: 2.1.4)
Diffstat (limited to 'gnome-extra')
3 files changed, 40 insertions, 2 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 7b8f9c92ea6a..cf50e6e6061c 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.164 2008/01/20 10:51:13 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.165 2008/01/20 14:19:48 eva Exp $ + + 20 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/evolution-data-server-1.12.3-gtk-doc.patch, + evolution-data-server-1.12.3.ebuild: + fix gtk-doc mess (bug #206771) *evolution-data-server-1.12.3 (20 Jan 2008) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild index f08614ce81cc..f7e40c149236 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.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/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.1 2008/01/20 10:51:13 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.2 2008/01/20 14:19:48 eva Exp $ inherit db-use eutils flag-o-matic gnome2 autotools @@ -80,6 +80,9 @@ src_unpack() { # Don't assume that endian.h and byteswap.h exist on all non sun os's epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch + # Fix broken gtk-doc.make + epatch "${FILESDIR}"/${PN}-1.12.3-gtk-doc.patch + #-------------Upstream GNOME look here -----------------# # --as-needed fixes diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch new file mode 100644 index 000000000000..62577ea90621 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch @@ -0,0 +1,30 @@ +--- gtk-doc.make 2008-01-20 13:50:03.000000000 +0100 ++++ gtk-doc.make 2007-10-14 19:45:39.000000000 +0200 +@@ -5,11 +5,11 @@ + #################################### + + if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + else +-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) ++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + endif + + # We set GPATH here; this gives us semantics for GNU make +@@ -139,8 +139,9 @@ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- which gtkdoc-rebase >/dev/null && \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ if test `which gtkdoc-rebase` != ""; then \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ fi \ + fi + + |