Version bump

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

3 files changed, 193 insertions, 15 deletions

diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog
index da24383ebbf7..2756ac92e41a 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.75 2014/01/31 13:15:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.76 2014/06/23 10:34:24 blueness Exp $
+
+*xapian-bindings-1.2.18 (23 Jun 2014)
+
+  23 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +xapian-bindings-1.2.18.ebuild:
+  Version bump
 
 *xapian-bindings-1.2.17 (31 Jan 2014)
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index b8f29a4ac2ce..e5409c59a1e5 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -6,29 +6,31 @@ DIST xapian-bindings-1.2.14.tar.gz 1483276 SHA256 a55815ddff0bd5f79814b5964cc942
 DIST xapian-bindings-1.2.15.tar.gz 1484058 SHA256 89d30cbd38dcfb9d9e0fccc8e4ba7d6452ffad45afb3f1e9614a3be0a3a33e77 SHA512 b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec WHIRLPOOL fdc4a07a487c339faa1d8837ea19c37f9f298b90657312b135f727b9fcf3984b149341cbf96c2ea16f54839b93b7677becb65452619b79e71a5204dcb660265d
 DIST xapian-bindings-1.2.16.tar.xz 825868 SHA256 e87ddcd70a5044565e631fb334155f7d66a3b7b491a94a22aa1db2aa0d26af6c SHA512 2c92986d7f678cc17c0608a29ee893bdd3c6a1b00aed12394df32c46311663f8851e7c82685cf43ff7071869dd46f129b47f16f21ce0fae992d07e5780b93286 WHIRLPOOL ccb4ce580188e2a73e2810fdeb125d15aff8feee8cb57a73a00f1f4ff54273496b11dd1add1cddd445dc65179e60b96aae0e3b5e2a0d29626dbc897b3669b48f
 DIST xapian-bindings-1.2.17.tar.xz 827160 SHA256 54ad5d818fa7d6558acbf517a04c78db9fb4c90103eda0a0f9fe9a864683f80a SHA512 4c8348ece62b57c4442e8cb16282b7da2a8ebecaf99eefbb263795c1451f1395c2073ea311df0159e74a4d52029682034926526b17554627cf8e286f328f36a7 WHIRLPOOL dac2c3ff137cb778a2942009f45013cc5eff8d8564b1ed582f4ac6d6e596550853fe5e9362e75dfcf5acda61f71879d9ebfd0f787fd761cb1e065b86e48232a7
+DIST xapian-bindings-1.2.18.tar.xz 828232 SHA256 e0c13d4a15d310c309f03dc8a8edfb9f99c0876ea5c1b1261c38988126cfecf7 SHA512 c0c417130bfaa3f059a003cacaa129662b216704d2f4bdfd997e1d2c0d74a77385f9f79b6ed5e3fb63b5217f78ebd43826fbee9c00f81264089728a02cffbd30 WHIRLPOOL a2a0f7312a40c5225c34eda85ce4194f69080f453f2b369ce24e154656692dff0af4022aded93b57bfe2ca1fb5b4ad3dd24f6baf60d3fe19e99a9ea1594d07a5
 DIST xapian-bindings-1.3.1.tar.gz 1562988 SHA256 5c18ce77b08d2fcc738dadbf85448239d714aad27a0833436e32a82c2ff622c4 SHA512 e295ab93fe61e038bb5f95786f80ff36bc9cbc486c4d03e457fabc6efa97e7119411afa3aafd29786ab9237505b03c27fdb5d524fdb43db2c2f3550cd41c7396 WHIRLPOOL f76dcced799116569f5d4f6ba9245045a5fb3c8f7d64672997408fe0c11b72ef7d7ed24a1901d96777ac763d910be6bd378859dd952290bbbcae9dbe6452a2dd
 EBUILD xapian-bindings-1.2.13.ebuild 4574 SHA256 21226044f90466082102c2cd08ed8ecab3dfbff2b64121b4cbbba3de9985386a SHA512 cb77629ac668c8e2a6ff1e0a87cb732cc235525253e7249b262474848b202a9cc90950ec55e28e731c7873af67fe7d4221626a3b1c73d837338694ccf1b0764e WHIRLPOOL 1a2d3b3dc559dd7edaa1dc95423e973e66e479b8143ac7a874a713a4728841a3869b9e1eb9159f700a42b9693f696c965d3c7237569f1af2a96208504591a655
 EBUILD xapian-bindings-1.2.14.ebuild 4571 SHA256 328fcf61b59b6ffef6d776819c74d5969bc4265561ef061bc80ed2baecc652fc SHA512 ef31bcdf30347dd7ee1917a666967602dc1b3a98f1a42c8e5e0e9ec015c8dfa2ded8f114f7e1e54f8557ea64c8dd198c2fd382874c0e7a16b0d5486fc08d0459 WHIRLPOOL 5ce309104f0375a3060f93a22068fc1e0e4a6626241f437fd33648228fd829ab8a2861d7706eef4f02bfd9d9963ef2922d5a5fd1a6ce37b86b34b118beac32a5
 EBUILD xapian-bindings-1.2.15.ebuild 4797 SHA256 ff4459aafd8630122e2e3af0a940865933087889d728cbdc6c46427fc0aae7f0 SHA512 02915ade14f86af3332c19b00d72cab40fa148d03df50c68bb7c77ea883eaba029e7326c743e74b4deb7006ef0fa130362d1c6615310da1a342f962e5727469f WHIRLPOOL ef29878e0cf0805cb58af68d7a8dee7062af8e86ee90c26e94db40f558395f9fd6e544b4858c69c86f32004a5d5f37a1d1415396faac7206e4aa9c1a8c76e83b
 EBUILD xapian-bindings-1.2.16.ebuild 4334 SHA256 19c4c400df8e229e235d11ee441ab40a64d9d7c3a451529d21cad630e0a5cd73 SHA512 bfed63c7fb41dfb7f8f1afbc160372926d137ff6b32377d218ae193036692d524150ee5d003eb0098668f059a47c6be3baa32f0baf81c0982259ed2614edb11f WHIRLPOOL fbfad9b8673e6252be926f1c3f8bf1a5e0c9d6688fe78c8221ea689593a245020eb4b880562581df9e7d98e8b305cb4c5e17c647ae72dd3979fcfc6cd18a6931
 EBUILD xapian-bindings-1.2.17.ebuild 4334 SHA256 1126139d40b692a5c058968686871186df9626ac9bf3c187abd00633757fabd6 SHA512 bc0554529d755c0e92ec28d1d596349348c9ad59ed9349ccd8b9f16286141564454f9bba75afa9e915fbc7ba6005f24f1ccc026b671ed860f98e9bca8f1b73c6 WHIRLPOOL 8dbb50ff50a4930e9681636488ca07d6c3f8bdce5645a043541365cccccba4b4c7acdab9613ec93f329762c3b637c01ad98960c40392a548f7a4de076a5938cb
