diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-04-11 14:19:12 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-04-11 14:19:12 +0000 |
| commit | 330508272c8b3d5877f86c83e2afe94bd1b10a77 (patch) | |
| tree | a46bfd10f0b486c4a13958e47f1d0485c02b8da3 /dev-libs/xapian-bindings | |
| parent | Drop older stable (diff) | |
| download | gentoo-2-330508272c8b3d5877f86c83e2afe94bd1b10a77.tar.gz gentoo-2-330508272c8b3d5877f86c83e2afe94bd1b10a77.tar.bz2 gentoo-2-330508272c8b3d5877f86c83e2afe94bd1b10a77.zip | |
Remove LUA lib path fix that went upstream
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'dev-libs/xapian-bindings')
| -rw-r--r-- | dev-libs/xapian-bindings/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch | 26 |
2 files changed, 5 insertions, 27 deletions
diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog index c6e888d69d61..da965eb62b5d 100644 --- a/dev-libs/xapian-bindings/ChangeLog +++ b/dev-libs/xapian-bindings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xapian-bindings # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.62 2013/04/11 14:16:59 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.63 2013/04/11 14:19:12 blueness Exp $ + + 11 Apr 2013; Anthony G. Basile <blueness@gentoo.org> + -files/fix-LUA_LIB-envvar.patch: + Remove LUA lib path fix that went upstream 11 Apr 2013; Anthony G. Basile <blueness@gentoo.org> -xapian-bindings-1.2.12-r1.ebuild, -xapian-bindings-1.2.12.ebuild: diff --git a/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch b/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch deleted file mode 100644 index 7f6ea76c2233..000000000000 --- a/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur xapian-bindings-1.2.8.orig//configure.ac xapian-bindings-1.2.8/configure.ac ---- xapian-bindings-1.2.8.orig//configure.ac 2011-12-14 00:29:23.000000000 -0500 -+++ xapian-bindings-1.2.8/configure.ac 2011-12-17 13:28:25.000000000 -0500 -@@ -926,13 +926,15 @@ - if test -n "$LUA" ; then - AC_MSG_RESULT([$lua_version]) - AC_ARG_VAR(LUA_LIB, [Directory to install xapian.so into]) -- AC_MSG_CHECKING(for Lua library to install xapian.so) -- LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'` -- LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'` -- if test -z "$LUA_LIB"; then -- AC_MSG_RESULT(not found) -- else -- AC_MSG_RESULT($LUA_LIB) -+ if test -z "$LUA_LIB" ; then -+ AC_MSG_CHECKING([for Lua library to install xapian.so]) -+ LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'` -+ LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'` -+ if test -z "$LUA_LIB"; then -+ AC_MSG_RESULT(not found) -+ else -+ AC_MSG_RESULT($LUA_LIB) -+ fi - fi - AC_SUBST(LUA_LIB) - |