From 2a66f00b87159f24ab0fd15b8bae48d01ca38af0 Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <aa@ocedo.com>
Date: Tue, 6 Jan 2015 14:10:17 +0200
Subject: [PATCH 1/2] python-pip: add preinst and postrm scripts

Thanks to Xuefer Tinys <xuefer@gmail.com> for reporting this.

Case is:
  opkg install python-setuptools - works fine
  opkg install python-pip - reports conflicts for
                            files easy_install.pth & site.py

So the solution is to add some preinst script that backs up those files
on 'opkg install python-pip' and moves them back on 'opkg remove python-pip'.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 lang/python-pip/Makefile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile
index d7404ba2c..9744b0176 100644
--- a/lang/python-pip/Makefile
+++ b/lang/python-pip/Makefile
@@ -44,6 +44,26 @@ define PyPackage/python-pip/filespec
 +|/usr/lib/python$(PYTHON_VERSION)
 endef
 
+# Backup these files, so that they do not clash with python-setuptools
+# If we install python-pip python-setuptools, we want these to be replaced,
+# since python-pip replaces python-setuptools (when installed)
+define Package/python-pip/preinst
+#!/bin/sh
+cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
+mv -f easy-install.pth easy-install.pth.old
+mv -f site.py site.py.old
+exit 0
+endef
+
+# And put them back on remove
+define Package/python-pip/postrm
+#!/bin/sh
+cd "$${IPKG_INSTROOT}$(PYTHON_PKG_DIR)"
+mv -f easy-install.pth.old easy-install.pth
+mv -f site.py.old site.py
+exit 0
+endef
+
 define PyPackage/python-pip/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin

From 1ee71252e73fab0545f4e5dbe031426dea390c1c Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <aa@ocedo.com>
Date: Tue, 6 Jan 2015 14:59:33 +0200
Subject: [PATCH 2/2] python-pip: remove windows binaries

Seem pip comes bundled with some Python libs.

Some more work will be needed to split them out of pip.
For now, some Windows executables are safe to remove.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 lang/python-pip/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile
index 9744b0176..d0607d16e 100644
--- a/lang/python-pip/Makefile
+++ b/lang/python-pip/Makefile
@@ -40,8 +40,10 @@ define Build/Compile
 	)
 endef
 
+PYTHON_PIP_PKG_DIR:=$(PYTHON_PKG_DIR)/pip-$(PKG_VERSION)-py$(PYTHON_VERSION).egg/pip
 define PyPackage/python-pip/filespec
-+|/usr/lib/python$(PYTHON_VERSION)
++|$(PYTHON_PKG_DIR)
+-|$(PYTHON_PIP_PKG_DIR)/_vendor/distlib/*.exe
 endef
 
 # Backup these files, so that they do not clash with python-setuptools