Cleanup EAPI=1 ebuilds. See bug #513914.

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

4 files changed, 6 insertions, 247 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 238f3e0a0a6d..3d2cf7a88ca7 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.253 2014/08/11 13:38:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.254 2014/08/25 17:21:36 mrueg Exp $
+
+  25 Aug 2014; Manuel Rüger <mrueg@gentoo.org> -nfs-utils-1.1.6-r1.ebuild,
+  -nfs-utils-1.2.0.ebuild:
+  Cleanup EAPI=1 ebuilds. See bug #513914.
 
   11 Aug 2014; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.9-r3.ebuild:
   Mark arm64/ia64/ppc/ppc64/s390/sh/sparc stable #504714.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index b5d7bd431bcf..9760c2202424 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600
 AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d
 AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 WHIRLPOOL 7cc6b59c1f7013a0ad98518623b03d1cba784ecaf6d6a085b85282192c6f41ac1c649a39dc6e1b42ff38a571c00a85aed6e04ea57d6339a072cc4f2c41d5d74e
@@ -48,8 +45,6 @@ AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de5965
 AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcda4de5c9fb748d1be40a21f594500 SHA512 f4502bf53fd3014987e53ffc5d4b9b8678103052289dfe9f9304bb7eab66b6b59d80e3a29c19e3bc794657c2e3dbb25e275f78e09bc25808ed9849cc4a748034 WHIRLPOOL c684e43627f4e9ec4c97f0db28ce28682fc5f17627573c0902bb17946b0012969e070bd9030e0c20b9bd10e140e2901a9c2246a7e70700cf7541d90aa7293c76
 DIST nfs-utils-1.1.4.tar.bz2 588368 SHA256 27704e3637b5e0ae141b56d5395272b685c4ca844ea0a20c777626bbfc52a94f SHA512 2e11a56e0beb442de999937ef4d2721efb0ebf098db693578fcb57cc92807045540b37c57099350d0b2151e3c34d1c92869a597695d9890fd287f39eabffa715 WHIRLPOOL 9a59089a068463234d539875b1bb0c95cb2cce9fca84360da495944996b988b1ffa71b53107714693b2422143de7cf305004bf09cb915a612474d6750425f855
 DIST nfs-utils-1.1.5.tar.bz2 605790 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc SHA512 8ff6165f3c97ac9133257ea29070c716f47545cbd861345c5d8ca5530bfb4ea66001bf93652530392ca3d238b8edffd5e360325a36186a3859c43f546f2a4a79 WHIRLPOOL 05e1346363fbdb700c42d30bf1870140b585162f5d5187f3642c75b02e92cc46053f33f3da1bb701d17b440b46337e0984f8b14872b3587971d969a1387288de
-DIST nfs-utils-1.1.6.tar.bz2 598584 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5 SHA512 1044cac7d14254d9d6e40fc5c978fa3323281d44aff98b5a6c314e79642ae921e82429ce538212fd8209ab6be3a67aeb776abfdaa9722d30a826a3a14b11586a WHIRLPOOL 87481b5d1d7f7ae27c0ac19fe09bb8758559e836af75fd461d73a1500e6b29aec396e11fbf97a8243a1848c5acc23254f28c87affca3379bee19fcd08d60377e
-DIST nfs-utils-1.2.0.tar.bz2 609908 SHA256 cb39468b3acd0bf3870cde4bbb06fe01a88e7cf0c81cff87fa7794cab871a1d1 SHA512 e64655c8be9a391b633e4c3fc3338c7bcd1273f19dae10ab5b4a1f733829450f6a63742d121bca8843838b6301ac0a691f546bc882db6c4659e6937a059fdf40 WHIRLPOOL ebed2317e05d5570c4178aa4d127e70252b5b0b6b7677f46eae57875993fc3285532613b7654ab8659e173a40977887fac44cc4275c1ca3e2172d54cc19cc484
 DIST nfs-utils-1.2.1.tar.bz2 685942 SHA256 f4fc8fd71f562564de051d681997be3dd7753fb93f8a3a0eb7c5835f0f04fa6d SHA512 ec905750a250a778c7d0f334e29e9dfaca94dce49b6c30c11bdf411b510f2ed6b6527b2f25a2e4feaecda91b6b739e9ecae643e8798c36f5fc5be5850fe0c4ef WHIRLPOOL 69d1a37441a1b9e8d725066c9bb2a7d3684a079d530c94fa4e5302b035c472e51f5528d44d517eb27d689765ea53c6b59b88d982cf8da44f3d6d6a5fa456fb80
 DIST nfs-utils-1.2.2.tar.bz2 721051 SHA256 fd47277666968cf1f6bf3fe4df91a0dd45122bcdf0e24403ea84c5a2dbc9d01e SHA512 5b0f3881d8d7d094d0dad85900ddd9b6dc3402bb0d34eb3c8698a83c416ffa19155d367d68227b60e2459afda749918c4edec6521c846fb35144cd664108e279 WHIRLPOOL c30bd904e6ec62b6c7b4bf5aeea31bfe045b09a3ef6967df4487821aa646080dbf5fc84a9cc92262ce8f0497fcfa06909b7b27dec5b97d9a74d5b59d430548dd
 DIST nfs-utils-1.2.3.tar.bz2 672759 SHA256 5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19 SHA512 3571559681608bc02f6f45ce9e7a32f47148bad929af1c14e90db7e6522027b8347b8e1e065dc8282d5a36188d10e1914c99e370b48ec2690ad6752f8e9a836b WHIRLPOOL 48d386c4e3f7da7117333ea8bb37629dfbf18819c7e7f8a9cd448d1a2dddb2b6a76793e1dac7c4e9310e7b0ba730a7574fac9b143eecb5ee5df277fd188554ac
