Date: Sunday, March 3, 2019 @ 14:00:48 Author: kgizdov Revision: 437461
remove python2 modules Modified: pythia8/trunk/PKGBUILD Deleted: pythia8/trunk/change_to_python2.patch -------------------------+ PKGBUILD | 75 +--------------------------------------------- change_to_python2.patch | 12 ------- 2 files changed, 3 insertions(+), 84 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-03 13:29:45 UTC (rev 437460) +++ PKGBUILD 2019-03-03 14:00:48 UTC (rev 437461) @@ -3,16 +3,16 @@ # Contributor: Stefano Campanella < stefanocampanella1729 at gmail dot com > pkgbase=pythia8 -pkgname=('pythia8' 'python-pythia8' 'python2-pythia8') +pkgname=('pythia8' 'python-pythia8') pkgver=8.2.40 _pkgid="${pkgbase:0:-1}${pkgver//./}" -pkgrel=7 +pkgrel=8 pkgdesc="High-energy physics events generator." arch=('x86_64') url="http://home.thep.lu.se/Pythia/" license=('GPL') depends=('python') -makedepends=('python' 'python2' 'fastjet' 'hepmc' 'lhapdf>=6.2' 'root') +makedepends=('python' 'fastjet' 'hepmc' 'lhapdf>=6.2' 'root') source=("http://home.thep.lu.se/~torbjorn/pythia8/${_pkgid}.tgz" 'pythia8.sh' 'change_to_python2.patch' @@ -27,20 +27,10 @@ python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' } -get_py2ver () { - python2 -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' -} - prepare() { cd "${srcdir}/${_pkgid}" patch -p1 -i "${srcdir}/respect_lib_suffix.patch" patch -p1 -i "${srcdir}/fix_lhapdf_build.patch" - - cd "${srcdir}" - cp -r "${_pkgid}" "${_pkgid}-py2" - - cd "${srcdir}/${_pkgid}-py2" - patch -p1 -i "${srcdir}/change_to_python2.patch" } build() { @@ -96,55 +86,6 @@ --with-root-lib=/usr/lib/root cd "${srcdir}/${_pkgid}" make - - # with Python2 - cd "${srcdir}/${_pkgid}-py2" - # # no such package yet - # --with-evtgen \ - # --with-evtgen-include=${_inc} \ - # --with-evtgen-lib=${_lib} \ - # # no such package yet - # --with-hepmc3 \ - # --with-hepmc3-include=${_inc} \ - # --with-hepmc3-lib=${_lib} \ - # # no such package yet - # --with-powheg \ - # --with-powheg-include=${_inc} \ - # --with-powheg-lib=${_lib} \ - # # no such package yet - # --with-promc \ - # --with-promc-include=${_inc} \ - # --with-promc-lib=${_lib} \ - ./configure --prefix=/usr \ - --prefix-include=${_inc} \ - --prefix-lib=${_lib} \ - --prefix-share=${_share} \ - --cxx-common="${CXXFLAGS} -fPIC" \ - --cxx-shared="-shared ${LDFLAGS} -ldl" \ - --enable-shared \ - --with-fastjet3 \ - --with-fastjet3-include=${_inc} \ - --with-fastjet3-lib=${_lib} \ - --with-gzip \ - --with-gzip-include=${_inc} \ - --with-gzip-lib=${_lib} \ - --with-hepmc2 \ - --with-hepmc2-include=${_inc} \ - --with-hepmc2-lib=${_lib} \ - --with-lhapdf5 \ - --with-lhapdf5-include=${_inc} \ - --with-lhapdf5-lib=${_lib} \ - --with-lhapdf6 \ - --with-lhapdf6-include=${_inc} \ - --with-lhapdf6-lib=${_lib} \ - --with-python \ - --with-python-include="/usr/include/python$(get_py2ver)" \ - --with-python-lib="/usr/lib/python$(get_py2ver)" \ - --with-root \ - --with-root-include=/usr/include/root \ - --with-root-lib=/usr/lib/root - cd "${srcdir}/${_pkgid}-py2" - make } package_pythia8() { @@ -183,13 +124,3 @@ install -Dm755 lib/pythia8.py "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/pythia8.py" install -Dm644 lib/__pycache__/pythia8.cpython-37.pyc "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/__pycache__/pythia8.cpython-37.pyc" } - -package_python2-pythia8() { - pkgdesc="Python2 bindings for Pythia." - depends=('pythia') - cd "${srcdir}/${_pkgid}-py2" - - install -Dm755 lib/_pythia8.so "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/_pythia8.so" - install -Dm755 lib/pythia8.py "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/pythia8.py" - install -Dm644 lib/pythia8.pyc "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/pythia8.pyc" -} Deleted: change_to_python2.patch =================================================================== --- change_to_python2.patch 2019-03-03 13:29:45 UTC (rev 437460) +++ change_to_python2.patch 2019-03-03 14:00:48 UTC (rev 437461) @@ -1,12 +0,0 @@ -diff -aur pythia8235-old/Makefile pythia8235-new/Makefile ---- pythia8235-old/Makefile 2018-11-28 00:54:49.657105842 +0000 -+++ pythia8235-new/Makefile 2018-11-28 00:54:26.030804438 +0000 -@@ -134,7 +134,7 @@ - $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h - SPLIT=`grep -n "PYTHON SOURCE" $< | cut -d : -f 1`;\ - SPLIT=$$[$$SPLIT+1]; tail -n +$$SPLIT $< | cut -d "/" -f 3- > $@ -- $(PYTHON_BIN)python -m compileall $(LOCAL_LIB) -+ $(PYTHON_BIN)python2 -m compileall $(LOCAL_LIB) - $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h\ - $(LOCAL_LIB)/pythia8.py $(wildcard $(LOCAL_INCLUDE)/*/*.h) |\ - $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)