[arch-commits] Commit in jython/trunk (PKGBUILD)

[Chih-Hsuan Yen]

    Date: Thursday, April 9, 2020 @ 03:46:37
  Author: yan12125
Revision: 612883

upgpkg: jython 2.7.2-1

Fixes FS#45315 by removing binaries conflicting with pip/easy-install from CPython.

The new version also fixes compatibility with terminfo from ncurses 6.1.

I cannot find an official announcement for the new PGP key. The most relevant discussion I can find is a mail mentioning this key [1].

[1] https://sourceforge.net/p/jython/mailman/message/36972065/

Modified:
  jython/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-09 01:34:21 UTC (rev 612882)
+++ PKGBUILD	2020-04-09 03:46:37 UTC (rev 612883)
@@ -3,13 +3,14 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier at aur.archlinux.org>
 # Contributor: Richard Murri <admin at richardmurri.com>
 pkgname=jython
-pkgver=2.7.1
-pkgrel=2
+pkgver=2.7.2
+pkgrel=1
 pkgdesc="An implementation of the Python language written in Java"
 arch=('any')
 url="https://www.jython.org/"
 license=('PSF' 'APACHE' 'custom')
-depends=('java-environment' 'bash' 'python')
+# JDK >= 9 leads to "illegal reflective access" https://bugs.jython.org/issue2656
+depends=('java-environment=8' 'bash' 'python')
 backup=('opt/jython/registry')
 options=('!emptydirs')
 install='jython.install'
@@ -16,10 +17,13 @@
 source=(https://search.maven.org/remotecontent?filepath=org/python/$pkgname-installer/$pkgver/$pkgname-installer-$pkgver.jar{,.asc}
         'README.ArchLinux'
         'jython.sh')
-validpgpkeys=('1AC6FA76887C81B0A870FFA03979A71621665974')  # Frank Wierzbicki
+validpgpkeys=(
+  '1AC6FA76887C81B0A870FFA03979A71621665974' # Frank Wierzbicki
+  'C8C4B9DC1E031F788B12882B875C3EF9DC4638E3' # Jeff Allen
+)
 noextract=(${pkgname}_installer-$pkgver.jar)
 
-sha512sums=('11cf3d1227af445fc0944c62a47d747c32cc2478dd03ac5ee8a533aac67ae7ec52cde207a4bb845a6d0284001271e6d82b3722c809c2141384b747ae5a11a2aa'
+sha512sums=('d3ae09ebcb1ad27123d1b325729a18aa9e793039ca3428167455ce51217f10735949d2acea39f89e5414015c97bdd319657aced3753b764dddb09200e8cff40e'
             'SKIP'
             '0ab0237d456f859b2cbb0739264bb978ad98b2c52153e89fc131aa60edf7837f41617c0e53cbde05688dfc0d6fb08f1d02ebbd41da99b07af72e34a11a83f0b9'
             'c1aaf79f1cfba165fd4a03be016ac8afcc5024972a9626060f57ced0bf4dad93ccdd9ac303bdc8a5ed6b9bcb3307d152dfff2682308c740b6d2db44c2cbaf1b4')
@@ -27,6 +31,22 @@
 package() {
     java -jar jython-installer-$pkgver.jar -s -t standard -d "$pkgdir"/opt/$pkgname
 
+    pushd "$pkgdir"/opt/$pkgname/bin
+
+    # Fix shebangs and avoid conflicts between jython and python2-{setuptools,pip}
+    # https://bugs.archlinux.org/task/45315
+    rm -v easy_install pip pip2
+    for prog in easy_install-2.7 pip2.7 ; do
+      sed -i "s#$pkgdir##" "$prog"
+    done
+    mv -v easy_install-2.7 easy_install-jython
+    mv -v pip2.7 pip-jython
+
+    popd
+
+    # Fix permissions
+    find "$pkgdir" -exec chmod go+r {} \;
+
     install -m644 -D "$srcdir"/jython.sh "$pkgdir"/etc/profile.d/jython.sh
     install -m644 -D "$srcdir"/README.ArchLinux "$pkgdir"/usr/share/doc/$pkgname/README.ArchLinux