@@ -62,8 +57,6 @@ DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35
 DIST nfs-utils-1.3.0.tar.bz2 780749 SHA256 25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d SHA512 9cb9efa26d2b1bd6ae3e0c516ac50b17b4c7993366ae36c7786da734dc8ea4dd7a05f0d6fabb6fba6df36ead8642341a095f1972cb46b400840705356d410a6a WHIRLPOOL c4e6f7aecaa94808a2827297ce0ed8f1b97d88171d37a201a6a217ee2c69e8cf172ac751939fb95ea6c8022a344e04921ee45c6f46dd16057cc679caf8563882
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403 SHA512 2173b772ffba0f6ffc361e846ed58a78247eedf1b7beb2b87a37fe71c654d65681e666d32e73f3ed767f9a421e65c228b9242022c02cde7aa7a31383469b88d4 WHIRLPOOL 300ceb5299d93ae8539c6e154dba43da535c39b6318f4979b635c1d0d25c9fba8761f8ea25988e793a2bd23613e2a4e2b24182291e92530aa2120a50b0f8b3e7
 EBUILD nfs-utils-1.1.5.ebuild 3098 SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964 SHA512 f25708af1eb291a2d4df9ac795c396a9d3b0e844d9478f23567e0d90cbd33414d9a3d250135c801536ce6ed4f4de2d364a7f90d70ee7d1daab2a248f304c88ad WHIRLPOOL b9fb0cfb27a52cb71eb95e4c266e8077b0fabfcbafcb3d5a891c5350f04d604bfa2a6314179f07755eb28c1a24ff23f84e64ac8cc34e79e42169b774407950cc
-EBUILD nfs-utils-1.1.6-r1.ebuild 3212 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c SHA512 df5022cdb232cfa672495d4185ce4a669ba4133e4077f5e412a0f44abd83fac2fb2a52c0fbf78e5004de1fc4c65dbbf10f6cff2f38778bf3b70cb561f2b67e42 WHIRLPOOL 7eb6753f41c8972d83330f12aa0c24bc0a46d8167912e9d698926945294c1f87ef56b25ec35017ec2057d5ebdfdb53c380141c80dc6f0323069a729ae18dff36
-EBUILD nfs-utils-1.2.0.ebuild 3194 SHA256 ea1b2347de041280faa7dd8e008a2486d7b28e6b83f0b410f20afb009e906f64 SHA512 8c85eb9fb2c620649a079859cf2d7c680c0f6f738d98c38e925fbe49b25e8b268d10a203c3e29647a10e86c01a79f51fc757b4c7e8fca966d02e0a6d5c3ad64d WHIRLPOOL 2968765b005521a7aab69c66c2206fffb9517b1dadb24b2438d8a90389def6d19c1fae821ab49b5a52330602d0d590fa4f9ecb3c7ecc106151cb1c28827bc3b7
 EBUILD nfs-utils-1.2.1.ebuild 3120 SHA256 5342652c52e345a17ef3d000a4a78aa0513edf863dad7adaa665975194d9771c SHA512 0e0bf20e7b2e52aeebe9034983c856bcacd77da837e67d8f8fcc12a8241bbe9c02cac2bc186b6867cc3662a144d1cc4ae6a9c810973e12714573e8ea1423f1b4 WHIRLPOOL 0d41bb515ebf6db49ddd19101b8e67bfbcfe1cafb019b6b18238ad6643aa54c6b4f1cd1e9584a0a41e751731b47747c8b947934f3ee8e1e3b973515aacb2b79e
 EBUILD nfs-utils-1.2.2-r2.ebuild 3387 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4 SHA512 df4877e8e54e43dc7b5417db2e0a9deb072353394753fef9760c7aadd1de43f572c57ad9502aef5ced29e566fdf0f12e93fe041e15d62abe070b223204598cb2 WHIRLPOOL 61602162879402da7b353d2041d9aee57c80487bf2faab46a8d199077777a8045a524ac6ec18d5ed42d0c2e8d222e46dccbe126cf98dd52ef808856c9895ac6f
 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0 SHA512 dde032879ec65fff56c2fbfa5d470c9b768ed4c9e0fd3d29f1213d614b2c1430432aad51b6f61b004498bee5836fc4ebe33ba5743f6522b6035dd03cecce1851 WHIRLPOOL 467f483d4d2c2083e8cfb74f4e29c4954ad26c4e53016ff9034b5d82d4dd3d823fce50463cc6b5ef4d7e9e18b1d84d75d87e8c90ad4181eebea713f802ce175c
