Simplify ebuild a bit, and make sure we respect $CC #397871 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 32 insertions, 22 deletions

diff --git a/sys-apps/netkit-base/ChangeLog b/sys-apps/netkit-base/ChangeLog
index 5888d59675ee..d98e2c275c63 100644
--- a/sys-apps/netkit-base/ChangeLog
+++ b/sys-apps/netkit-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/netkit-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.34 2012/01/06 12:03:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.35 2012/01/06 23:07:46 vapier Exp $
+
+  06 Jan 2012; Mike Frysinger <vapier@gentoo.org> netkit-base-0.17-r9.ebuild:
+  Simplify ebuild a bit, and make sure we respect $CC #397871 by Agostino
+  Sarubbo.
 
   06 Jan 2012; Agostino Sarubbo <ago@gentoo.org> netkit-base-0.17-r9.ebuild:
   Stable for AMD64, wrt bug #397211
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index 9ecc8ef3b280..53a61e3bf210 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 003_all_netkit-base-0.17-gcc4.patch 321 RMD160 27cdb5719874f908a0ad3ef134d711b129ea914b SHA1 b058d3bef814a82787ac1f564bcf7c88c68f67e4 SHA256 8ab9c712ce08fc62591303e54348d9cacd36a6cd5a25b7c002edbdaa16cbba78
 AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 RMD160 427d6fa945c6bb05c67f8658cfdd536d84c34ca9 SHA1 0231c27ce23a913736fa48ea7e8777a2808d88db SHA256 a820d7daef5b03a821f94f14a2a0998465db579a6abfbad17eece55a1753b1ef
@@ -7,17 +7,23 @@ AUX 005_all_netkit-base-0.17-no-rpc.patch 522 RMD160 15e1b8a36d024889616bff15bb7
 AUX inetd.rc6 580 RMD160 f1a1907f4780466a3db077d0e7d83d9f5522a4a3 SHA1 c8bd8d7877edc47b426b977ce96bcc04f9079a92 SHA256 beac566412f27c60c315f7c2fbc24fda117be7673c9b0eb8e692441dca79f336
 DIST netkit-base-0.17.tar.gz 56473 RMD160 4b4a3c5b1bcb1be736adf4474a85f2282996f37c SHA1 d1f610efa3320ecac75c2f13df8a45c84fc7d448 SHA256 16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
 EBUILD netkit-base-0.17-r8.ebuild 1212 RMD160 1756603f003c3c7b591784eaf22cac7ce4e65799 SHA1 8749474121bc94a595658c008b9fcb25263e025b SHA256 de6ff8f31b35ff3d3c94e41084ff1b17c4373609723ef2c5873f9a7778bf2acd
