Bump to EAPI5, remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 14 insertions, 69 deletions

diff --git a/dev-embedded/pk2cmd/ChangeLog b/dev-embedded/pk2cmd/ChangeLog
index 6126be301f16..08dc08a2c4ea 100644
--- a/dev-embedded/pk2cmd/ChangeLog
+++ b/dev-embedded/pk2cmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/pk2cmd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.6 2012/05/25 08:01:20 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.7 2015/01/05 15:24:14 mrueg Exp $
+
+  05 Jan 2015; Manuel Rüger <mrueg@gentoo.org> -pk2cmd-1.12.0-r1.ebuild,
+  pk2cmd-1.20.ebuild:
+  Bump to EAPI5, remove old.
 
   25 May 2012; Samuli Suominen <ssuominen@gentoo.org> pk2cmd-1.12.0-r1.ebuild,
   pk2cmd-1.20.ebuild:
@@ -33,4 +37,3 @@
   19 Sep 2008; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
   +pk2cmd-1.12.0.ebuild:
   Initial ebuild import.
-
diff --git a/dev-embedded/pk2cmd/Manifest b/dev-embedded/pk2cmd/Manifest
index 80081a36eea7..33e2401ef6ac 100644
--- a/dev-embedded/pk2cmd/Manifest
+++ b/dev-embedded/pk2cmd/Manifest
@@ -1,8 +1,6 @@
 AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 SHA256 c59040ad6b5d840f3e55990fa58230610aac9164196ea0b3255fc1f4616c882d SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638 WHIRLPOOL a22205d9a8b1c95f9fc341e5f3db41df47ec0787ea44267c19c58f7ad47f3beda411d1fcdf003380b41960a34a0c83cd03fb6bd62cb4bca05669484d6e48257b
 AUX pk2cmd-add-share-dir-for-dev-file.patch 671 SHA256 50c304a9b6465639df02599f2bdff7c3d8c45d4aa68be00727c649d43e65b078 SHA512 9e9a7fcbec7ca3c9d0f2204eb60eb8d984248f21a6b7a2f6c11ff8fbd8da64e1bb5a92a0e5283542c7c5cc3e4cb0ea0438687c2bbe449804e6c86426307f4d44 WHIRLPOOL e6eaa2c352f694442f2483a195dc9a3238320ded41659bfb364ad935b6d10db3bcc07cce0ae7e1f64d4ce258431a4d42db471439f183e99c8630e6d336cfbddf
