Drop old; fix correct installation and dependencies

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 54 insertions, 87 deletions

diff --git a/dev-embedded/pk2-la/ChangeLog b/dev-embedded/pk2-la/ChangeLog
index 89c9e4682a50..0d5320dd00c2 100644
--- a/dev-embedded/pk2-la/ChangeLog
+++ b/dev-embedded/pk2-la/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/pk2-la
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/ChangeLog,v 1.5 2012/04/29 16:49:04 josejx Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/ChangeLog,v 1.6 2015/03/21 15:06:20 jlec Exp $
+
+*pk2-la-1.1-r2 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> +pk2-la-1.1-r2.ebuild,
+  -pk2-la-1.0.ebuild, -pk2-la-1.1-r1.ebuild, -pk2-la-1.1.ebuild, metadata.xml:
+  Drop old; fix correct installation and dependencies
 
 *pk2-la-1.1-r1 (29 Apr 2012)
 
@@ -23,4 +29,3 @@
   28 May 2009; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
   +pk2-la-1.0.ebuild:
   Initial commit.
-
diff --git a/dev-embedded/pk2-la/Manifest b/dev-embedded/pk2-la/Manifest
index 23426bfc0e08..69caf4ba112a 100644
--- a/dev-embedded/pk2-la/Manifest
+++ b/dev-embedded/pk2-la/Manifest
@@ -1,7 +1,26 @@
-DIST pk2-la-1.0.tar.bz2 18990 SHA256 2099e33508dba7d000107f2d1cc68ed7f83e10914086f2add132496ea64e76fb SHA512 ee2cff63afbb0d39335e88c0696c0f3b29aee1ac07d2e892993dece54aff18d9c9ca6001628a525974b020067bb4f9df69b3ada64734a5260c10a00d206b5bfd WHIRLPOOL 20b2a0ec7fd42613369752b5e256c49814cb586a30f732f1f82a1d08a5e22a8046b4e15e4fd1d3328537b2e8aeaf1cc7be25d8bf4b1b2c0639bc4205b66b2efb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST pk2-la-1.1.tar.bz2 19222 SHA256 62de53e9543dd6a940a0c1c681422431ca2fb823919a29c4a1f2bea5410be2b3 SHA512 50e5b16149437afe92e1e987d3020099b1278f8ad207192e9b197f72ec1ab26c77307efd99976a1c6334bcea1899f38997fce27bd1e4caf70a04f851a8136f0d WHIRLPOOL 370d73c79ecce0a0da1f490fd61bdf484d30ad768636d8ad8faee0d28787ee1f5b2e7772f4f773b701969da67b0334295be034daa2c11b0e62446ada8a42d3f7
-EBUILD pk2-la-1.0.ebuild 741 SHA256 b167b76e410686efe17ba38e09dbdef80c8f81985628e37593d30d01c910089d SHA512 c390cae0ac7fa7767fa2634fda651e3cb39364754d3b10fe3c2d6331a9ff456b99fabb6268956144883b8048965107e4d0339abeba9ad447b4fc3d71302769a9 WHIRLPOOL 16aaf681edac74c513c4430e015c2d233fd9972c698a05b50657bef9ad0e683cc5a1fa0474c761893aa9f99393c71ff8a7f1f4ab34630bc5a439c4eba37dd89b
-EBUILD pk2-la-1.1-r1.ebuild 756 SHA256 12c44270cefb70fd28f6195384bf30680e656c9b1cd25af47deb0905e67f479a SHA512 7338a4a72a07f58fdfd19dc6b49dc1bc4d5b9d3c7050c57e98500b95bf96e52b5a76226c25f644c3f0c63aa53d9e6f14229ee6eb1d72c5403f402ca82ee01a1f WHIRLPOOL c0ccd045a1e39b301d2c1c80e13ab442dfac41a6376cc7cfcda69bd1ee1420f1fa6f22927b1abab40fae795fa96c7f37434e50a71d9040cb33b9bebb845da906
-EBUILD pk2-la-1.1.ebuild 741 SHA256 951de9ba3021502c61d44bb25ff29a179fd484fb9c7649ed63d9d2c9b9e4fd21 SHA512 865f84108b6fedb5e5dfbbec33ccbb44eeaad2880bc1333b7bcda231259df6d1a5c73a793bcc41b76e24f419ec0b247ca36ed74b4914c526db4737bbc13916fa WHIRLPOOL cb868d9b24d00568c42375211a78b72065037a7d91e2e98264e059adf5ae2c019ac0ee69ed7f0d6237538437ca3f0be344127d0fe0c6d5a98abf09c49a7fc35a
-MISC ChangeLog 796 SHA256 a6a2f2e38c614331a841a8f490242ad6b7b027313774871c8e895725be3261b3 SHA512 2f15c2abfabcd5526460ce87899445e732cb48d815060bad21b1028923909cb088bc880aae1c295bb007d0b69e429e718c29f745ca33ee3828ff4bc80e73c7b2 WHIRLPOOL eab5a7ddd2f7a96c96f9e307718714b61670912076a34888433e3d350c5bbe44fb134cdea9829914aab8bff8b60f4c08e9d4a36cf6b5af5f0a6af846e24b6689
-MISC metadata.xml 382 SHA256 ca565d7ca92af185680ea512d7fdc709ff2f1cfe059a3cd68ed62bd6542f6fde SHA512 5b460c27794f85a863dade7215346ad98739bb7e38e40ed1e65604b1df5163eee5fe5cd067be89585387296ae864d0c128734c113aaa4c0ba229b73bf13e3009 WHIRLPOOL a5ee271dc0ec8b21cdc75366bee9232c8fd5bbe7c7f2fbfa02433e9ae33d6e852088812f26d2875dcb96f9051e609fef6c528552aabab5b13ec7cbc552d531ff
+EBUILD pk2-la-1.1-r2.ebuild 732 SHA256 cfd29ca520a4694088e2efc7fa88f0e26198a97c708ed2c9ea7da1f68ef9855d SHA512 d16667ccd0e4369dba2500e4dbd3668c9d68b738bb5507e0fdda9c09c6eef782e390e97aec4288168015d430991b4e608da75f6422c19413135c799083ee8952 WHIRLPOOL 638bc03bc8b914f792f04fcc66971d21a6f0fc6d3d017a7c3ab7f1ca739c6c85fb5f60d9f1bcde72ded6c032d7b2c67ccbc45988cfc36ff3d4c8ba68de6cfdab
+MISC ChangeLog 1027 SHA256 a7fe19f74dadbd55e0a65fb0e7d5415369c133a8d1783785f2c995f16a17aec2 SHA512 54f27841999317a93f6e949108bae3532cfa7296d031f6698deeee0a0946b66177300d5391518c71b1a8e808f8fff6a983528b065e961c75e93f8cffd168f1bd WHIRLPOOL 6ad92449adaa5a285b25c1c0ea432381c669a80991f3bda5dc5f140123bfceb994f783822a364ce95323e56a434a5c8bb2042904cddb56ef1898d1d14aa85ba7
+MISC metadata.xml 398 SHA256 b95f31badf56d252d82eae91db4335c959a42aba39dd64f87c6f6ae712f06593 SHA512 3fa4e3d8c5f4b09a946d6c0c33cf02598f836611baff0e7833471ef4f67f4e18bfe7887ab11132f5c1f5bcba7d4f5167e7c2a7a225cff0cc73c4f5ef0824e46e WHIRLPOOL 6bcea41c9acb9263d8e586553b8977dc21913ba554b97ab3f1c43cdeccbb59934b2a03902fc74c72f4ac2af4399d6a235be5a0691766b5cd7fa14633c3d7df79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDYjtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirw7UP/jTcUaWaLRUHLgBvkb0DSo75
+o6GDqWlG+oAdtBeIorNcVp+I1a0s98fKBQMFQpeF1n+ggNz9jQqUZgSAA+adgsJl
+nBOCza6Prka/S42F01Tm5rFFv6uWui2OfbJCEUPQ1Q/5ml5nvD4mdRYKURY0MAuJ
+dJSyDzsXaJ4CemDhe+dfDzQwNZ+hy3i+5bcxvwVyUDuBxQjDMNtKRPZkwf8uk3HE
+zN3cNqGOfV391HzQeT1gI2+Ws173KJFas+I1IseOBzg/60pOSY6ciNGfhMaCabUT
+uO71VsAWWoSbqVpWYNv7ElkIMMCcXZlXCYazlZhxDgm6G9XV3afIHpM76iB1uqmE
+k/Hb/ycelCqpqi/2w4hlcf+5B0moKX8NBUEP8CjfmIB2nMSVE/0NrPoAj4a3WpKL
+8VN0w+UXSXHzSjv8tbN3uVbrClFdDzDZkUJkeyIR3k7lTyTGG9igueEYtQw9RJxC
+DsUt3IyIf35MUPgAOK7/V1MwInBa3VKsobOpvL+36YiR3XGiYQVlzp2yf2M8o2Iy
+NWDdOX8cyeG+fAE/EJjBGCtB1y3slO+4f6G84KKYflJLLrKTv6opiF7JAGtidwtx
+G09S6YCaRJ7KrUEPVtIVVYHS6/G5fHdNIxlrfZXcPj5xXhOMm8Of8Jk+UO3PUvsl
+aNa0fdI6SMgSgSV8pFIf
+=OvoK
+-----END PGP SIGNATURE-----
diff --git a/dev-embedded/pk2-la/metadata.xml b/dev-embedded/pk2-la/metadata.xml
index dd14f2165e2b..5b9900437e92 100644
--- a/dev-embedded/pk2-la/metadata.xml
+++ b/dev-embedded/pk2-la/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>embedded</herd>
-	<longdescription>
+  <herd>embedded</herd>
+  <longdescription>
 		pk2-la allows the Microchip PICkit2 programmer to be used as a
 		Logic Analyzer and I/O Probe.
 	</longdescription>
