Revision bump, bug #257138. Marked 1.12.0-r1 stable on ppc/ppc64.

(Portage version: 2.1.6.4/cvs/Linux 2.6.23 x86_64)

4 files changed, 78 insertions, 5 deletions

diff --git a/dev-embedded/pk2cmd/ChangeLog b/dev-embedded/pk2cmd/ChangeLog
index 65bfdd4e21b3..891ecdfc1a50 100644
--- a/dev-embedded/pk2cmd/ChangeLog
+++ b/dev-embedded/pk2cmd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/pk2cmd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.2 2008/09/21 03:30:10 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/ChangeLog,v 1.3 2009/02/02 20:45:09 josejx Exp $
+
+*pk2cmd-1.20 (02 Feb 2009)
+
+  02 Feb 2009; Joseph Jezak <josejx@gentoo.org>
+  +files/pk2cmd-add-share-dir-for-dev-file-1.20.patch,
+  pk2cmd-1.12.0-r1.ebuild, +pk2cmd-1.20.ebuild:
+  Revision bump, bug #257138. Marked 1.12.0-r1 stable on ppc/ppc64.
 
 *pk2cmd-1.12.0-r1 (21 Sep 2008)
 
diff --git a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
new file mode 100644
index 000000000000..30d6b1e71a3e
--- /dev/null
+++ b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
@@ -0,0 +1,16 @@
+--- cmd_app.cpp.old	2009-01-31 21:23:30.000000000 +0100
++++ cmd_app.cpp	2009-01-31 21:25:48.000000000 +0100
+@@ -88,7 +88,12 @@
+ 		_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);

+ 		if (_tcslen(tempString) < 17)

+ 		{

+-			_tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);

++               // Try /usr/share/pk2 first

++               _tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32);

++

++               if(access(tempString, 0))

++                       // Well, that didn't work, default to the current directory

++                       _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);

+ 		}

+ 	}

+ 	if (!PicFuncs.ReadDeviceFile(tempString))

diff --git a/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild
index b2aab383a16c..3a53a788556f 100644
--- a/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1 2008/09/21 03:30:10 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild,v 1.2 2009/02/02 20:45:09 josejx Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSour
 
 LICENSE="MicroChip-PK2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libusb"
diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
new file mode 100644
index 000000000000..9cbc96e62609
--- /dev/null
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 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.1 2009/02/02 20:45:09 josejx Exp $
+
+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="dev-libs/libusb"
+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-${PV}.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:^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
+}