* [gentoo-commits] gentoo-x86 commit in dev-java/jython: ChangeLog jython-2.5.1-r1.ebuild
@ 2010-03-19 9:59 Alistair Bush (ali_bush)
0 siblings, 0 replies; 2+ messages in thread
From: Alistair Bush (ali_bush) @ 2010-03-19 9:59 UTC (permalink / raw
To: gentoo-commits
ali_bush 10/03/19 09:59:30
Modified: ChangeLog
Added: jython-2.5.1-r1.ebuild
Log:
Prepare jython to be Python ABI provider #305103.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.68 dev-java/jython/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?r1=1.67&r2=1.68
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog 5 Mar 2010 21:18:48 -0000 1.67
+++ ChangeLog 19 Mar 2010 09:59:29 -0000 1.68
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/jython
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.67 2010/03/05 21:18:48 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.68 2010/03/19 09:59:29 ali_bush Exp $
+
+*jython-2.5.1-r1 (19 Mar 2010)
+
+ 19 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +jython-2.5.1-r1.ebuild:
+ Prepare jython to be Python ABI provider #305103.
*jython-2.5.1 (05 Mar 2010)
1.1 dev-java/jython/jython-2.5.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: jython-2.5.1-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.1 2010/03/19 09:59:29 ali_bush Exp $
JAVA_PKG_IUSE="source doc examples oracle"
#informix missing. This is a jdbc driver, similar to oracle use flag
#functionality.
EAPI="2"
inherit base java-pkg-2 java-ant-2
DESCRIPTION="An implementation of Python written in Java"
HOMEPAGE="http://www.jython.org"
PYVER="2.5.5"
SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
mirror://gentoo/${P}.tar.bz2"
LICENSE="PSF-2.2"
SLOT="2.5"
KEYWORDS="~amd64 ~x86"
IUSE=""
#>=dev-java/jdbc-mysql-3.1
#dev-java/jdbc-postgresql
CDEPEND="=dev-java/jakarta-oro-2.0*
>=dev-java/libreadline-java-0.8.0
dev-java/asm:3
oracle? ( dev-java/jdbc-oracle-bin:10.2 )
java-virtuals/servlet-api:2.5
!<=dev-java/freemarker-2.3.10
dev-java/constantine:0
dev-java/jline:0
dev-java/jna-posix:0
dev-java/jna:0
dev-java/antlr:0
dev-java/antlr:3
dev-java/stringtemplate:0
dev-java/xerces:2
dev-java/jsr223:0"
RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
dev-java/ant-core:0
dev-java/junit:0
${CDEPEND}"
java_prepare() {
epatch "${FILESDIR}/${P}-build.patch"
rm -Rfv org || die "Unable to remove class files."
find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
find "${WORKDIR}" -iname '*.pyc' | xargs rm -fv
java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar \
libreadline-java-0.8.jar
java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.3.jar
java-pkg_jar-from --into extlibs antlr antlr.jar antlr-2.7.7.jar
java-pkg_jar-from --into extlibs stringtemplate stringtemplate.jar \
stringtemplate-3.2.jar
java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar \
servlet-api-2.5.jar
java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
java-pkg_jar-from --into extlibs asm-3 asm-commons.jar \
asm-commons-3.1.jar
java-pkg_jar-from --into extlibs constantine constantine.jar \
constantine-0.4.jar
java-pkg_jar-from --into extlibs jline jline.jar \
jline-0.9.95-SNAPSHOT.jar
java-pkg_jar-from --into extlibs jna jna.jar
java-pkg_jar-from --into extlibs jna-posix jna-posix.jar
java-pkg_jar-from --build-only --into extlibs ant-core ant.jar
java-pkg_jar-from --build-only --into extlibs junit junit.jar \
junit-3.8.2.jar
java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar
java-pkg_jar-from --into extlibs jsr223 script-api.jar \
livetribe-jsr223-2.0.5.jar
echo "has.repositories.connection=false" > ant.properties
if use oracle; then
echo \
"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
>> ant.properties
fi
}
src_compile() {
local antflags=""
local pylib="../Python-${PYVER}/Lib"
antflags="${antflags} -Dpython.lib=${pylib}"
eant ${antflags} developer-build $(use_doc javadoc)
}
# Restrict tests as some dont compile and others (a couple) are broken.
RESTRICT="test"
src_test() {
#[exec] 311 tests OK.
#[exec] 3 tests skipped:
#[exec] test_subprocess test_urllib2net test_urllibnet
#[exec] 2 tests failed:
#[exec] test_pbcvm test_pkgimport
#[exec] 2 fails unexpected:
#[exec] test_pbcvm test_pkgimport
local antflags=""
antflags="${antflags} -Dgentoo.library.path=$(java-config -di jna-posix)"
antflags="${antflags} -Dpython.home=dist"
local pylib="../Python-${PYVER}/Lib"
antflags="${antflags} -Dpython.lib=${pylib}"
ANT_TASKS="ant-junit" eant ${antflags} test
}
src_install() {
dodoc README.txt NEWS ACKNOWLEDGMENTS README.txt
cd dist || die
java-pkg_newjar "${PN}-dev.jar"
local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
java_args="${java_args} -Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
java_args="${java_args} -Dpython.executable=${ROOT}/usr/bin/jython-${SLOT}"
java-pkg_dolauncher jython-${SLOT} \
--main "org.python.util.jython" \
--pkg_args "${java_args}"
sed -i -e 's_#!/bin/bash_#!/bin/bash\nunset EPYTHON_g' \
"${D}/usr/binjython-2.5"
java-pkg_register-optional-dependency jdbc-mysql
java-pkg_register-optional-dependency jdbc-postgresql
insinto /usr/share/${PN}-${SLOT}
doins -r Lib registry
use doc && java-pkg_dojavadoc Doc/javadoc
use source && java-pkg_dosrc ../src
cd "${S}"
use examples && java-pkg_doexamples Demo/*
}
pkg_postinst() {
einfo "Version of jython > 2.2* no longer has jythonc. Please see"
einfo "http://www.jython.org/Project/jythonc.html for details"
if use readline; then
elog
elog "To use readline you need to add the following to your registry"
elog
elog "python.console=org.python.util.ReadlineConsole"
elog "python.console.readlinelib=GnuReadline"
elog
elog "The global registry can be found in /usr/share/${PN}/registry"
elog "User registry in \$HOME/.jython"
elog "See http://www.jython.org/docs/registry.html for more information"
elog ""
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/jython: ChangeLog jython-2.5.1-r1.ebuild
@ 2010-03-20 13:17 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 2+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-03-20 13:17 UTC (permalink / raw
To: gentoo-commits
arfrever 10/03/20 13:17:21
Modified: ChangeLog jython-2.5.1-r1.ebuild
Log:
Make Distutils install scripts into /usr/bin (bug #305103). Respect PYTHONPATH variable (bug #305103).
(Portage version: 15835-svn/cvs/Linux x86_64)
Revision Changes Path
1.69 dev-java/jython/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 19 Mar 2010 09:59:29 -0000 1.68
+++ ChangeLog 20 Mar 2010 13:17:20 -0000 1.69
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/jython
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.68 2010/03/19 09:59:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.69 2010/03/20 13:17:20 arfrever Exp $
+
+ 20 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ jython-2.5.1-r1.ebuild,
+ +files/jython-2.5.1-distutils_scripts_location.patch,
+ +files/jython-2.5.1-respect_PYTHONPATH.patch:
+ Make Distutils install scripts into /usr/bin (bug #305103). Respect
+ PYTHONPATH variable (bug #305103).
*jython-2.5.1-r1 (19 Mar 2010)
1.2 dev-java/jython/jython-2.5.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild?r1=1.1&r2=1.2
Index: jython-2.5.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jython-2.5.1-r1.ebuild 19 Mar 2010 09:59:29 -0000 1.1
+++ jython-2.5.1-r1.ebuild 20 Mar 2010 13:17:20 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.1 2010/03/19 09:59:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.2 2010/03/20 13:17:20 arfrever Exp $
JAVA_PKG_IUSE="source doc examples oracle"
#informix missing. This is a jdbc driver, similar to oracle use flag
@@ -49,6 +49,8 @@
java_prepare() {
epatch "${FILESDIR}/${P}-build.patch"
+ epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
+ epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"
rm -Rfv org || die "Unable to remove class files."
find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
@@ -117,14 +119,13 @@
java-pkg_newjar "${PN}-dev.jar"
local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
- java_args="${java_args} -Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
+ java_args="${java_args} -Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
java_args="${java_args} -Dpython.executable=${ROOT}/usr/bin/jython-${SLOT}"
java-pkg_dolauncher jython-${SLOT} \
--main "org.python.util.jython" \
--pkg_args "${java_args}"
- sed -i -e 's_#!/bin/bash_#!/bin/bash\nunset EPYTHON_g' \
- "${D}/usr/binjython-2.5"
+ sed -e "1a unset EPYTHON" -i "${D}usr/bin/${PN}-${SLOT}" || die "sed failed"
java-pkg_register-optional-dependency jdbc-mysql
java-pkg_register-optional-dependency jdbc-postgresql
@@ -142,16 +143,14 @@
einfo "Version of jython > 2.2* no longer has jythonc. Please see"
einfo "http://www.jython.org/Project/jythonc.html for details"
- if use readline; then
- elog
- elog "To use readline you need to add the following to your registry"
- elog
- elog "python.console=org.python.util.ReadlineConsole"
- elog "python.console.readlinelib=GnuReadline"
- elog
- elog "The global registry can be found in /usr/share/${PN}/registry"
- elog "User registry in \$HOME/.jython"
- elog "See http://www.jython.org/docs/registry.html for more information"
- elog ""
- fi
+ elog
+ elog "To use readline you need to add the following to your registry"
+ elog
+ elog "python.console=org.python.util.ReadlineConsole"
+ elog "python.console.readlinelib=GnuReadline"
+ elog
+ elog "The global registry can be found in /usr/share/${PN}/registry"
+ elog "User registry in \$HOME/.jython"
+ elog "See http://www.jython.org/docs/registry.html for more information"
+ elog
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-20 13:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 9:59 [gentoo-commits] gentoo-x86 commit in dev-java/jython: ChangeLog jython-2.5.1-r1.ebuild Alistair Bush (ali_bush)
-- strict thread matches above, loose matches on Subject: below --
2010-03-20 13:17 Arfrever Frehtes Taifersar Arahesis (arfrever)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox