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 (file)
index 0000000..2bd895b
--- /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 b23f568982529ed86bba7f9d04a6e473ca93f990..1e2c71d5f539d06adba4ddac9d21a30d11ece7a2 100644 (file)
--- 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 \