diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-08-10 12:49:14 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-08-10 12:49:14 +0000 |
| commit | a452e1aeaaec2866ee15569a9199f06b35122982 (patch) | |
| tree | b9a717d99bc15b8621a6693450e7ccf24f1b7b83 /sys-fs | |
| parent | Fix building with GCC 4.4+ wrt #275169. (diff) | |
| download | gentoo-2-a452e1aeaaec2866ee15569a9199f06b35122982.tar.gz gentoo-2-a452e1aeaaec2866ee15569a9199f06b35122982.tar.bz2 gentoo-2-a452e1aeaaec2866ee15569a9199f06b35122982.zip | |
Update patch for live-ebuild without docs.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-9999-disable-doc.diff | 64 |
2 files changed, 31 insertions, 39 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 80b3670e522c..71a06730c0bf 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.480 2009/08/09 11:29:28 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.481 2009/08/10 12:49:13 zzam Exp $ + + 10 Aug 2009; Matthias Schwarzott <zzam@gentoo.org> + files/udev-9999-disable-doc.diff: + Update patch for live-ebuild without docs. 09 Aug 2009; nixnut <nixnut@gentoo.org> udev-141.ebuild: ppc stable #254616 diff --git a/sys-fs/udev/files/udev-9999-disable-doc.diff b/sys-fs/udev/files/udev-9999-disable-doc.diff index 4b20eaeae91c..d92cd1c08d74 100644 --- a/sys-fs/udev/files/udev-9999-disable-doc.diff +++ b/sys-fs/udev/files/udev-9999-disable-doc.diff @@ -1,57 +1,45 @@ +diff --git a/Makefile.am b/Makefile.am +index 221e91f..f2a6198 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = . libudev/docs ++SUBDIRS = . + + udevconfdir = $(sysconfdir)/udev + dist_udevconf_DATA = \ +@@ -447,8 +447,7 @@ libgudev_include_HEADERS = \ + + pkgconfig_DATA += extras/gudev/gudev-1.0.pc + +-SUBDIRS += \ +- extras/gudev/docs ++SUBDIRS += + endif + + if ENABLE_INTROSPECTION diff --git a/configure.ac b/configure.ac -index 82c455d..88dd20c 100644 +index 727cba6..bbd3775 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,6 @@ AC_SYS_LARGEFILE AC_CONFIG_MACRO_DIR([m4]) - AC_PROG_LIBTOOL + LT_INIT AC_PROG_AWK -GTK_DOC_CHECK(1.10) AC_PREFIX_DEFAULT([/usr]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -@@ -103,8 +102,6 @@ AC_CONFIG_FILES([ +@@ -102,12 +101,8 @@ AC_CONFIG_HEADERS(config.h) + AC_CONFIG_FILES([ Makefile - libudev/Makefile libudev/libudev.pc - libudev/docs/Makefile - libudev/docs/version.xml - udev/Makefile - rules/Makefile - extras/Makefile -@@ -125,8 +122,6 @@ AC_CONFIG_FILES([ - extras/usb-db/Makefile - extras/gudev/Makefile + udev/udev.pc extras/gudev/gudev-1.0.pc - extras/gudev/docs/Makefile - extras/gudev/docs/version.xml - extras/keymap/Makefile - extras/modem-modeswitch/Makefile ]) -diff --git a/extras/gudev/Makefile.am b/extras/gudev/Makefile.am -index dcfc2bd..87d9aba 100644 ---- a/extras/gudev/Makefile.am -+++ b/extras/gudev/Makefile.am -@@ -2,8 +2,7 @@ include $(top_srcdir)/Makefile.am.inc - - # putting ‘.’ first causes prefix ordering of directories - SUBDIRS = \ -- . \ -- docs -+ . - - AM_CPPFLAGS += \ - -I$(top_builddir)/extras \ -diff --git a/libudev/Makefile.am b/libudev/Makefile.am -index 220cff0..f40c830 100644 ---- a/libudev/Makefile.am -+++ b/libudev/Makefile.am -@@ -1,7 +1,6 @@ - include $(top_srcdir)/Makefile.am.inc - --SUBDIRS = \ -- docs -+SUBDIRS = - noinst_PROGRAMS = \ - test-libudev + AC_OUTPUT |