From ec356aebd5adedb9de23cbb54ff42a783fb835e7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 26 Oct 2016 12:28:45 +0000
Subject: main/python2: fix cyclic dependency for tkinter

Add a separate apkbuild for tkinter to avoid the cyclic buildtime
dependency:
python -> tk -> libX11 -> libxcb -> xcb-proto -> python
---
 main/python2/APKBUILD | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'main/python2')

diff --git a/main/python2/APKBUILD b/main/python2/APKBUILD
index 7f0e26a21d..37b9de2aa2 100644
--- a/main/python2/APKBUILD
+++ b/main/python2/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=python2
 pkgver=2.7.12
 _verbase=${pkgver%.*}
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 arch="all"
@@ -18,12 +18,6 @@ source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
 	unchecked-ioctl.patch"
 builddir="$srcdir/Python-$pkgver"
 
-# To avoid circular dependency between python2 and x11 when bootstrapping.
-if [ -z "$BOOTSTRAP" ]; then
-	subpackages="$subpackages py2-tkinter:tkinter"
-	makedepends="$makedepends tk tk-dev"
-fi
-
 prepare() {
 	default_prepare || return 1
 
@@ -104,13 +98,6 @@ gdbm() {
 	_mv_files $(find usr/lib -name '*gdbm*')
 }
 
-tkinter() {
-	pkgdesc="A graphical user interface for the Python"
-	replaces="py-tkinter"
-
-	_mv_files usr/lib/python$_verbase/lib-dynload/_tkinter.so
-}
-
 md5sums="57dffcee9cee8bb2ab5f82af1d8e9a69  Python-2.7.12.tar.xz
 e2ea88671f8f838142323aedc417be48  musl-find_library.patch
 dada786a50fa332686a9b9260d84c110  unchecked-ioctl.patch"
-- 
cgit v1.2.3