+EBUILD xapian-bindings-1.2.18.ebuild 4334 SHA256 54783d98fb4510b16a1651b082865103b30c47686575b3dde7daba607d9ed0fc SHA512 b272d6e706dc530f1c54fc640887adf2a7200d1f357aa9390e8273edbb0e7380af7c926dc02f59f23882a75abee37ed4d1918d4c1794013db52b4b343e396e6b WHIRLPOOL 81570f1a4588164fb7f3f5f8c6a1030b62a553cf6b8b71f5dcc13708b19c52efb14d85aa9da0f991b30ea502771d8917b2f52e1cb575453398d6a3973ee64bcc
 EBUILD xapian-bindings-1.3.1.ebuild 4453 SHA256 ba1fc91b22052ae3039b0b0ed2cfbb15d5e62eeb8e71929ea23a6b3bcc97205b SHA512 a2ea58cacb8937c15f31d6cee8e53396cbb68a9bb72b0c2462107a82c9135f3ed434a0c308d21a9752f8fd5e29969e1967e4d11639c974494576c8e31d84cf09 WHIRLPOOL a701e8ca07583e3a6f31018b538395e3b7d3faa14dd009ff8eb2d861619bb8956b7fe32b38a8f4c7909b613e0b598eaf896e4821e4f68386cc2744465e21c2ad
