Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 188 insertions, 22 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index 49ed1450a2d2..ebcd431373e3 100644
--- a/dev-libs/xapian-bindings/ChangeLog
+++ b/dev-libs/xapian-bindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xapian-bindings
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.103 2015/05/23 15:05:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.104 2015/06/03 11:45:25 blueness Exp $
+
+*xapian-bindings-1.3.3 (03 Jun 2015)
+
+  03 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  +xapian-bindings-1.3.3.ebuild:
+  Version bump
 
 *xapian-bindings-1.2.21 (23 May 2015)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 852fb79c3677..c541e4e812d4 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,30 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256 3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512 ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30 WHIRLPOOL 33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
 DIST xapian-bindings-1.2.20.tar.xz 828864 SHA256 98594534697642dee563c0e7fede43fde256f7e03488ea4922800f56baadc401 SHA512 4797431974442b210bb637e1d307a8c7eafb5f60093aee9d86223bacec7f828bd3d30c2d159d34cc160208cd016be3822acd19f1be9159af8f8871d83e7ec688 WHIRLPOOL 9ebeec220142865b6f983f065cef568623d2fb26e5393c2e8a74fc12c3dbb0fefd5541991beb494179ec4bff402164c9a5edafb520013b89ee3ae8fa73f06686
 DIST xapian-bindings-1.2.21.tar.xz 842696 SHA256 28a39247ac875be2dc1386c273167aab5c9949227c1070b65ca8de603c06d546 SHA512 bebb4c6fce57f9b54b307bf921e760efe8fbd06d404629cfb80717eed9bfb886c82559c2ba2b333a4e24ce14d389c916ca36924f9d4b2f72fae183d4a00e635b WHIRLPOOL 065efe7c9ad38f8f27a2fb109969b1ec6eb2ef403cb6e194f7c5f4147cb666931f2e70f698f6c974916087489af7ea05e0c8c1a2a39232d1176083b624ff5cf6
 DIST xapian-bindings-1.3.2.tar.xz 1177620 SHA256 bcf9948cd6e51c4e80ed5c1284b3349e667162dcbd048a4136c380adfe570f92 SHA512 65b8cb9a27b19c04179c6b8147110bcac118b5c41308ad87fef7db2b3b16d2032645f5d010492ebd772cb6bc673228b68837159764cb6d8fc09dde11e81174a7 WHIRLPOOL ffb4709a95d4139b4d9863195ec8ffc23a4936a055424b154e0e1f8c6d00bc81e919246e58fe68b76738bee05941a868b38e87ba1302ac3e392152b4592a1d1a
+DIST xapian-bindings-1.3.3.tar.xz 1195784 SHA256 a443a16ac8279daa5b50d3308861034f859f71c824ff5fa2d75cfda3cf31858f SHA512 db0f672cdc886b975dcfdec9ec1b30401627fdecdafe5381f0da41da1bebe3c15d80d6126fa443107ba1b7c259f15ff26c08f7b18524f620b2cb8e48f2c4c2d7 WHIRLPOOL beee4de0346bbcb11dd3c5f14b775e61a9cd2dbfc03fd61f12af90e883f09495a2a951543cd001a7e778920901c2a7001cd22d0179c5173f13cf543ce9b60c98
 EBUILD xapian-bindings-1.2.19.ebuild 5580 SHA256 dd0c3703dc7c6df189936799833f8a4eec8da3f6ce69482b66466929b3deb9e9 SHA512 3326da277a59f5397fd75e73088598dee629b1d5e0c9eb5d07e5545fc2e2f108b466bd5c709bd5166f542d9aab9c0d6350d2d60518b315fdceacb84be212b922 WHIRLPOOL 770d8f46f9be2ce213cb0dd006a63af0e9005d7c77a91ab6e29f9168a80bde7380596b9d71fce1c991cdf354e2e997493fd7fc612bd9e792051cd12a3b33ea2a
 EBUILD xapian-bindings-1.2.20.ebuild 5588 SHA256 d636d578b3d4b6dd7e3a4389e9a1a4e2bbd1826ee9d87f59476907bba4377377 SHA512 6ed30c5eeb6eb92fcbc70500f63d0a974fe708314922466f2915fb45eb388b199e6b1cbfd11be379ffe214ab5c1b5733980c7af0fd6810cdf2c956278fa016e7 WHIRLPOOL 8df26a62d59842015467a258e32b2fb0de5950179c010b8cef993939fc7417524d8019f8a2866db185545436ad77477954a9bc47ef27423d73d1f08f5f455f5b
 EBUILD xapian-bindings-1.2.21.ebuild 5588 SHA256 121637776cbd4cbe3bf21148404076fb0608d5fc22fedd424751d4f78b82bbc4 SHA512 b82f6fe4839d1d1b46eed1d67f61a028f24efcff0866d2fa998d846fe50dcfa70f18ec28a2803d65820880478bafe02fae47f0afe9d33348ac06b51a2d169c76 WHIRLPOOL 7e16d15c82762ec37a667357bbc6ae5f6d57c15159892cf20c9aec7b973ac315653a1fcf59b95ab44f5b1484aace91ffa6acb1a5922105c646b455fa19e1d46f
 EBUILD xapian-bindings-1.3.2.ebuild 4525 SHA256 4577cb1395d87dbebc27e78aa3e9b6a93caee9938d9161dfc953b43dc5eee7f8 SHA512 25a5fcd905847f82b82f79ce527418b5c96cffb0c7bb1780b19958d20eb80e5c7370dbe3efa7becfae1a403c2386369c2cb3e4ee419939146917060141fc75a2 WHIRLPOOL 620dd085a0c7131bf7481f23a25b09b05dde3fd168c2f18d9c01912557d9eb385b8b6fff7c4d4e7ae73a49471f525dad626e41f9d6333140d8d23fbb3875045c
