app-text/xapian-omega: fix build system, bug #574666

Package-Manager: portage-2.2.26

diff --git a/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
new file mode 100644 (file)
index 0000000..e8126ba
--- /dev/null
+++ b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
@@ -0,0 +1,20 @@
+commit 755169cc3b0991bb783ade963da3a473db147067
+Author: Olly Betts <olly@survex.com>
+Date:   Tue Jan 12 17:24:11 2016 +1300
+
+    Need to AC_SUBST probed value of ZLIB_LIBS
+    
+    Noted by Paul Wise
+
+diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac
+index db56262..36d894e 100644
+--- a/xapian-applications/omega/configure.ac
++++ b/xapian-applications/omega/configure.ac
+@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [
+   AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you  may need to install the zlib1g-dev or zlib-devel package)])
+   ])
+ ZLIB_LIBS=$LIBS
++AC_SUBST([ZLIB_LIBS])
+ LIBS=$SAVE_LIBS
+ 
+ dnl libmagic used to detect MIME types for files we don't detect by extension.

diff --git a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
index d38795598d694d4b74fc71e397421b47c3c04b47..a48191a465ce9a412a62c57074f105e9c079a54d 100644 (file)
--- a/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.3.4.ebuild
@@ -4,6 +4,8 @@
 
 EAPI="5"
 
+inherit autotools eutils
+
 DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
 SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
 HOMEPAGE="http://www.xapian.org/"
@@ -20,6 +22,12 @@ DEPEND="dev-libs/xapian:0/1.3.5
        sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+       # Bug #574666
+       epatch "${FILESDIR}"/${P}-fix-lz.patch
+       eautoreconf
+}
+
 src_install () {
        emake DESTDIR="${D}" install