-	<maintainer><email>josejx@gentoo.org</email><name>Joseph Jezak</name></maintainer>
+  <maintainer>
+    <email>josejx@gentoo.org</email>
+    <name>Joseph Jezak</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild b/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild
deleted file mode 100644
index 078b8e332930..000000000000
--- a/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1-r1.ebuild,v 1.1 2012/04/29 16:49:04 josejx Exp $
-
-EAPI="2"
-
-DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
-HOMEPAGE="http://sourceforge.net/projects/pk2-la"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyusb:0
-	dev-python/pygtk"
-
-src_compile() {
-	### Nothing to compile
-	echo
-}
-
-src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
-}
diff --git a/dev-embedded/pk2-la/pk2-la-1.0.ebuild b/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
index 7faa3114c0d3..b64cf4db0cc6 100644
--- a/dev-embedded/pk2-la/pk2-la-1.0.ebuild
+++ b/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
@@ -1,6 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.0.ebuild,v 1.3 2009/05/29 17:55:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild,v 1.1 2015/03/21 15:06:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
 
 DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
 HOMEPAGE="http://sourceforge.net/projects/pk2-la"
@@ -13,18 +19,14 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/pyusb
-	dev-python/pygtk"
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyusb:0[${PYTHON_USEDEP}]
+	"
 
-src_compile() {
-	### Nothing to compile
-	echo
-}
+src_compile() { :; }
 
 src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
+	python_foreach_impl python_doscript ${PN}
+
+	dodoc README LA-Format IO-Format CHANGELOG
 }
diff --git a/dev-embedded/pk2-la/pk2-la-1.1.ebuild b/dev-embedded/pk2-la/pk2-la-1.1.ebuild
deleted file mode 100644
index 140aafbafbb2..000000000000
--- a/dev-embedded/pk2-la/pk2-la-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2-la/pk2-la-1.1.ebuild,v 1.1 2010/03/07 02:38:48 josejx Exp $
-
-DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
-HOMEPAGE="http://sourceforge.net/projects/pk2-la"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyusb
-	dev-python/pygtk"
-
-src_compile() {
-	### Nothing to compile
-	echo
-}
-
-src_install() {
-	### Install the program
-	exeinto /usr/bin
-	doexe "${S}/pk2-la"
-	### Install the documentation
-	dodoc "${S}/README" "${S}/LA-Format" "${S}/IO-Format" "${S}/CHANGELOG"
-}