diff --git a/srcpkgs/idle-python b/srcpkgs/idle-python index 0d091609e96..d8654aa0e2f 120000 --- a/srcpkgs/idle-python +++ b/srcpkgs/idle-python @@ -1 +1 @@ -python-tkinter \ No newline at end of file +python \ No newline at end of file diff --git a/srcpkgs/idle-python2 b/srcpkgs/idle-python2 new file mode 120000 index 00000000000..5e2384079e0 --- /dev/null +++ b/srcpkgs/idle-python2 @@ -0,0 +1 @@ +python2-tkinter \ No newline at end of file diff --git a/srcpkgs/python-tkinter b/srcpkgs/python-tkinter index 5e2384079e0..d8654aa0e2f 120000 --- a/srcpkgs/python-tkinter +++ b/srcpkgs/python-tkinter @@ -1 +1 @@ -python2-tkinter \ No newline at end of file +python \ No newline at end of file diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 39d06f37bdc..e74e2ee1ce6 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -14,3 +14,15 @@ python-devel_package() { short_desc+=" - development files" build_style=meta } + +python-tkinter_package() { + depends="python${version%%.*}-tkinter" + short_desc+=" - GUI toolkit" + build_style=meta +} + +idle-python_package() { + depends="idle-python${version%%.*}" + short_desc="IDE for Python${version%%.*} using Tkinter" + build_style=meta +} diff --git a/srcpkgs/python2-tkinter/template b/srcpkgs/python2-tkinter/template index 5534e81ae03..4f39642f4ee 100644 --- a/srcpkgs/python2-tkinter/template +++ b/srcpkgs/python2-tkinter/template @@ -8,7 +8,7 @@ _desc="Interpreted, interactive, object-oriented programming language" pkgname=python2-tkinter version=2.7.18.10 -revision=1 +revision=2 _commit=3e06fbb19d735aea134b327ad7af28f17eee5d88 pycompile_dirs="usr/lib/python2.7/lib-tk" hostmakedepends="pkg-config" @@ -77,7 +77,7 @@ do_install() { ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2 } -idle-python_package() { +idle-python2_package() { short_desc="${_desc} - IDE for Python2 using Tkinter" pycompile_dirs="usr/lib/python2.7/idlelib" depends="${sourcepkg}-${version}_${revision}" @@ -88,9 +88,3 @@ idle-python_package() { vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications } } - -python-tkinter_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" (transitional dummy package)" - build_style=meta -}