-MISC ChangeLog 12070 SHA256 9f45bcc050fb0c4008812901f97ac0522bd2a2be3242ecff33a70c4e087e9a7a SHA512 f3ba70aeb54416e0a36a99227466bea3ac56de2c25d4d37de2310bd3dd509a2c91695dacae60e0fd6932ff93f096ab0e470f76c2ab5a97d415bfc150eccde552 WHIRLPOOL b29bdd7424ad986c32a62e17802ef8a8d346687a9a1658fc282f849ffc75b411fbab91a58d762a018432648fe742732ca95eacdbe9b04e0ac0411a1d5209bf42
+MISC ChangeLog 12214 SHA256 6fe8fb46e2a037082fc600748dbcdd416bba6019e34727d6cf3f4a748aa4bee2 SHA512 6c67fdd649921775bdaebb8b338657b4022419751df1d0c979df6378f8b01985e2fa7dc3d7df02961aaf2498089fe88ee6f07d8f6909cf3cbae74666b70e7f67 WHIRLPOOL 07978c5769d874293462abaaff13423d46996bae40eaf2bc812ea074ea77eede66a994bc0a7dcebdda65689b6bac238bde860c243a93012b488fd464170313f8
 MISC metadata.xml 367 SHA256 e757cf120c1188c0010caaf7449e89deee52d8aa275f4f0c3b9cc0c097d28596 SHA512 e562b4dfbdcf62a3f860cd185dcd5fb2cf4067cb9b6c11c94669027c9cbae94bc437fa63e68b3b982a6bdda624087a60b24a269031fae2f3f975efb3d8e85d44 WHIRLPOOL 1314776082f07f5fdf74d15ad6b5093276b58f47e4dce35c0377e6a7baef0941bf567e43047e4ff80a726e2078d506c9029cd033cba8aeba9110b75cbbffa036
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS66LYAAoJEJOE+m71LUu6bqsQAJG0bGxpoe+Dq+rX6wFaNQBx
-YWqwLvEpcW+SDiEPTpIOFgWHqABqtTl13MO5pHSvRGcLGfkoMnr07eUCenb0Uenx
-uRpKi7uwKTVe8YvPuOD0C7xhERZt6/eWWM6BsUqPluZrJ4uZYKywYkflcMhVooPz
-ZdaIaMDbaxNbRpoxqFli1roYAo8vLrqW+hD6kfJ4ZyXgSzT9ZEJroFJak0kzsU5K
-GSaQXtq3lEaMAicTxIloeF711sQCNC/hoIr8pgkuaef15F54Pf1j0cdRdecJ+KDx
-FdvFzPiDPYjhT3FFXPwsotSyA8yAp8d/rJDEKIUI1LLyndkXTtThRgpLK/0eHf/j
-S9iurUEsoWN2tSaq+kvrKterCt1dKTqJA00dgMx7jZ23wCu/HzfBkh1MSdBCkQxg
-4RSVxKKqRzLIoV51De5ObW2zhyvZk5mtluq7JJrBlFCvSIx0IRQli4jyDScxf7Hp
-2F/BE+lWiKTeCdMtRZ9VJxOo4Tr4bxjjr7FsKlc7+KYCm4lZkbXzggYKRWMfIuFp
-cgJUv82MsEW4/hvnnGzmxsQKO4W6PHXearksEufA87LAeUW8j3wEiWcM67hLbsrQ
-xjUo0VfEqu2kk+GQw9/IFKo5Qwv5CrkHviDoXgdgGdeyozZ0xwdrRUR6XsFewF/v
-RU/bGBIN8B7CCf8CzcKY
-=gJqC
+iQIcBAEBCAAGBQJTqALcAAoJEJOE+m71LUu6fbgP/1DfJhn4R1T0wBMHAlJqpVDi
+aAdNZmV4xPnkW0plIp43fSdsI1BQplJlhsXxoEFqkf8cpZ9svRTcsmEgwxom+ujm
+7XMvnFZ0NWQZg//ao/PDbN1IEEPaEpE1OVFxq2mmGKsWsK3gFgaaTF2Ttd32aPuz
+9qcfinx3+aKMYCk66SFFXHfpIA3zzsDZ4NLBeXXPjdL/G5M6Nbf6JZc/qzGs4T7d
+aiVKjTupPDKALXOzvi+4d8hbsSOc4DmQpXbYJoBWBSET1v0gw2U9bJDql8FiWZgh
+mUyTz7yXaS09/HYGyLAyGxv0V1AFp9Ug/tcgXX2BPl0rFg/WCrX7clTkAPPs8RUS
+IkhaO9kwgz32T/JysjTDaJy8GFSZbpT2Q4zVkCTrG9+YyH983/EUysjoMKUYPttQ
+T14GOORdA4QI7VVzUvGKkp9cQ9qz3289bNoGtr58W3eeN45cdj6vpxkJ5ue8FDRN
+lDPXqgN3MLtkkVO3HP806YOOhjf4R6kLN3i+CMi6U+ez6lqLD2LiYoy9/plZiqn8
+vbKsArpG21jgj6djC+mDv7d6WnQV275BVGV8Jh2/o8+PnDfU3oN2yMxlgx8qG8/+
+IsS5m62ziqWkY3eYLYqPrSCp/MOWqGIMupfVpcZP1ZCgRtnBkTg6SBaNNNUF89xA
+Lemqhzhy+gYCuBCawuXB
+=FEBy
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild
new file mode 100644
index 000000000000..39f48ebd403e
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 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.18.ebuild,v 1.1 2014/06/23 10:34:24 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+PYTHON_REQ_USE="threads"
+USE_PYTHON='2.6 2.7'
+
+USE_PHP="php5-3 php5-4"
+
+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 java-pkg-opt-2 mono-env php-ext-source-r2 python
+inherit java-pkg-opt-2 php-ext-source-r2 python-r1
+
+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 )"
+IUSE="java lua perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
+
+COMMONDEPEND="=dev-libs/xapian-${PV}*
+	lua? ( >=dev-lang/lua-5.1 )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	tcl? ( >=dev-lang/tcl-8.1 )"
+#	mono? ( >=dev-lang/mono-1.0.8 )
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+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.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 perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with ruby) \
+		$(use_with tcl)
+#		$(use_with mono csharp) \
+
+	# 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
+#		building() {
+#			emake -C python \
+#				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"
+#		}
+		building() {
+			emake -C python \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian"
+				VERBOSE="1"
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_test() {
+	default
+
+	if use python; then
+		testing() {
+			emake -C python \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				VERBOSE="1" \
+				check
+		}
+		python_foreach_impl 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 -C python \
+				DESTDIR="${D}" \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				VERBOSE="1" \
+				install
+		}
+		python_foreach_impl 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 php_targets_php5-4; then
+		ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
+	fi
+}