Revbump to fix a typo which slipped in with the latest init script fix. Removed old

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 27 insertions, 265 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 0b661a9be0ed..73aa5fc7ad74 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.262 2015/02/07 17:43:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.263 2015/02/10 00:27:08 polynomial-c Exp $
+
+*dhcp-4.3.1-r2 (10 Feb 2015)
+
+  10 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> -dhcp-4.3.1.ebuild,
+  -dhcp-4.3.1-r1.ebuild, +dhcp-4.3.1-r2.ebuild, files/dhcpd.init5:
+  Revbump to fix a typo which slipped in with the latest init script fix.
+  Removed old.
 
 *dhcp-4.3.1-r1 (07 Feb 2015)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 6567832d73f6..3019eccc5daf 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -19,7 +19,7 @@ AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 SHA256 482dea1517e3d7a22c0469908c41c
 AUX dhcp-4.2.5-iproute2-path.patch 340 SHA256 a6c25d408ca1bac5180151ff2955807017c386c06fc162395dcd71040900f59b SHA512 4a5c4f3b1af93fa137d94fd860689919b83de5885198e48eb89678379a59a7c9d90f8a3f558ddf9d442130abb127a460928a85c0646c4ad0984827ccd9e08852 WHIRLPOOL d54ba0f4c3da34375ab0f1fa98368ad4ec4f6ff79a131638a3d6540a4c2fa62e83cb45f946518b114793ad8e868b6cef9ec9338a4930080623439e7692386d77
 AUX dhcp-4.3.1-dhclient-resolvconf.patch 14574 SHA256 9f1d8d987e62679d246c70dbc5149090ce1c382b7256c003f2852dd6617a335b SHA512 0cad400e5517ad9b66fc9aa09b2455809205eeb686dce6c7cc4efb8ea655d8de436f47b91ccf8fbd2c4286ecbb2b9d761b7e60e72ab7456794f3028739d80efe WHIRLPOOL 3a021da8fd0069e668ea79d13e496f40976202dcdfa95e78ef3182a6aafa787cd1cafaaa99c1a8e3655f8d15e989d771173c8add54f93b4b332426cd5863e63f
 AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
-AUX dhcpd.init5 2954 SHA256 36c28902c90a9f5d9b994308cb94d7fe8336d006746f8e8c80ac0a23331178d5 SHA512 bae1294aaaf6e6616e081dd89078d580cd5be135a1c47dc92eb5c7d6cb318a3a7b7d3e8f127580953fd67e53acf2cfcdb8e8084746b43946ed762a6eb6dc6b79 WHIRLPOOL 5b9f9598021b0edb645cdd9be033dba08872c88f99400250d813b713d221726630af7107824532edb59b0fa7c76e372e809f2a3c5f1af24a3a1575a18ae1e263
+AUX dhcpd.init5 2953 SHA256 b5811c6adf10d6210e5685b4e999f0449ac492379d055226eeb140f00d9b8702 SHA512 8831a8f9f924cf465f0cd8189f14132138ea010b88ddef12b3c4f77b0549ded552627e03a1555ed42cf4e7f07cc5911872b1db68d9e7f6aac4856f5be5b6fb01 WHIRLPOOL 9eaf25aacf03817ae2e83a184375cf5175248ab0cf8cde5bfc78f79a4fef6f31d28b37e0a97cce670075bda39ac3007309cd27556b243691b8ebde1bd7daf5bc
 AUX dhcpd.tmpfiles 75 SHA256 bb344a11fadedaec33ba3c504cc04adba34b15aeb07a640dab6da255de97728a SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb WHIRLPOOL fd4450a697cfbdca4db49eb433c7f67e7a9051541f4ab6e2633659435a504b051aad6338257ece4e5fc950c46f9fa7d5c5820f750440325fc62cae79dff2cfb0
 AUX dhcpd4.service 264 SHA256 174e1a7dab5b23bbbd73a9fe16d3907923c21d2802c51dc1096c9e24bfa9fda3 SHA512 e340311fb890c5fc2f5836cc8d10ea3e4bb34bb5e96e7231798e7d960f05886478bf28305828fbd851080baadafe7d3fd2c7f30a81dcbc68d6368e8b4bd0de71 WHIRLPOOL 121ed7c50b179a7d09f53c758e5d44cd9e91451ca7b577d9b058d8097473df421715018986c314d633a599541d422cbda276831ba8c192c2a8762608fc5f2a3b
 AUX dhcpd6.service 270 SHA256 82efa0887779b8c0f5c33ab77274ff9617f8cca0f59816e0e9425e368f1a1824 SHA512 2898f0dfa56ecb590c25a1f0e44446a83d1d9118e691c9a7680250a9e47f4dec2b36195dbda8259292d93a31bf0e1230b9f39ad93f2b0a9280e8cc4d77b50bae WHIRLPOOL 3040add013f776f1c91624c916456f68307321bd2e2cf69616ac2343743d65dfb9e940bffff089c0c45912d7498c666fcff77b4250ef3c533e1028270d9a4c55
