From: Anthony G. Basile Date: Thu, 14 Apr 2016 23:30:04 +0000 (-0400) Subject: dev-libs/xapian-bindings: fix bug #579412 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac43fa57c846d3b491f7924cbf8569b6c22603ec;p=gentoo.git dev-libs/xapian-bindings: fix bug #579412 Package-Manager: portage-2.2.26 --- diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch new file mode 100644 index 000000000000..2bd895b5deaa --- /dev/null +++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch @@ -0,0 +1,14 @@ +--- perl/Makefile.am.orig 2016-04-14 19:05:30.879298356 -0400 ++++ perl/Makefile.am 2016-04-14 19:05:37.907298474 -0400 +@@ -168,10 +168,10 @@ + endif + MAINTAINERCLEANFILES = $(BUILT_SOURCES) + ++if DOCUMENTATION_RULES + docdatadir = $(docdir)/perl + docdata_DATA = docs/index.html + +-if DOCUMENTATION_RULES + BUILT_SOURCES += docs/index.html + + docs/index.html: Xapian.pm diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild index b23f56898252..1e2c71d5f539 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild @@ -56,14 +56,11 @@ pkg_setup() { src_prepare() { use java && java-pkg-opt-2_src_prepare - if use python; then - sed \ - -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \ - -i python/Makefile.in || die "sed failed" - fi - # http://trac.xapian.org/ticket/702 export XAPIAN_CONFIG="/usr/bin/xapian-config" + + # Fix bug #579412 - requires re-automaking + epatch "${FILESDIR}"/${P}-fix-perl-doc.patch eautoreconf } @@ -82,6 +79,7 @@ src_configure() { fi econf \ + --disable-documentation \ $(use_with java) \ $(use_with lua) \ --without-csharp \