diff options
author | Jeroen Roovers <jer@gentoo.org> | 2012-05-01 18:29:49 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2012-05-01 18:29:49 +0000 |
commit | a41c6d7e0adb47a1b6f20a1faf4d1300be64ffe7 (patch) | |
tree | ecd357fb9ddf97c9c631e7d372047f5e0a99b34e /dev-libs/libnl | |
parent | Drop ia64/sparc keywords (diff) | |
download | gentoo-2-a41c6d7e0adb47a1b6f20a1faf4d1300be64ffe7.tar.gz gentoo-2-a41c6d7e0adb47a1b6f20a1faf4d1300be64ffe7.tar.bz2 gentoo-2-a41c6d7e0adb47a1b6f20a1faf4d1300be64ffe7.zip |
Remove USE=dot dependency for app-doc/doxygen. Add a patch to fix building documentation.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libnl')
-rw-r--r-- | dev-libs/libnl/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libnl/files/libnl-3.2.8-doc.patch | 21 | ||||
-rw-r--r-- | dev-libs/libnl/libnl-3.2.8.ebuild | 10 |
3 files changed, 33 insertions, 5 deletions
diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog index d60b28be97ab..b3cc48a4cb78 100644 --- a/dev-libs/libnl/ChangeLog +++ b/dev-libs/libnl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.75 2012/05/01 17:10:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.76 2012/05/01 18:29:49 jer Exp $ + + 01 May 2012; Jeroen Roovers <jer@gentoo.org> libnl-3.2.8.ebuild, + +files/libnl-3.2.8-doc.patch: + Remove USE=dot dependency for app-doc/doxygen. Add a patch to fix building + documentation. 01 May 2012; Jeroen Roovers <jer@gentoo.org> libnl-3.2.8.ebuild: Readd USE=doc. diff --git a/dev-libs/libnl/files/libnl-3.2.8-doc.patch b/dev-libs/libnl/files/libnl-3.2.8-doc.patch new file mode 100644 index 000000000000..0389f3d43772 --- /dev/null +++ b/dev-libs/libnl/files/libnl-3.2.8-doc.patch @@ -0,0 +1,21 @@ +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -590,7 +590,7 @@ + INPUT = @top_srcdir@/lib \ + @top_srcdir@/src/lib \ + @top_srcdir@/include/netlink \ +- @srcdir@/src ++ @top_srcdir@/src + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,6 +1,6 @@ + # -*- Makefile -*- + +-.PHONY: gendoc api_refs asciidoc ++.PHONY: gendoc api_ref asciidoc + + ASCIIDOCOPTS=-a pygments -a language=c -a icons \ + -a toc2 \ diff --git a/dev-libs/libnl/libnl-3.2.8.ebuild b/dev-libs/libnl/libnl-3.2.8.ebuild index cf7f9aadfdde..ec223cb5c0d5 100644 --- a/dev-libs/libnl/libnl-3.2.8.ebuild +++ b/dev-libs/libnl/libnl-3.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.8.ebuild,v 1.2 2012/05/01 17:10:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.8.ebuild,v 1.3 2012/05/01 18:29:49 jer Exp $ EAPI=4 inherit autotools eutils multilib @@ -16,14 +16,16 @@ IUSE="doc static-libs utils" DEPEND=" sys-devel/flex virtual/yacc - doc? ( app-doc/doxygen[dot,latex] ) + doc? ( app-doc/doxygen[latex] ) " src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.1-vlan-header.patch - sed -i doc/Makefile.am -e 's|api_refs|api_ref|g' || die - eautomake + if use doc; then + epatch "${FILESDIR}"/${PN}-3.2.8-doc.patch + eautomake + fi } src_configure() { |