@@ -79,22 +72,5 @@ EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc
 EBUILD nfs-utils-1.2.9-r3.ebuild 4445 SHA256 74f62cfc1e025ff045fa0312149bf4391caf65dd11c279d8913a02869b418eb2 SHA512 19bbed44740fbe7251df65340ee160d784971dca103001bb59f9bdbf2b13aa5165f671c571fb66d9fef6a007e321580dfaaf832993d872682d655db43809f70e WHIRLPOOL ca54acb7b6d282518ac3ab35c5ab04453ba7ba463de42252426845ba11d24f167d5b47a579463152054142dfa9bbabf14afd5fdc703b4d7dc06e97414c8da397
 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
 EBUILD nfs-utils-1.3.0.ebuild 4844 SHA256 903535a267fa8a80edf8a8f534530b5868eefd4ffd6b57142e4fd15db1c8d8a3 SHA512 7d06b657cb89bc6ec82ed9a3e5d471dac55f579f42b6cff563d421c0d4b1f5eae75dae553fe76d8e52802d451773008bdc51ed2a16ff4695a1704d3b229ba2b3 WHIRLPOOL 63825f1d6c646c68e10aec6f58a4f4f906777069ea602b5c854ea7f52ead783417c06fcdc6312cde2cf4f96cf63211e8496e92c70951aaf9ce4894ad51fe2689
-MISC ChangeLog 39791 SHA256 36a2864a4353a83c60c25ba3650d46fab155bdd2de26f5c9ff1ae990e34a4ba5 SHA512 c207d6fa4304a953e9823f2e4dd0ec1cba70e42bb736ec8b56e423e3dbe834a0f3294c99c270f8d6ed284253fbe792ece603395c6c1715c1f4e973db45d6d9a1 WHIRLPOOL 7a4052f5e86b254c87420bd45b138ad7592a047deb3d5feab0faf913c52601d652f016cad2e2d3586e3e98c5127f4848f6f446739453aaac37624bcc3a861c9e
+MISC ChangeLog 39937 SHA256 d16750e3ec321fd21a6eaedc7128a49834b5598ff81a8a9dde163a48491595c6 SHA512 67521f3aa46c98c94e8100428193fb54d236b0043659309d412979f5bd64cc1407b0df458bc08d0d0be76470b0ac8bead515c979d1e5b06cccbfaa1208ec680e WHIRLPOOL 9460d5c91f6f4122026f745df9fbf812b864429b85733575f5946c6ba2af86e3f70b8210c5e53bc8d5edbb0d9925a54db9ff536d8a333f7f2627241576c92f1d
 MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJT6MdrAAoJEPGu1DbS6WIAOf4QAJv1ih4FH0J4zW8zJ6HNWqVR