@@ -35,14 +35,23 @@ DIST dhcp-4.3.1.tar.gz 8980806 SHA256 266cbca8a7a6bb8f9ccc5765da0d2b04099329314a
 EBUILD dhcp-4.2.5_p1-r1.ebuild 7589 SHA256 9550000131ba6a3e6fc2e0ad3b4c0beb701a99c6bf4dd2349292be4933e8b8d6 SHA512 02351cbf71804929361a6c5f07a57fa0314620d831a0e387d094c39b8dd5996d2476f433f8be8b37b8c9e3b5d956df2310b2917b92f5fb8d6a47ac774735c3e0 WHIRLPOOL 247b0d5a4c5f4f7793661eaffe3c1f3a81cfc338fe5db67229b8b84688588fbdb85485283e791e41f8a5470d4142d5ad920f13aeffb5b38c41acf93a4ebb1a0e
 EBUILD dhcp-4.2.5_p1-r2.ebuild 7980 SHA256 8e5c475970aca58a502b370e0ed289e5d5b3e9c53ea8a4b09c57a2a9a79c6dd5 SHA512 e82494443a763c31edd16f25932d23a3b8963afc9a5185dd94d742356d12d5d20559ac265537128dd02ad7dcbd2197be296a8c24dce88f9f4562669352ec2282 WHIRLPOOL d2df0308ecd5c542fb12cc8ae0399851991c49af03d104d5eec3505aa660196b5fdd2b3240c4da80008d917704033b0964d7e4e8a6182ab66b548ee6791db2fe
 EBUILD dhcp-4.2.5_p1.ebuild 7408 SHA256 40f9449d9a0ac310ffbb9275f4fc62714a63b3dac5c5380250d1509b5ae6c14d SHA512 bf5449ba1c547ce8f62ec5ac0ce425e1c7594394bd243f5d8d495985a0b8754106898940ea1f274686bc4eb4e0d3ed822154f12d532f8a0763ebf30a2e325dc6 WHIRLPOOL a8a5c1ccd66068da876ffdeeb49a9079d3b9362dd9b4984969b399483231eb7a0eb61246c4550d24d320462203a1077cc8d9de5797f81f6f441db7aa1693c045
