Update to EAPI=4. Fix cross-compiling (build+run helper wart binary). Add arm love for ChromiumOS.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 69 insertions, 18 deletions

diff --git a/app-misc/ckermit/ChangeLog b/app-misc/ckermit/ChangeLog
index d01bdec093bd..e62c27fa468c 100644
--- a/app-misc/ckermit/ChangeLog
+++ b/app-misc/ckermit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/ckermit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.35 2012/05/10 15:09:37 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.36 2013/06/10 17:42:53 vapier Exp $
+
+  10 Jun 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/ckermit-8.0.211-build-wart.patch, ckermit-8.0.211-r4.ebuild:
+  Update to EAPI=4.  Fix cross-compiling (build+run helper wart binary).  Add
+  arm love for ChromiumOS.
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -ckermit-8.0.211-r2.ebuild,
   -ckermit-8.0.211-r3.ebuild:
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 8329908abe15..d2f4e7942198 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ckermit-8.0.211-build-wart.patch 728 SHA256 22eb8c620c83d42d3c4529c384125b479b6b8dd18ab493fe8b12bf89de51866b SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730 WHIRLPOOL 03f9e34134cafc0b0fa05905779934db8665350a8d09dd4b530242788efded92053345c71e05ca3dbf71e3b9aa3bff291e1d0a1f011867c4a9365bc0a8280803
 AUX ckermit-8.0.211-cleanup.patch 2038 SHA256 b3cbcce96dcb0a1b6a25ea05ba19dab7aa75448e57cd98921de73ef39936eee8 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7 WHIRLPOOL c90b8262f0ca1c1bd7e111fc24f472efea292f53ca98417d99b5c64e657fd2787032f2f316294da55fb426c198c4a7cea0e811927db5aa6c5daf6ec77f002b85
 DIST cku211.tar.gz 2878523 SHA256 39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad WHIRLPOOL 160aee04d5f5c425ebb2011b71923257deb154cf1ca7070208cd8a2253189ff5529940c3b1deb7fc5280f5d9ff8f699dff8ebab3881584439b96da251b0c9435
-EBUILD ckermit-8.0.211-r4.ebuild 2009 SHA256 9b808cabe5c11794d84bb0f6a86095b9c7881af4dc2f855b0e34db49846f8185 SHA512 210fcab91fdfc3b63f459d802f9ef5e40a62da1b50892e25c73bc62a1420eaa9c08cc1e7a6b254eb1bfcbeaea51c8ee93a0975ed9037019af4c04eae860c6f24 WHIRLPOOL 0ebfcc71ccc81927939256584d665455373192186fc9be3437dc429aa78e0d0adf2255e2ff2cee447300749935c40549bcbb736bee0ef42552f1352745f284c3
-MISC ChangeLog 5186 SHA256 6600940104bf0e56fac14815bb7f4559a51e2e098e8d70a9474b5377a2425dea SHA512 49efc373e6d1c31087d754b5a1ab640d06a7de41520deef812cf4bc76123af192c5c09149baf95414ec5be92ec4a081240119de7e952d50aa9aff7d1941b9dff WHIRLPOOL 50ca1cfa36e0b6944e92fbaf28079618090e43d5be1eacfc0fb39697da4835dfdfd91a5e26d448751f276b5abb8e509a969dd8ceeb252948f191135f0a51615d
+EBUILD ckermit-8.0.211-r4.ebuild 2062 SHA256 dcd2fbba6051c23c37037d93e129387c8413ed9127da279e9851c06be7221442 SHA512 47202c45bd1e35b053c3d63591b63f59617561bbfa30d05b3c536cc534dd8fcfff4b59700215cd1a4bdd616c3bb3291ce766d184294cbdb649f241c756287db1 WHIRLPOOL dd0ffb1e6d01f3c45170d61dd46c9f70be19b6914e6c1f77806a753aec441be55e0111c2089e26f618d4e0d9e197af748b353447469842c913aec26e8b3644a8
+MISC ChangeLog 5415 SHA256 21b1071d36e148b3c1d1cdaf26e9c115e937b87239c79a7d6487ef128266b12e SHA512 fa57a013468c642aeaf43983514a94948bee87fda89cd4d74dd118055d60f93ef3e9cfb162bfbd2a40a35f70208f9b1cdbb450f94fb341235ec4a8f44355eb78 WHIRLPOOL 38eb48635d260fc03f0e194427e447d4eb1f97c6e167b1993e411c39712ce6944323b59eac2097a125fac3ea205bcd83fe995ddbbb06354c4e04ad058c952974
 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRthAiAAoJELEHsLL7fEFWRVYP/3uuAz7eAA5TIQoW/rvskW6j