-MISC ChangeLog 16276 SHA256 9691f7ddd0cc004feeb2a6e5ad11265546d3dca88f81fe67bee42f826ab60127 SHA512 cc15b80987b78bea3244d8e47e0d1b876a8379fd1160996d3682e46f6e7cd69cf4ba45df19370dea92346bfe520c725b04edca4a1965e8357b5b775f3d935161 WHIRLPOOL 63febc3dd9a360473a796d50cd069bb8826885c134f152949558b8d2f3723d1850ca909851c7529490c5f178177b7fb03d27a43110f11a94f0c374bc5888c6be
+EBUILD xapian-bindings-1.3.3.ebuild 4525 SHA256 fa423f2e16fe19518d7db83816579e646f8357a3433f4689053aa83eabf3c99a SHA512 d9f36e60c9744a946e7de06e7b2b304464eac7fbb0e17ec9b3d8125ebab671bb861855c611ebc06ac9e694fd7126693d94d853df56ce087dc965ec61d01ac221 WHIRLPOOL 9f9bd79540b3649ab6c37076726861d459738675eac2919a5635624723ed36ad0df0e80e34f3b96baa0f02ab86ca9bee55f410d99e487fcaa399f8b2a03cb915
+MISC ChangeLog 16418 SHA256 2d6cca572c82c136d0171af338671d360608ffc3e271b99fe936df5b904cfaf3 SHA512 051d3757e1dcf98d2a2d33c4f8c85438b660f86ec931abff81fde4693c030c2e165943485fa7055c89eeffa7ab1751c6ad28828ebbbeb81678bdc1e532e9e23c WHIRLPOOL f3bddc880daf63e0dcd7b63f9950353e21ed55d6afa6e28097aee8564e1c6f597bb7bbcdedc91832627ce00d1bfc064fd34cea411b5d0bc592355fa594ebd18f
 MISC metadata.xml 367 SHA256 e757cf120c1188c0010caaf7449e89deee52d8aa275f4f0c3b9cc0c097d28596 SHA512 e562b4dfbdcf62a3f860cd185dcd5fb2cf4067cb9b6c11c94669027c9cbae94bc437fa63e68b3b982a6bdda624087a60b24a269031fae2f3f975efb3d8e85d44 WHIRLPOOL 1314776082f07f5fdf74d15ad6b5093276b58f47e4dce35c0377e6a7baef0941bf567e43047e4ff80a726e2078d506c9029cd033cba8aeba9110b75cbbffa036
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVYJdxAAoJEJOE+m71LUu6WJgP/RshpiPTFNQpwhVmotXA6l8o
-4tcZGaeQzROwTGa+GzsTXoYlQwRm+9Im4JDCgUriSfVXq13qqWawOVRTmOIaT5RS
-QoSc7AFbto/U/pyOKzA/A7fdcAXYvSFQqlO4IZP4yqasS6y940dV2AxC5+UTebbQ
-nbppqAnLDFbNfOYkiNy9Hls4XPD1+k970bj+JUSU/SiyScSux9wHCPALb6SYwLTS
-5oOsl5M0jVEjCfPb8lWjgmvR8Cnha8cG0eVr1OGehbRPOW1aSARQZvAbl9CMANpm
-+YlSZu5SVAOo9PtdqouHo1CJogSX9/O3iNpkBs9jl+LNxkj40XTACpJhYXcs6DIe
-WqvuWshvLCX5C/bM4VeugeBqcnRvIvNG6A3IFkaaE4wqt/sJ+EReFxd46S2XtpXD
-Ssb3MtebX9HQOyjUcBHNfeTCZGsSU5ZJLA+Usud1rqadUdDr1XOm4kjVWzD22ldQ
-MTpzhZE3XQYuCzjGvRqH4pTQrmLqPXtJnjO4BHyil/IEPv+XKq5ZR0OoxD3+E2/H
-z78AhQrf25dsYbDfabmszm+pzLWjV3068k9gPrQqcFoNreusg+HtUvLLnKeJBZ+j
-ZS6dyBmQDrybn4R6rUmQ4tUifOuH0S4aqrO4E7No3M6iwI5tWGXkAVPHsJXDUgeE
-MJ4KC4J9ys8DuGzc6jmu
-=h0zZ
------END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
new file mode 100644
index 000000000000..54d1b445bfd0
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 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.3.3.ebuild,v 1.1 2015/06/03 11:45:25 blueness Exp $
+
+EAPI="5"
+
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+USE_PHP="php5-4"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+inherit java-pkg-opt-2 mono-env 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.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"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}*
+	lua? ( dev-lang/lua:= )
+	mono? ( >=dev-lang/mono-1.0.8 )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:= )
+	tcl? ( >=dev-lang/tcl-8.1:0= )"
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+
+pkg_setup() {
+	mono-env_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 python; then
+		sed \
+			-e 's|\(^pkgpylib_DATA = xapian/__init__.py\).*|\1|' \
+			-e '/\s\sxapian\/__init__.pyc/d' \
+			-e '/\s\sxapian\/__init__.pyo/d' \
+			-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
+
+	if use lua; then
+		export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
+	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
+
+	if use php_targets_php5-4; then
+		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup xapian
+	fi
+}