-1z1j8EZgPMwqBGgptZJRdQKBc252NaRERUMoX9RIU4VcSNnPyS8hn0TL1R/J5zI0
-qEdmIq09ggizA0CJLKNB/+ZLd47nv2qR84zB0WAj2VIjs9/60QIhs0BmVsAsBgOQ
-qJ2mShauS+ctXkSx6vzEz1JjdgHiOPoq7YL/dcjZ9Xe4xQT39h3BTQ5lbmhiiDwI
-xYU43nRr3PDV5OI/1BFuM40l2sSdgxp5kdYUyzSlUOLBFtsLftVZcS55YehOfUVG
-qcK2ni5B5RMChEwg/mfx8lcQyvmWvb3M/cLCBr5TTar4raHNoZD7q/RC8VZWn3P3
-t3pFqGw5q/4DfjBly9QY6gzCTmB4Py9wDU0oLkB/+xDQ1ik1meFmBke9NLHm6MF5
-PVaNps05CNcdYB4dEgOvv9Mx6bkdXEdWNubn/4cNpX2iOexlcJPX4x26CPX2igUV
-2UHkq1x2iA0eJTsf8qlERALstBsckBLjvDKQVLINTlhfCfNbXNZEW+7lkWojHvPr
-hAXmSYK4XVcgksjo8MfdUf/85aIrMgsPANAdNS5CHP8v9MwPUmOC/lyE2vw2P/Ro
-0a8J6QdFJ+jOg0bP4YxI6bCu2CEiZ4hupbN0EUSnn6i5Cpo1InTwl/O7qxDUyBD7
-G0m3jWrYWaremgQeiMgx
-=MQCK
------END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
deleted file mode 100644
index 24a7bd8c9c16..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild,v 1.4 2010/03/31 18:06:59 solar Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	sys-libs/e2fsprogs-libs
-	!net-nds/portmap
-	net-nds/rpcbind
-	net-libs/libtirpc
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			net-libs/libgssglue
-			app-crypt/mit-krb5
-		)
-	)"
-# util-linux dep is to prevent man-page collision
-DEPEND="${RDEPEND}
-	>=sys-apps/util-linux-2.12r-r7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
-	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_compile() {
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsv3) \
-		$(use_enable nfsv4) \
-		$(use_enable ipv6) \
-		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-	emake || die "Failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	dodir /usr/lib/nfs
-	keepdir /var/lib/nfs/{sm,sm.bak}
-	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
-	keepdir /var/lib/nfs
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
-	dodoc ChangeLog README
-	docinto linux-nfs ; dodoc linux-nfs/*
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list="" opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list="${list} rpc.idmapd rpc.pipefs"
-		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
-	fi
-	for f in nfs nfsmount rpc.statd ${list} ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
-	done
-	newconfd "${FILESDIR}"/nfs.confd nfs
-	dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
-	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
-	if ! use elibc_glibc ; then
-		dobin tools/rpcgen/rpcgen || die "rpcgen"
-		newdoc tools/rpcgen/README README.rpcgen
-	fi
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.
-	# In src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  This fixes
-	# bug 30486
-	local f
-	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
-		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
-	done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild
deleted file mode 100644
index 25f24ddc2346..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.0.ebuild,v 1.3 2010/03/31 18:06:59 solar Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	sys-libs/e2fsprogs-libs
-	net-nds/rpcbind
-	net-libs/libtirpc
-	nfsv4? (
-		>=dev-libs/libevent-1.0b
-		>=net-libs/libnfsidmap-0.21-r1
-		kerberos? (
-			net-libs/librpcsecgss
-			net-libs/libgssglue
-			app-crypt/mit-krb5
-		)
-	)"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
-	>=sys-apps/util-linux-2.12r-r7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
-	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_compile() {
-	econf \
-		--with-statedir=/var/lib/nfs \
-		--enable-tirpc \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable nfsv3) \
-		$(use_enable nfsv4) \
-		$(use_enable ipv6) \
-		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-	emake || die "Failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	dodir /usr/lib/nfs
-	keepdir /var/lib/nfs/{sm,sm.bak}
-	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
-	keepdir /var/lib/nfs
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
-	dodoc ChangeLog README
-	docinto linux-nfs ; dodoc linux-nfs/*
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-
-	local f list="" opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list="${list} rpc.idmapd rpc.pipefs"
-		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
-	fi
-	for f in nfs nfsmount rpc.statd ${list} ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
-	done
-	newconfd "${FILESDIR}"/nfs.confd nfs
-	dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
-	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
-	if ! use elibc_glibc ; then
-		dobin tools/rpcgen/rpcgen || die "rpcgen"
-		newdoc tools/rpcgen/README README.rpcgen
-	fi
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.
-	# In src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  This fixes
-	# bug 30486
-	local f
-	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
-		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
-	done
-}