-DIST pk2cmdv1.12.0LinuxMacSource.tar.gz 360705 SHA256 59ff6369f5fcedfea46cb10a2c8bfe7fe0405475f5248fc7587d1270358fc333 SHA512 7b5bb5ad705316b6b54002604b6cab641062dcbdc18bd21eca8c8dbdc5fc6643c20cc74e2d277228ff703c9c6c1f0b4e1f7d33c1c63d47f299d072e8cf498b7c WHIRLPOOL 063ffe386b5a94f11edf7f76b2bf0530b3c622a14c0de5f6561fd0df691aad8f3473ad93774cb4cc1c7abd5323a52c27a1afbe225bf1fe9794b75b165bd3be33
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 SHA256 903027de5036eda3a648decece4acfcefe91e754ef0d4eacba0e5ba8b18857fa SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24 WHIRLPOOL f4f36412d4e653a20866bcbe9ec25b94e8ff4e75c1ae2e4944a42682832c9b64b683248bc559e73b976902906d2959492867f055291588cf66d9b83838174c75
-EBUILD pk2cmd-1.12.0-r1.ebuild 1432 SHA256 12c0f0ca895231f2f1ed1f179c48288c2d504cbab099146cf448b77e39d94935 SHA512 ce1969fc77e70ed9f9281b5078f8ba48ab9610508f3fe13496b2ae63e99593bc1b1efdbc402b314bedacf8ea3842aab1b503f915d995b5365f2bdbd8d60e0152 WHIRLPOOL 7a7f15fb0e5e7a3a5e54eb3cc46637cd6fbf24d79222e2bbc867dcee0ec09eb7d3273814da154eeaa8e7bc5878fba6022f515a7d16fb0b99d1b8db3d6ab5e974
-EBUILD pk2cmd-1.20.ebuild 1433 SHA256 c30afe0532305cf8555130c519f4a9ba7970e7d67509e2ebaed2c583c1b1bdd0 SHA512 d5a2225219e3b9210ebfa6ba7715b2196247a90bc4a30bdfafb0f5d2dfade083faa6acb103d4ab2f5489427dfc7d053a44243ad813ba1f14d39cd7cdbe9cbe50 WHIRLPOOL d1d37d4b8c577167e0a39aedf2baf3022bd791c008bcdd226ffa56e00a8bd78eb1472b871eeb3f5eee872597652a993c59fe1548ffd111266e64f486b7510c26
-MISC ChangeLog 1335 SHA256 b57a9bca13633a141af4fa89dc4ffb251473dc9fcef2834097e3cc28f5f3e92d SHA512 ae7e9867bd54e8849153866c95ab298d3f88db8ccec4d3c32f5e783344aa67af28c87f7c8731f4c0f83d91ecfff572e12a92b123d2681ce825882a8fe6a7dfdb WHIRLPOOL 8c4b49f1ad8cf3b68d57b45c6c2843e5506e05196222b0bb81843ed3971011450774ec61bf75cf64021f8d3ddc00e55a5a8b1367c950130eac8ed170ce00a7e9
+EBUILD pk2cmd-1.20.ebuild 1381 SHA256 b767fc8e830893bfc42a8dc31ada4879d485e21f84adca1322ecdbfcdf3dabae SHA512 7e6ff60fa63af700a8547a471b62dd7f57a8a48f06a4743fbcef24eed4bd3c83c7ecabb5aa71a40007f623539326cdfcf768493398a0b75b2ff689de1a239843 WHIRLPOOL 5a82cb51d642765b50af71e0ecfb0cc677aeef37e5ef1e31acfcb103e14987def6b985de3ca3c0ac8fb96fa8e5307ad884e71f507e91e5257a0db16e9ca6621f
+MISC ChangeLog 1456 SHA256 7432abba7fb3a4350091d81f338bb162c4137b6c9354d5f1bd3af4050373a0c4 SHA512 c8a3f96eb0190b5c643407d028330a512be924eee977c2cfcad7e2916a9d45dfb5ececa53f6de594c891d52317d2958bb500d4b29d972ff0fe4c6a899b79a558 WHIRLPOOL 0baf36c2d24d87c6e085576dd33f42055a941d8a860f5e28b4c6a0dee5cf87ab8969e25ff9b5a141e6e66c4ecc1272a00c3e4b5cc854110263b29427b3911d37
 MISC metadata.xml 346 SHA256 08e2004b3b21d1731124186daca5cbc2317b664b41ecde75a470d9af910e5fa7 SHA512 d8a82aa40d3f8af7b7e43e84f7fa883705f72b424bd99ef7304a6b2773c130319f98b5ac317f7b693acabe9f8d5e47adafb8682fde3a655b9a190da34f255d1d WHIRLPOOL 6f11339ed64e32c96970f02111b1845e3037b715f0660575e988009c2e41259a987c47b43a335e504af6640a315289c85f7dfa0c0989599dabad32c6a09f8218
diff --git a/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild
deleted file mode 100644
index b377eb19ef11..000000000000
--- a/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,53 +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/pk2cmd/pk2cmd-1.12.0-r1.ebuild,v 1.5 2012/05/25 08:01:20 ssuominen Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
-HOMEPAGE="http://www.microchip.com/pickit2"
-SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz"
-
-LICENSE="MicroChip-PK2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}v${PV}LinuxMacSource"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch adds /usr/share/pk2 to the default search for the device file
-	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file.patch"
-
-	# Fix up the Makefile
-	sed -i 's:#TARGET=linux:TARGET=linux:' Makefile
-	sed -i 's:DBG=-O2:DBG=:' Makefile
-	sed -i 's:^CFLAGS=:CFLAGS+=:' Makefile
-	sed -i 's:^LDFLAGS=:LDFLAGS+=:' Makefile
-	sed -i 's:^LIBUSB=/usr/local:LIBUSB=/usr:' Makefile
-	sed -i "s:^CC=g++::" Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	# Copy the device files and PicKit2 OS
-	insinto "/usr/share/pk2"
-	doins PK2DeviceFile.dat
-	doins PK2V023200.hex
-	# Install the program
-	exeinto /usr/bin
-	doexe pk2cmd
-	# Install the documentation
-	dodoc ReadmeForPK2CMDLinux2-6.txt usbhotplug.txt
-}
diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
index cd85b0c2878d..c0bcdf868547 100644
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 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/pk2cmd/pk2cmd-1.20.ebuild,v 1.4 2012/05/25 08:01:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild,v 1.5 2015/01/05 15:24:14 mrueg Exp $
 
-EAPI=1
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -18,12 +18,9 @@ IUSE=""
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}v${PV}LinuxMacSource"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${PN}v${PV}LinuxMacSource
 
+src_prepare() {
 	# Patch adds /usr/share/pk2 to the default search for the device file
 	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"
 
@@ -37,7 +34,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCXX)" || die "emake failed"
+	emake CC="$(tc-getCXX)"
 }
 
 src_install() {