* [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: metadata.xml ChangeLog xapian-bindings-1.2.7-r2.ebuild xapian-bindings-1.2.7-r1.ebuild
@ 2011-09-18 8:43 Anthony G. Basile (blueness)
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile (blueness) @ 2011-09-18 8:43 UTC (permalink / raw
To: gentoo-commits
blueness 11/09/18 08:43:28
Modified: metadata.xml ChangeLog
Added: xapian-bindings-1.2.7-r2.ebuild
Removed: xapian-bindings-1.2.7-r1.ebuild
Log:
Fix java bindings, bug #176419
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.5 dev-libs/xapian-bindings/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 16 Sep 2011 14:06:00 -0000 1.4
+++ metadata.xml 18 Sep 2011 08:43:28 -0000 1.5
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>no-herd</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
1.25 dev-libs/xapian-bindings/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 16 Sep 2011 19:53:26 -0000 1.24
+++ ChangeLog 18 Sep 2011 08:43:28 -0000 1.25
@@ -1,6 +1,13 @@
# 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.24 2011/09/16 19:53:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.25 2011/09/18 08:43:28 blueness Exp $
+
+*xapian-bindings-1.2.7-r2 (18 Sep 2011)
+
+ 18 Sep 2011; Anthony G. Basile <blueness@gentoo.org>
+ -xapian-bindings-1.2.7-r1.ebuild, +xapian-bindings-1.2.7-r2.ebuild,
+ metadata.xml:
+ Fix java bindings, bug #176419
*xapian-bindings-1.2.7-r1 (16 Sep 2011)
1.1 dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.7-r2.ebuild?rev=1.1&content-type=text/plain
Index: xapian-bindings-1.2.7-r2.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.7-r2.ebuild,v 1.1 2011/09/18 08:43:28 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] only message in thread
only message in thread, other threads:[~2011-09-18 8:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-18 8:43 [gentoo-commits] gentoo-x86 commit in dev-libs/xapian-bindings: metadata.xml ChangeLog xapian-bindings-1.2.7-r2.ebuild xapian-bindings-1.2.7-r1.ebuild 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