Gentoo Archives: gentoo-python

From: "Michał Górny" <mgorny@g.o>
To: gentoo-python@l.g.o
Cc: python@g.o, java@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-python] [PATCH jython2.5 ebuild 2/4] Readability.
Date: Sun, 02 Dec 2012 00:11:28
Message-Id: 1354407072-9871-2-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-python] [PATCH jython2.5 ebuild 1/4] Get rid of meaningless python.eclass use. by "Michał Górny"
1 ---
2 gx86/dev-java/jython/jython-2.5.3-r2.ebuild | 7 +++++--
3 1 file changed, 5 insertions(+), 2 deletions(-)
4
5 diff --git a/gx86/dev-java/jython/jython-2.5.3-r2.ebuild b/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
6 index 791038a..2dbdb9c 100644
7 --- a/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
8 +++ b/gx86/dev-java/jython/jython-2.5.3-r2.ebuild
9 @@ -47,7 +47,8 @@ java_prepare() {
10 jar -xf ../${PN}.jar META-INF/services || die
11 popd > /dev/null
12
13 - find \( -name '*.jar' -o -name '*.class' -o -name '*.pyc' -o -name '*.exe' \) -exec rm -v {} + || die
14 + find \( -name '*.jar' -o -name '*.class' \
15 + -o -name '*.pyc' -o -name '*.exe' \) -delete
16
17 epatch "${FILESDIR}/${PN}-2.5.2-build.xml.patch"
18
19 @@ -55,7 +56,9 @@ java_prepare() {
20 epatch "${FILESDIR}/${PN}-2.5.2-distutils_scripts_location.patch"
21 epatch "${FILESDIR}/${PN}-2.5.2-respect_PYTHONPATH.patch"
22
23 - use readline || rm -v src/org/python/util/ReadlineConsole.java || die
24 + if ! use readline; then
25 + rm -v src/org/python/util/ReadlineConsole.java || die
26 + fi
27 }
28
29 JAVA_ANT_REWRITE_CLASSPATH="yes"
30 --
31 1.8.0