SliTaz Repositories

     1.1 --- a/python/receipt	Sun Sep 23 04:34:15 2018 +0300
     1.2 +++ b/python/receipt	Sun Sep 23 04:37:56 2018 +0300
     1.3 @@ -26,14 +26,6 @@
     1.4  	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
     1.5  	sed -i.orig "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
     1.6  
     1.7 -	# If setuptools installed on the host, they will not be installed to the
     1.8 -	# $DESTDIR. Probably bug. Dirty hack using chroot to resolve it:
     1.9 -	rm /usr/bin/easy_install* /usr/bin/pip*
    1.10 -	rm -r /usr/lib/python2.7/site-packages/easy_install.py \
    1.11 -		  /usr/lib/python2.7/site-packages/pip* \
    1.12 -		  /usr/lib/python2.7/site-packages/pkg_resources \
    1.13 -		  /usr/lib/python2.7/site-packages/setuptools*
    1.14 -
    1.15  	case "$ARCH" in
    1.16  		arm*)
    1.17  			# First pass for build host tools
    1.18 @@ -91,9 +83,6 @@
    1.19  				chmod -v 755 $install/usr/lib/libpython2.7.so.1.0
    1.20  			;;
    1.21  	esac
    1.22 -
    1.23 -	# Upgrade pip unless it will throw noisy warnings on every pip-based package
    1.24 -	pip install --upgrade --root=$install pip
    1.25  }
    1.26  
    1.27  genpkg_rules() {
    1.28 @@ -111,7 +100,8 @@
    1.29  		python)
    1.30  			# Now pyconfig.h is required for Mercurial.
    1.31  			copy @std pyconfig.h @rm
    1.32 -			DEPENDS="bzlib expat gdbm libffi libsqlite3 ncurses \
    1.33 +			DEPENDS="python-setuptools python-pip \
    1.34 +			bzlib expat gdbm libffi libsqlite3 ncurses \
    1.35  			ncurses-libpanel openssl readline zlib"
    1.36  			;;
    1.37  		*-dev)

     2.1 --- a/python3/receipt	Sun Sep 23 04:34:15 2018 +0300
     2.2 +++ b/python3/receipt	Sun Sep 23 04:37:56 2018 +0300
     2.3 @@ -31,16 +31,14 @@
     2.4  
     2.5  	chmod 755 $install/usr/lib/libpython${VERSION%.*}m.so
     2.6  	chmod 755 $install/usr/lib/libpython${VERSION%%.*}.so
     2.7 -
     2.8 -	# Upgrade pip unless it will throw noisy warnings on every pip-based package
     2.9 -	pip3 install --upgrade --root=$install pip
    2.10  }
    2.11  
    2.12  genpkg_rules() {
    2.13  	case $PACKAGE in
    2.14  		python3)
    2.15  			copy @std pyconfig.h
    2.16 -			DEPENDS="bzlib expat gdbm liblzma libsqlite3 ncurses \
    2.17 +			DEPENDS="python3-setuptools python3-pip \
    2.18 +			bzlib expat gdbm liblzma libsqlite3 ncurses \
    2.19  			ncurses-libpanel openssl readline tcl tk xorg-libX11 zlib"
    2.20  			PROVIDE="py3k"
    2.21  			TAGS="LFS"