-EBUILD netkit-base-0.17-r9.ebuild 1126 RMD160 6f6495f88720272b5f38c7503d0f8033a4d04d80 SHA1 fd5398937d4f03a8e5794b0e37b1641900d74413 SHA256 b9eab8726697cac877cabb1b0a6bf1a0c3f8a47b7629a0221e5ba396612adef3
-MISC ChangeLog 5852 RMD160 2953e5b92c91bd8fd1e3845933c8946f18055906 SHA1 0be095d4da1459ec4bd60bcf574d02528fe6dd80 SHA256 e030ca53e651ba76a807c31a2e3ff885680df830d532c8905935640408d78c51
+EBUILD netkit-base-0.17-r9.ebuild 1133 RMD160 353e8ce492fd436499bcdb5e047233c7603435fc SHA1 10b51a99828a1e7d8367229e89649c4b00b1c533 SHA256 ab623902066bae843da715eba14504a35123ef709d6706da1a8540da89669911
+MISC ChangeLog 6019 RMD160 db7daf3651bf08de28c45ab6d5688296c28f283b SHA1 5c2bb9ee0f65d13385d04f8761480b3b18af81ad SHA256 e93ce3672bf5b94df47d428dbf2b16a992758b6fc7d1ece85e3f7814ce2ffee8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPBuMTAAoJEOTDgjZ80txdsmIH/j/rBOYPVnAlmq4rbGY2mdT8
-WCC2xTUC33NbFJXZ6hX3F9ajU0jDhes7Vs/8gCIdFNNXelghbMpWzZhetTEKE3St
-h9JFN2v5ZVudWQXdyjn7tv0QkZ9P99IzHFhAJQtkBgpmsb0cZerYnHdZ0XG/rY26
-QFgMnxsIkemdi3aQtCq3s7j7fAYnsygBdyX/Ut/7UnsRsrzGiPK6vSa4saerKWpL
-HqsMrpsn1yrFC0MOUW3xusBtbfj3PBw3JCYbveKgmrC4DgzCe9MphSqiL2TVopzu
-GX7Ly5xtyOZL8MMnVsVfr/jH0JHNjWHGdhThiG7ewz9TFrukovzvneLI3BqZqzY=
-=3mLA
+iQIcBAEBAgAGBQJPB37tAAoJELEHsLL7fEFWxoQQAJwsmGpu22aEkpwhB2ndj52Z
+Upyv0qZ9y/oNNrZNjBp/rivfjD3CIaps5ykqJ0qN/6PYAft6kxed8NJfLnyBYmKC
+rmy4HKUgwbdMCfgmcdiL+CP/FqkEnOIF20NNpZj3miUM+4qRhQ+d6CRn8F5uT9kN
+ApGLmAztlSbyftwYrp1gj6FESdm98C3nT75egaqU+HJOi0JkH9SP6qtF8bPQEPos
+S/Gw/THVZhxMuiswPrs1yG8A5a1hD0YEl5hLfPPIZCYEtXStDAyl+/KGZWYdYA+/
+PAELYSemEiMXn8wAoilfOcaThuN26dnFL8a+5M4yhK7eklfC6UEsCGLxdJ80ii1l
+TCdP0cMC9IYEFVPx69Lb8NZlDkezK4n10cpQxoJaXQvFCnJng8a+AhPrRgNu+8bp
+pIFJruo4OwcexU+FiyleFSXKgWn02XIMxxLTlAFL1GA8e8kjM3SA9aqRuj+x5HlM
+ko8OCahSGxAhWzhogEbZN1F310YgP3W3pufOciqlJYcjXkYgiI3IB48DIT0PNZtl
+CpUnKMqpGIoQe1x5IxFoPgMSpk8PZSUZwL+fKWWRn0UqDRJeFnK8TmWEWkZ/fH8m
+6z8NouKJxyKxD2VL0JIG6ciu5FvaoB8rnAZCfAvxjDscej/ui52keZgZnvJFJoAg
+ZeEJaOMEfEGQecWzj2XQ
+=ESTz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
index 16d7e3749d9c..555bbd3094ab 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.5 2012/01/06 12:03:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild,v 1.6 2012/01/06 23:07:46 vapier Exp $
 
-EAPI=2
+EAPI="4"
 
-inherit base
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Old-style inetd"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
@@ -15,13 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="patch"
-PATCHES=( "${FILESDIR}" )
+src_prepare() {
+	epatch "${FILESDIR}"/*.patch
+}
 
 src_configure() {
+	tc-export CC
 	./configure || die
 	sed -i \
 		-e "/^CFLAGS=/s:=.*:=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \
@@ -34,10 +33,11 @@ src_install() {
 		-e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
 		etc.sample/inetd.conf
 
-	dosbin inetd/inetd || die
+	dosbin inetd/inetd
 	doman inetd/inetd.8
 	newinitd "${FILESDIR}"/inetd.rc6 inetd
 
 	dodoc BUGS ChangeLog README
-	docinto samples ; dodoc etc.sample/*
+	docinto samples
+	dodoc etc.sample/*
 }