[gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian-bindings/

[Anthony G. Basile]

commit:     ab18aa645403b4408bc99b01b322bc5715ade9f0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 15:57:34 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 15:58:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab18aa64

dev-libs/xapian-bindings: python3 support for xapian-1.{3,4} branches, bug #589642

Package-Manager: portage-2.2.28

 dev-libs/xapian-bindings/Manifest                  |   1 -
 .../xapian-bindings/xapian-bindings-1.3.6.ebuild   | 119 ---------------------
 ...7-r1.ebuild => xapian-bindings-1.3.7-r2.ebuild} |   7 +-
 ....4.0.ebuild => xapian-bindings-1.4.0-r1.ebuild} |   7 +-
 4 files changed, 8 insertions(+), 126 deletions(-)

diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index f2d5a89..ea3959e 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,6 +1,5 @@
 DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256 3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512 ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30 WHIRLPOOL 33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
 DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256 b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512 0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0 WHIRLPOOL 05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2acebffff10bc558a83305a637ce
 DIST xapian-bindings-1.2.23.tar.xz 885888 SHA256 19b4b56c74863c51733d8c2567272ef7f004b898cf44016711ae25bc524b2215 SHA512 4be9d103a4073a08d2481e9ddc347156d4028a1517f313861ad3664e6103e052dc1a0d07a992da3ca02599505c002d09d77c4fd886c144918aab72977e69994c WHIRLPOOL 1323e51dcd8f18f573f9338d9a013bfd370870c1fd2c0b0e3ff9d1f6b3b9154a0512d7442d7c7b1b00a70757faa218e8894a0f4fe56da88bca12ba2259cd35de
-DIST xapian-bindings-1.3.6.tar.xz 1019216 SHA256 ba33436dee5165f61f2e289cfb18b1acdc4b2a811afdf68158845680e744eda0 SHA512 318324d9deb6a359de79eadb792c598661bde2ff9e1b241e29b18cdf1a2cf3dbeb9f5643c6bf8c7fbdbc8a2fd0baa91384398e694448312b6d8383960407f7fe WHIRLPOOL eb6844809572cad97d90be20ee27d28556342b27145e9e6c1efaea09f50a6001bad708a6370051edb9d065081a571c7552aaa36c601e1247a9aa5c5550549131
 DIST xapian-bindings-1.3.7.tar.xz 1021176 SHA256 f014bb0281fdaa08fd9293ee187af0c2165f4fd2de91a67b76d9327b64677717 SHA512 3dc7eac68c4f3010e5cb831b4baad7bea4d47e0a8dc492ac16f2437057da351caad008aa7bcf3f2bbdaffda7d2524e8b5a945b651dc02deadeb110073ef06ad8 WHIRLPOOL f68a81a37b9c298ad6b061f597806b0823ba01ee02c0921e90988c984ac2f60ec0cb09dba8bdecb43c412517eebd72490196923db474e5362d17c47af4b4fdd2
 DIST xapian-bindings-1.4.0.tar.xz 1021244 SHA256 3aec7a009d0bf0b95968420bf68683176c05d63140eaf1cf265d39afe8fa6253 SHA512 16523be4f2cd576819771e387d469c91cd03b27522808eebc9275ac3281e55c5d40a5c620ad37f96c2dbc89cc2b13808579e29d737eb63584b8c209597b0f7ce WHIRLPOOL 26a31b8a2ca8bd08a45e79fb5f926e917db8e65d8ee1f07c9291c573b8efa647c9ff7bc1c6c3130ae69538ffa1789a0ad60d940f00b758066e55f4835ec20433

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
deleted file mode 100644
index e71fefe..0000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=threads
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_IN_SOURCE_BUILD=yesplz
-
-USE_PHP="php5-5 php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-IUSE="java lua perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.3.7
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	python? (
-		dev-python/sphinx
-		${PYTHON_DEPS}
-	)
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( dev-lang/tcl:= )"
-#	mono? ( dev-lang/mono )
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-#	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# http://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	# Accept ruby 2.0 - patch configure directly to avoid autoreconf
-	epatch "${FILESDIR}"/${P}-allow-ruby-2.0.patch
-}
-
-src_configure() {
-	if use java; then
-		export 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
-
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		--disable-documentation \
-		$(use_with java) \
-		$(use_with lua) \
-		--without-csharp \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-#		$(use_with mono csharp)
-}
-
-src_compile() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	use php && php-ext-source-r2_createinifiles
-
-	# 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}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild
similarity index 92%
rename from dev-libs/xapian-bindings/xapian-bindings-1.3.7-r1.ebuild
rename to dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild
index 5433a28..ff8a0ab 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.7-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE=threads
 DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
@@ -17,8 +17,8 @@ PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
 #mono violates sandbox, we disable it until we figure this out
-#inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
+#inherit python-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
+inherit python-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -88,6 +88,7 @@ src_configure() {
 		$(use_with perl) \
 		$(use_with php) \
 		$(use_with python) \
+		$(use_with python python3) \
 		$(use_with ruby) \
 		$(use_with tcl)
 #		$(use_with mono csharp)

diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.0.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild
similarity index 92%
rename from dev-libs/xapian-bindings/xapian-bindings-1.4.0.ebuild
rename to dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild
index c1bfac4..4e675d3 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.0.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE=threads
 DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
@@ -17,8 +17,8 @@ PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
 #mono violates sandbox, we disable it until we figure this out
-#inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
+#inherit python-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
+inherit python-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
 
 DESCRIPTION="SWIG and JNI bindings for Xapian"
 HOMEPAGE="http://www.xapian.org/"
@@ -88,6 +88,7 @@ src_configure() {
 		$(use_with perl) \
 		$(use_with php) \
 		$(use_with python) \
+		$(use_with python python3) \
 		$(use_with ruby) \
 		$(use_with tcl)
 #		$(use_with mono csharp)