public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: ChangeLog xapian-bindings-1.2.8.ebuild
@ 2011-12-14 11:21 Anthony G. Basile (blueness)
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile (blueness) @ 2011-12-14 11:21 UTC (permalink / raw
  To: gentoo-commits

blueness    11/12/14 11:21:00

  Modified:             ChangeLog
  Added:                xapian-bindings-1.2.8.ebuild
  Log:
  Version bump, bug #394413
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 dev-libs/xapian-bindings/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	18 Sep 2011 08:43:28 -0000	1.25
+++ ChangeLog	14 Dec 2011 11:21:00 -0000	1.26
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.25 2011/09/18 08:43:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.26 2011/12/14 11:21:00 blueness Exp $
+
+*xapian-bindings-1.2.8 (14 Dec 2011)
+
+  14 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  +xapian-bindings-1.2.8.ebuild:
+  Version bump, bug #394413
 
 *xapian-bindings-1.2.7-r2 (18 Sep 2011)
 



1.1                  dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.1&content-type=text/plain

Index: xapian-bindings-1.2.8.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.1 2011/12/14 11:21:00 blueness Exp $

EAPI="3"
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH="threads"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"

PHP_EXT_NAME="xapian"
PHP_EXT_INI="yes"
PHP_EXT_OPTIONAL_USE="php"

inherit java-pkg-opt-2 mono php-ext-source-r2 python

DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/"
SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="java lua mono perl php python ruby tcl"

COMMONDEPEND="=dev-libs/xapian-${PV}*
	lua? ( >=dev-lang/lua-5.1 )
	mono? ( >=dev-lang/mono-1.0.8 )
	perl? ( dev-lang/perl )
	ruby? ( dev-lang/ruby )
	tcl? ( >=dev-lang/tcl-8.1 )"
DEPEND="${COMMONDEPEND}
	java? ( >=virtual/jdk-1.3 )"
RDEPEND="${COMMONDEPEND}
	java? ( >=virtual/jre-1.3 )"

pkg_setup() {
	java-pkg-opt-2_pkg_setup

	if use python; then
		python_pkg_setup
	fi
}

src_prepare() {
	java-pkg-opt-2_src_prepare
	if use java; then
		sed \
			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
	fi

	if use python; then
		sed \
			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
			-i python/Makefile.in || die "sed failed"
	fi
}

src_configure() {
	if use java; then
		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
	fi

	if use perl; then
		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
	fi

	econf \
		$(use_with java) \
		$(use_with lua) \
		$(use_with mono csharp) \
		$(use_with perl) \
		$(use_with php) \
		$(use_with python) \
		$(use_with ruby) \
		$(use_with tcl)

	# Python bindings are built/tested/installed manually.
	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
}

src_compile() {
	default

	if use python; then
		python_copy_sources python
		building() {
			emake \
				PYTHON="$(PYTHON)" \
				PYTHON_INC="$(python_get_includedir)" \
				PYTHON_LIB="$(python_get_libdir)" \
				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
				pkgpylibdir="$(python_get_sitedir)/xapian"
		}
		python_execute_function -s --source-dir python building
	fi
}

src_test() {
	default

	if use python; then
		testing() {
			emake \
				PYTHON="$(PYTHON)" \
				PYTHON_INC="$(python_get_includedir)" \
				PYTHON_LIB="$(python_get_libdir)" \
				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
				pkgpylibdir="$(python_get_sitedir)/xapian" \
				VERBOSE="1" \
				check
		}
		python_execute_function -s --source-dir python testing
	fi
}

src_install () {
	emake DESTDIR="${D}" install || die "emake install failed"

	if use java; then
		java-pkg_dojar java/built/xapian_jni.jar
		# TODO: make the build system not install this...
		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
		rm "${D}/${S}/java/built/libxapian_jni.so"
		rmdir -p "${D}/${S}/java/built"
		rmdir -p "${D}/${S}/java/native"
	fi

	if use python; then
		installation() {
			emake \
				DESTDIR="${D}" \
				PYTHON="$(PYTHON)" \
				PYTHON_INC="$(python_get_includedir)" \
				PYTHON_LIB="$(python_get_libdir)" \
				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
				pkgpylibdir="$(python_get_sitedir)/xapian" \
				install
		}
		python_execute_function -s --source-dir python installation
	fi

	if use php; then
		php-ext-source-r2_createinifiles
	fi

	# For some USE combinations this directory is not created
	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
	fi

	dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
}

pkg_postinst() {
	if use python; then
		python_mod_optimize xapian
	fi
}

pkg_postrm() {
	if use python; then
		python_mod_cleanup xapian
	fi
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: ChangeLog xapian-bindings-1.2.8.ebuild
@ 2011-12-17 18:51 Anthony G. Basile (blueness)
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile (blueness) @ 2011-12-17 18:51 UTC (permalink / raw
  To: gentoo-commits

blueness    11/12/17 18:51:08

  Modified:             ChangeLog xapian-bindings-1.2.8.ebuild
  Log:
  Fix install location of lua binding
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.27                 dev-libs/xapian-bindings/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	14 Dec 2011 11:21:00 -0000	1.26
+++ ChangeLog	17 Dec 2011 18:51:08 -0000	1.27
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.26 2011/12/14 11:21:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.27 2011/12/17 18:51:08 blueness Exp $
+
+  17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  xapian-bindings-1.2.8.ebuild, +files/fix-LUA_LIB-envvar.patch:
+  Fix install location of lua binding
 
 *xapian-bindings-1.2.8 (14 Dec 2011)
 



1.2                  dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?r1=1.1&r2=1.2

Index: xapian-bindings-1.2.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xapian-bindings-1.2.8.ebuild	14 Dec 2011 11:21:00 -0000	1.1
+++ xapian-bindings-1.2.8.ebuild	17 Dec 2011 18:51:08 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.1 2011/12/14 11:21:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.2 2011/12/17 18:51:08 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -12,7 +12,7 @@
 PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
-inherit java-pkg-opt-2 mono php-ext-source-r2 python
+inherit java-pkg-opt-2 mono php-ext-source-r2 python autotools
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -43,6 +43,11 @@
 }
 
 src_prepare() {
+	if use lua; then
+		epatch "${FILESDIR}"/fix-LUA_LIB-envvar.patch
+		eautoreconf
+	fi
+
 	java-pkg-opt-2_src_prepare
 	if use java; then
 		sed \
@@ -68,6 +73,10 @@
 		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
 	fi
 
+	if use lua; then
+		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
+	fi
+
 	econf \
 		$(use_with java) \
 		$(use_with lua) \






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: ChangeLog xapian-bindings-1.2.8.ebuild
@ 2012-02-05 10:00 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-02-05 10:00 UTC (permalink / raw
  To: gentoo-commits

ago         12/02/05 10:00:53

  Modified:             ChangeLog xapian-bindings-1.2.8.ebuild
  Log:
  Stable for amd64, wrt bug #402187
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.28                 dev-libs/xapian-bindings/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	17 Dec 2011 18:51:08 -0000	1.27
+++ ChangeLog	5 Feb 2012 10:00:53 -0000	1.28
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/xapian-bindings
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.27 2011/12/17 18:51:08 blueness Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.28 2012/02/05 10:00:53 ago Exp $
+
+  05 Feb 2012; Agostino Sarubbo <ago@gentoo.org> xapian-bindings-1.2.8.ebuild:
+  Stable for amd64, wrt bug #402187
 
   17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
   xapian-bindings-1.2.8.ebuild, +files/fix-LUA_LIB-envvar.patch:



1.3                  dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?r1=1.2&r2=1.3

Index: xapian-bindings-1.2.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xapian-bindings-1.2.8.ebuild	17 Dec 2011 18:51:08 -0000	1.2
+++ xapian-bindings-1.2.8.ebuild	5 Feb 2012 10:00:53 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.2 2011/12/17 18:51:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.3 2012/02/05 10:00:53 ago Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -20,7 +20,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 
 COMMONDEPEND="=dev-libs/xapian-${PV}*






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: ChangeLog xapian-bindings-1.2.8.ebuild
@ 2012-03-08  9:29 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 4+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2012-03-08  9:29 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    12/03/08 09:29:46

  Modified:             ChangeLog xapian-bindings-1.2.8.ebuild
  Log:
  x86 stable wrt bug #402187
  
  (Portage version: 2.1.10.44/cvs/Linux i686)

Revision  Changes    Path
1.30                 dev-libs/xapian-bindings/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.29&r2=1.30

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	25 Feb 2012 02:06:47 -0000	1.29
+++ ChangeLog	8 Mar 2012 09:29:46 -0000	1.30
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.29 2012/02/25 02:06:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.30 2012/03/08 09:29:46 phajdan.jr Exp $
+
+  08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xapian-bindings-1.2.8.ebuild:
+  x86 stable wrt bug #402187
 
   25 Feb 2012; Patrick Lauer <patrick@gentoo.org> xapian-bindings-1.2.5.ebuild,
   xapian-bindings-1.2.7-r2.ebuild, xapian-bindings-1.2.8.ebuild:



1.5                  dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild?r1=1.4&r2=1.5

Index: xapian-bindings-1.2.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xapian-bindings-1.2.8.ebuild	25 Feb 2012 02:06:47 -0000	1.4
+++ xapian-bindings-1.2.8.ebuild	8 Mar 2012 09:29:46 -0000	1.5
@@ -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/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.4 2012/02/25 02:06:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.5 2012/03/08 09:29:46 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -20,7 +20,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="java lua mono perl php python ruby tcl"
 
 COMMONDEPEND="=dev-libs/xapian-${PV}*






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-03-08 10:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-17 18:51 [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: ChangeLog xapian-bindings-1.2.8.ebuild Anthony G. Basile (blueness)
  -- strict thread matches above, loose matches on Subject: below --
2012-03-08  9:29 PaweA Hajdan (phajdan.jr)
2012-02-05 10:00 Agostino Sarubbo (ago)
2011-12-14 11:21 Anthony G. Basile (blueness)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox