diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 73cc637cd89..e6b22b4c0c7 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -8,17 +8,14 @@ _desc="Python programming language" pkgname=python3-tkinter -version=3.13.1 +version=3.13.2 revision=1 build_style="gnu-configure" configure_args="--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi --without-ensurepip" -pycompile_dirs=" - usr/lib/python${version%.*}/tkinter - usr/lib/python${version%.*}/turtledemo - usr/lib/python${version%.*}/turtle.py" +pycompile_dirs="${py3_lib}/tkinter ${py3_lib}/turtledemo ${py3_lib}/turtle.py" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel" @@ -28,7 +25,7 @@ maintainer="Andrew J. Hesford " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz" -checksum=9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9 +checksum=d984bcc57cd67caab26f7def42e523b1c015bbc5dc07836cf4f0b63fa159eb56 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" @@ -63,6 +60,7 @@ do_check() { } do_install() { + mkdir -p ${wrksrc}/tmp-destdir/usr/lib ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE} @@ -71,25 +69,31 @@ do_install() { # We only care for the idle and tkinter modules. vmkdir usr/bin - vmkdir usr/lib/python${version%.*}/lib-dynload - mv ${wrksrc}/tmp-destdir/usr/bin/idle${version%.*} \ - ${DESTDIR}/usr/bin/idle${version%.*} + vmkdir "${py3_lib}/lib-dynload" + + local _idle="idle${version%.*}" + local _src_py_lib="${wrksrc}/tmp-destdir/${py3_lib}" + local _dst_py_lib="${DESTDIR}/${py3_lib}" + + mv "${wrksrc}/tmp-destdir/usr/bin/${_idle}" "${DESTDIR}/usr/bin" + mv "${_src_py_lib}/lib-dynload"/_tkinter.*.so "${_dst_py_lib}/lib-dynload" + for lib in idlelib tkinter turtledemo turtle.py; do - mv ${wrksrc}/tmp-destdir/usr/lib/python${version%.*}/${lib} \ - ${DESTDIR}/usr/lib/python${version%.*}/ + mv "${_src_py_lib}/${lib}" "${DESTDIR}/${py3_lib}" done - mv ${wrksrc}/tmp-destdir/usr/lib/python${version%.*}/lib-dynload/_tkinter.cpython-*.so \ - ${DESTDIR}/usr/lib/python${version%.*}/lib-dynload/ - ln -sf idle${version%.*} ${DESTDIR}/usr/bin/idle3 + + ln -sf "${_idle}" ${DESTDIR}/usr/bin/idle3 + ln -sf "${_idle}" ${DESTDIR}/usr/bin/idle } idle-python3_package() { short_desc="${_desc} - IDE for Python3 using Tkinter" - pycompile_dirs="usr/lib/python${version%.*}/idlelib" + pycompile_dirs="${py3_lib}/idlelib" depends="${sourcepkg}-${version}_${revision}" + conflicts="python<3.0.0_1 python2<=2.7.18.11_1 python3<=3.13.1_1" pkg_install() { - vmove usr/bin/idle3* - vmove usr/lib/python${version%.*}/idlelib + vmove usr/bin/idle* + vmove "${py3_lib}/idlelib" vinstall ${FILESDIR}/idle3.xpm 644 usr/share/pixmaps vinstall ${FILESDIR}/idle3.desktop 644 usr/share/applications }