From b613ca61c11594b615060e4bf66e903bef236346 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 18 Nov 2015 23:49:43 +0100
Subject: [PATCH] pylint: merge -gui subpkg into main pkg

---
 srcpkgs/pylint-gui                          |  1 -
 srcpkgs/pylint/INSTALL.msg                  |  1 +
 srcpkgs/pylint/python3.4-pylint.INSTALL.msg |  1 +
 srcpkgs/pylint/template                     | 41 +++++----------------
 srcpkgs/python3.4-pylint-gui                |  1 -
 5 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 120000 srcpkgs/pylint-gui
 create mode 100644 srcpkgs/pylint/INSTALL.msg
 create mode 100644 srcpkgs/pylint/python3.4-pylint.INSTALL.msg
 delete mode 120000 srcpkgs/python3.4-pylint-gui

diff --git a/srcpkgs/pylint-gui b/srcpkgs/pylint-gui
deleted file mode 120000
index 54b18e249c..0000000000
--- a/srcpkgs/pylint-gui
+++ /dev/null
@@ -1 +0,0 @@
-pylint
\ No newline at end of file
diff --git a/srcpkgs/pylint/INSTALL.msg b/srcpkgs/pylint/INSTALL.msg
new file mode 100644
index 0000000000..eaa54ff8c4
--- /dev/null
+++ b/srcpkgs/pylint/INSTALL.msg
@@ -0,0 +1 @@
+To use pylint GUI install python-tkinter.
diff --git a/srcpkgs/pylint/python3.4-pylint.INSTALL.msg b/srcpkgs/pylint/python3.4-pylint.INSTALL.msg
new file mode 100644
index 0000000000..bb559c128b
--- /dev/null
+++ b/srcpkgs/pylint/python3.4-pylint.INSTALL.msg
@@ -0,0 +1 @@
+To use pylint GUI install python3.4-tkinter.
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index f41ec5f8fb..7d2f0b69d7 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,8 +1,8 @@
 # Template file for 'pylint'
 pkgname=pylint
 version=1.4.4
-revision=2
-replaces="pylint<1.4.4_1"
+revision=3
+replaces="pylint-gui>=0"
 noarch=yes
 wrksrc="pylint-${version}"
 build_style=python-module
@@ -11,7 +11,6 @@ hostmakedepends="python-setuptools python3.4-setuptools"
 depends="python-setuptools python-astroid python-six"
 pycompile_module="pylint"
 short_desc="Python2 code static checker"
-_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.pylint.org/"
 license="GPL-2"
@@ -23,12 +22,12 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
 
 	# python2/3 scripts and man pages
+	rm -f ${DESTDIR}/usr/bin/*
 	for f in epylint pylint pylint-gui pyreverse symilar; do
-		rm -f ${DESTDIR}/usr/bin/${f}
 		vbin build-2.7/scripts-2.7/${f}
-		vbin build-3.4/scripts-3.4/${f} python3-${f}
+		vbin build-3.4/scripts-3.4/${f} ${f}3.4
 		vman man/${f}.1
-		vman man/${f}.1 python3-${f}.1
+		vman man/${f}.1 ${f}3.4.1
 	done
 
 	# install example config and emacs files
@@ -38,39 +37,17 @@ post_install() {
 	vsconf elisp/pylint-flymake.el
 }
 
-pylint-gui_package() {
-	noarch=yes
-	short_desc+=" - Tk interface"
-	depends="${sourcepkg}-${version}_${revision} python-tkinter"
-	pycompile_module="pylint"
-	pkg_install() {
-		vmove usr/bin/pylint-gui
-		vmove usr/lib/python2.7/site-packages/pylint/gui.py
-		vmove usr/share/man/man1/pylint-gui.1
-	}
-}
-python3.4-pylint-gui_package() {
-	noarch=yes
-	short_desc="${_short_desc} - Tk interface"
-	depends="python3.4-pylint-${version}_${revision} python3.4-tkinter"
-	pycompile_version="3.4"
-	pycompile_module="pylint"
-	pkg_install() {
-		vmove usr/bin/python3-pylint-gui
-		vmove usr/lib/python3.4/site-packages/pylint/gui.py
-		vmove usr/share/man/man1/python3-pylint-gui.1
-	}
-}
 python3.4-pylint_package() {
 	noarch=yes
-	short_desc="${_short_desc}"
+	replaces="python3.4-pylint-gui>=0"
+	short_desc="${short_desc/Python2/Python3.4}"
 	depends="python3.4-setuptools python3.4-astroid python3.4-six"
 	pycompile_version="3.4"
 	pycompile_module="pylint"
 	pkg_install() {
-		vmove usr/bin/python3-*
+		vmove usr/bin/*3.4
 		vmove usr/lib/python3.4
-		vmove usr/share/man/man1/python3-*.1
+		vmove usr/share/man/man1/*3.4.1
 		vsconf examples/pylintrc
 		vsconf examples/pylintrc_camelcase
 		vsconf elisp/pylint.el
diff --git a/srcpkgs/python3.4-pylint-gui b/srcpkgs/python3.4-pylint-gui
deleted file mode 120000
index 54b18e249c..0000000000
--- a/srcpkgs/python3.4-pylint-gui
+++ /dev/null
@@ -1 +0,0 @@
-pylint
\ No newline at end of file