-EBUILD dhcp-4.3.1-r1.ebuild 7896 SHA256 65877f20c4e930d4231ec620cfca8cbe3528e97cd4e947c0729289401de39236 SHA512 4d1b9d80d20b2e4eab3d9d97232907c92e2d36e2c59c8eea9cf9edee26f165e76f5c8246a99192289dece7308f8a5328ec0eb85b596de6a7855b03465563b37b WHIRLPOOL 4ed3bf26a467d574325edb9b7049f5f07ca3a0fe923730dc1d6670baa4a4316c8c9646f4dcef1f5443d10ca16f9282db7fa9743ec428cf4eb1c47b872b237eca
-EBUILD dhcp-4.3.1.ebuild 7891 SHA256 97d7218efd0d5eef90238ca36be526dd109c5c80dae0b4a40fc545a435d39768 SHA512 717162416bacb9046b67e28663eba39558f01ddcc89c51bd58d3854c2cce7dc7518b60d53d32bf746f54ca56932b638485a3b06bd8383ee284bd89e995144ab1 WHIRLPOOL 210f013967922f836c77c993be116a94be562ed669c82e2cd7d25978b61cfa34609a843a19065fa39074e6ee5d9366829903afe0d4ea77450602efaab8fda65d
-MISC ChangeLog 44276 SHA256 6f02786adcfd3ca2556d6c250ee94594ef96e2717b461662cb09bde9b1f3ef01 SHA512 7fa97192f88bdd856d56300e978bea5254900d7f544e238b7eed7bbfa823149240ca2f6905be5b5b703912dea181f73982a40bcf48571c1732908ecdb8af2556 WHIRLPOOL 9a983d85539151e6a53a7520252d7ec0bf5ab80c4a32c0e3563204eb1eef92239746324515720d9da379e8440b67030a352cc964c1c028e799a98223fd88a789
+EBUILD dhcp-4.3.1-r2.ebuild 7900 SHA256 4ed1d708908bc535c4881a4bf1067dce8f4247cfe90e77e3cfac96a01a4dfa4d SHA512 bfad9793b36ed7a3d5043afe04c319d767b626293fc10aac7ac914fecd5bdd8fbc1e8176729db6bb4e6e3bc3155fe6a2ebc850c063f6b55b38602253e03b2457 WHIRLPOOL 30cb0062cd7ffbd7d578f859db87e2799f9632c6f4b890f11176ab1b5ff63ddccfb322d92f7a86d6a5de79934bd73672095e4b18a107294a4795ec18654e073b
+MISC ChangeLog 44541 SHA256 55bf13d326c5397864c0f4f0ef32a3a9ccb99d56acf58ee1a4eb9f6d2edb5bec SHA512 793786aa13cd7d4e4f2e0062e4edbc44a682202097b2c40f5e1df97d9e08cabe279c012e45688fd96ce9650d0d246f89e3cbb90a247380584e6cece86671dd0d WHIRLPOOL 1b9124e42614769104f825e017c9ad89f401a277e67a1c49a6219fd863c9aa3ead02ffaf67d9920084668de43e369563d09367a9f113a53357be866627694769
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTWTskACgkQblQW9DDEZTgLRACfUkhS3g0rE/n5HbGHvyo6VBxu
-VHwAniECjQq7ROTzVQGnsP9B2+0V3hLN
-=MnEG
+iQIcBAEBCAAGBQJU2VBdAAoJEPiazRVxLXTFxssP/0nzHUTWqFoReXnHBR1uDQ97
+Xjc2keEqr4fyykGDW+jbz53fIjP8ZSHUXZ7JNftk/y8HOpBb9wIeTaWnAL3KstHq
+RaDsieiTF/2yLqKyMkpvcMitdxXW3eK37lg/qlitWaW3vzPWLr9kMFFRCUGIplc0
+R4B7HZwQV/E61W15Gnt00iXhgBuiCI5S1NFJeYts1vsYMguZAGzTzV7SBrpuE8HU
+QflCWL4mHTv1m0gVRNyaq7fPhJExQRxKMbtLeVE6+uVLfSVGW31kfc8AY/4P/h2e
+R0i+09WC30+Jg2+GsB+NAmP/+OtaeOzzxgpuSO+EFHteeMWybXkzXVHn6jnw6rHP
+cVID/jr1wPAYA+vcL0P0ZYzgqyDOnSOkDoUD3hL75YKAel8v9fPMUoWJjiRN6Jxa
+Ew68y8w2O1b4CpFKC+1u+ZB7qsNNudSBr5WbxnkV4cM3377q9XN+u+fygVY4ArBe
+2MpyLcIglm0bEqSCnWEyjX/9MslmprQnbvZ0jLipYNyyFpcX4NKsxEUh2NpjMCQT
+fARzMn+KdILZEcxcbIIj5ylXEx6OLvEqdrOS1hXcN2ZcRakOGrKdsXXsa29cLOA+
+54VWzh0vvqmHrSDYoHQ59webKfv3TK+jgk1vQfAHaM+TiLXi8z1DuP5ZwX0UM1ab
+vIiC2pzybaY1yy7wUUHF
+=gLcJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.3.1-r1.ebuild b/net-misc/dhcp/dhcp-4.3.1-r2.ebuild
index 2ee1dabac2af..078ab71a1f0d 100644
--- a/net-misc/dhcp/dhcp-4.3.1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r1.ebuild,v 1.1 2015/02/07 17:43:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r2.ebuild,v 1.1 2015/02/10 00:27:08 polynomial-c Exp $
 
 EAPI="4"
 
diff --git a/net-misc/dhcp/dhcp-4.3.1.ebuild b/net-misc/dhcp/dhcp-4.3.1.ebuild
deleted file mode 100644
index e2e414d44ce9..000000000000
--- a/net-misc/dhcp/dhcp-4.3.1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.1.ebuild,v 1.1 2014/11/08 18:24:47 vapier Exp $
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? ( dev-libs/openssl )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-src_prepare() {
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
-	epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
-	# Stop downing the interface on Linux as that breaks link daemons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
-	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
-	epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
-	epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
-	epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
-	epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -rf doc/ja_JP.eucJP
-
-	# make the bind build work
-	binddir=${S}/bind
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
-	cd bind-*/
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	econf \
-		--enable-paranoia \
-		--enable-early-chroot \
-		--sysconfdir=${e} \
-		$(use_enable ipv6 dhcpv6) \
-		$(use_with ldap) \
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	eval econf \
-		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib/export install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	dohtml doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index 3582d612acf7..65148e08d9f4 100755
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.5 2015/02/07 07:51:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.6 2015/02/10 00:27:08 polynomial-c Exp $
 
 extra_commands="configtest"
 
@@ -92,7 +92,7 @@ start() {
 		-user dhcp -group dhcp \
 		${chroot:+-chroot} ${chroot} ${DHCPD_IFACE}
 	eend $? \
-		&& save_options dhcpcd_chroot "${chroot}" \
+		&& save_options dhcpd_chroot "${chroot}" \
 		&& save_options pidfile "${pidfile}"
 }