+9KRZpiH99OLEnoKpfDeMr/JXoosUhjAJVR6pmg4TsqZ2JAR0XQzjirnIvHnmUM05
+aRowBWnhhBy4Z6XazsjaOxyRhRSG9XfrsL063WA/bsUfrngghhIPYudYrcu29wdh
+FYSYLdfz6Cmh/cosr+JRSVVHajNqIvi8Cp6UCDNIXrlZWB8acRbHu5SON7GrRuaX
+s3RXRexSCg3NsxCdQz3IXw/MIJp0uD1mv5mymtuHJSdeeqyXwsFGBEIN8Jc2W56v
+S+dZqM7zgEvqF8cvHTQgWea0XqgOKfC0gMIcGURYPC/z/AbUmvOGygIK3MDynBOt
+G80KrF2MvhPtUoDXSjEchTq+mxbNMznTLyWynSRMT6l83VWDR4krj1jlYVdo8pco
+oxBLyy0CT2thyzM1Rd2ZnoATgc/Y/bZoz2d7wTOP5fx/8ifflpA7eP34gnhng5Q5
+wPMb8oAlteVw2TBxgaMz3scLOVzszcoxuy8R5gNQ4pCCfhanG65n0cSfYYXFTlcw
+JTK4SxKmoobMDljI7eDLjqHjqqefU5X4FXDBQD9mLneGuYBiT+0hpJiVggZGLFcl
+ayeYgAGapxgYZE5c+tmjEMGsSLDh7ha4XfxxgylZYzxbEsCdnhmZbwbMe+Jian4E
+BpQYpFiqLgHmh9V94bCN
+=K7sY
+-----END PGP SIGNATURE-----
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
index 90c69b718196..a6f2582b11c0 100644
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.4 2012/01/03 12:31:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.5 2013/06/10 17:42:53 vapier Exp $
+
+EAPI="4"
 
 inherit versionator eutils flag-o-matic toolchain-funcs
 
@@ -14,7 +16,7 @@ HOMEPAGE="http://www.kermit-project.org/"
 
 LICENSE="Kermit"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
@@ -23,10 +25,10 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-cleanup.patch
+	epatch "${FILESDIR}"/${P}-build-wart.patch
+	tc-export_build_env BUILD_CC
 	sed -i -r \
 		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
 		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
@@ -34,7 +36,7 @@ src_unpack() {
 }
 
 ck_use() {
-	use $1 && append-cppflags $2 && libs="${libs} $3"
+	use $1 && append-cppflags $2 && libs+=" $3"
 }
 src_compile() {
 	# we don't enable any of the telnet/ftp authentication stuff
@@ -51,24 +53,24 @@ src_compile() {
 		KFLAGS="${CPPFLAGS}" \
 		LIBS="-lcrypt -lresolv ${libs}" \
 		LNKFLAGS="${LDFLAGS}" \
-		linuxa || die
+		linuxa
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		BINDIR=/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
+		MANDIR="${ED}"/usr/share/man/man1 \
 		MANEXT=1 \
-		install || die
+		install
+	dodoc *.txt
 
 	# make the correct symlink
-	rm -f "${D}"/usr/bin/kermit-sshsub
+	rm "${ED}"/usr/bin/kermit-sshsub || die
 	dosym /usr/bin/kermit /usr/bin/kermit-sshsub
 
 	# the ckermit.ini script is calling the wrong kermit binary --
 	# the one from ${D}
-	dosed /usr/bin/ckermit.ini
-	dodoc COPYING.TXT UNINSTALL *.txt
+	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
 }
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch b/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch
new file mode 100644
index 000000000000..59f28a9e5cc7
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-8.0.211-build-wart.patch
@@ -0,0 +1,23 @@
+the wart util is used at build time only, so use BUILD_* so we can cross-compile
+
+--- a/makefile
++++ b/makefile
+@@ -1406,12 +1406,17 @@
+ 
+ ckctel.$(EXT): ckcsym.h ckcdeb.h ckcker.h ckcnet.h ckctel.h ckclib.h
+ 
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS)
++BUILD_CPPFLAGS ?= $(CPPFLAGS)
++BUILD_LDFLAGS ?= $(LDFLAGS)
+ wart: ckwart.$(EXT)
+-	$(CC) $(LNKFLAGS) -o wart ckwart.$(EXT) $(LIBS)
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o wart ckwart.$(EXT) $(BUILD_LDFLAGS)
+ 
+ ckcmdb.$(EXT): ckcmdb.c ckcdeb.h ckcsym.h ckclib.h
+ 
+ ckwart.$(EXT): ckwart.c
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ -c $<
+ 
+ ckudia.$(EXT): ckudia.c ckcker.h ckcdeb.h ckucmd.h ckcasc.h ckcsym.h ckcsig.h \
+ 		ckcnet.h ckctel.h ckclib.h