Drop old; fix correct installation and dependencies

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 29 insertions, 81 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/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"
-}