Version bump and remove old. Update to EAPI 4, add ~amd64 keyword, don't pre-strip files (bug #240161), and respect LDFLAGS (bug #335542).

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 41 insertions, 44 deletions

diff --git a/dev-embedded/picp/ChangeLog b/dev-embedded/picp/ChangeLog
index 7f436276de25..afe06c1710b4 100644
--- a/dev-embedded/picp/ChangeLog
+++ b/dev-embedded/picp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/picp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picp/ChangeLog,v 1.6 2009/09/23 16:40:32 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picp/ChangeLog,v 1.7 2011/05/07 08:28:51 radhermit Exp $
+
+*picp-0.6.8 (07 May 2011)
+
+  07 May 2011; Tim Harder <radhermit@gentoo.org> -picp-0.6.5.ebuild,
+  -picp-0.6.7.ebuild, +picp-0.6.8.ebuild, +files/picp-0.6.8-errno.patch:
+  Version bump and remove old. Update to EAPI 4, add ~amd64 keyword, don't
+  pre-strip files (bug #240161), and respect LDFLAGS (bug #335542).
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> picp-0.6.4.ebuild,
   picp-0.6.5.ebuild, picp-0.6.7.ebuild:
diff --git a/dev-embedded/picp/files/picp-0.6.8-errno.patch b/dev-embedded/picp/files/picp-0.6.8-errno.patch
new file mode 100644
index 000000000000..89d5d063576d
--- /dev/null
+++ b/dev-embedded/picp/files/picp-0.6.8-errno.patch
@@ -0,0 +1,10 @@
+--- picp-0.6.8/picsnoop/picsnoop.c.orig
++++ picp-0.6.8/picsnoop/picsnoop.c
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <errno.h>
+ #include	<ctype.h>
+ 
+ #ifdef WIN32
diff --git a/dev-embedded/picp/picp-0.6.5.ebuild b/dev-embedded/picp/picp-0.6.5.ebuild
deleted file mode 100644
index 8ecff4f1595d..000000000000
--- a/dev-embedded/picp/picp-0.6.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picp/picp-0.6.5.ebuild,v 1.2 2009/09/23 16:40:32 patrick Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A commandline interface to Microchip's PICSTART+ programmer."
-HOMEPAGE="http://home.pacbell.net/theposts/picmicro/"
-SRC_URI="http://home.pacbell.net/theposts/picmicro/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++" || die "emake failed"
-	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++" || die "emake failed"
-	#emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++" || die "emake failed"
-}
-
-src_install() {
-	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
-	dohtml PICPmanual.html
-	dobin picp
-	dobin picsnoop/picsnoop
-	#dobin fixchksum/fixchksum
-	newdoc picsnoop/README.TXT PICSNOOP.txt
-	#newdoc fixchksum/README fixchksum.txt
-}
diff --git a/dev-embedded/picp/picp-0.6.7.ebuild b/dev-embedded/picp/picp-0.6.8.ebuild
index e7608e18d1aa..0310d4490e5f 100644
--- a/dev-embedded/picp/picp-0.6.7.ebuild
+++ b/dev-embedded/picp/picp-0.6.8.ebuild
@@ -1,32 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picp/picp-0.6.7.ebuild,v 1.2 2009/09/23 16:40:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picp/picp-0.6.8.ebuild,v 1.1 2011/05/07 08:28:51 radhermit Exp $
 
-inherit toolchain-funcs
+EAPI=4
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="A commandline interface to Microchip's PICSTART+ programmer."
 HOMEPAGE="http://home.pacbell.net/theposts/picmicro/"
 SRC_URI="http://home.pacbell.net/theposts/picmicro/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
 
+src_prepare() {
+	sed -i -e '/strip/d' \
+		-e 's:$(CC):\0 $(LDFLAGS):' \
+		{.,fixchksum,picsnoop}/Makefile || die "sed failed"
+
+	rm -f picsnoop/{picsnoop,*.o}
+
+	epatch "${FILESDIR}"/${P}-errno.patch
+}
+
 src_compile() {
-	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++" || die "emake failed"
-	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++" || die "emake failed"
-	emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS}" || die "emake failed"
+	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
+	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
+	emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS}"
 }
 
 src_install() {
-	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
-	dohtml PICPmanual.html
 	dobin picp
 	dobin picsnoop/picsnoop
 	dobin fixchksum/fixchksum
+	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
 	newdoc picsnoop/README.TXT PICSNOOP.txt
 	newdoc fixchksum/README fixchksum.txt
+	dohtml PICPmanual.html
 }