minimal USE flag stops the building of the DHCP server

  doc USE flag installs the documentation
Package-Manager: portage-2.1_rc4-r5

3 files changed, 8 insertions, 233 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 7afd6f8e4ab9..b14f4c2caaea 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -96,18 +96,14 @@ EBUILD dhcp-3.0.3-r9.ebuild 6804 RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200
 MD5 508bffdc4bd6251094f6de3ca28b13cd dhcp-3.0.3-r9.ebuild 6804
 RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200 dhcp-3.0.3-r9.ebuild 6804
 SHA256 e8b73b1a0efba6790e391ee7abf26092ab828ced610c4686bed5101372d10bfd dhcp-3.0.3-r9.ebuild 6804
-EBUILD dhcp-3.0.4-r1.ebuild 6731 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f SHA1 cc14f9d851d4cd4971491c38b39470917cb7661a SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3
-MD5 457ed83ee767022057c8b34ff843749e dhcp-3.0.4-r1.ebuild 6731
-RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f dhcp-3.0.4-r1.ebuild 6731
-SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3 dhcp-3.0.4-r1.ebuild 6731
-EBUILD dhcp-3.0.4.ebuild 6728 RMD160 474958f105901448503494b90762f26206f087bf SHA1 f63e75ce924f51594235e74e8183087ecb2ee5f3 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1
-MD5 659d30979078da7726375d8a45b9093d dhcp-3.0.4.ebuild 6728
-RMD160 474958f105901448503494b90762f26206f087bf dhcp-3.0.4.ebuild 6728
-SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1 dhcp-3.0.4.ebuild 6728
-MISC ChangeLog 17815 RMD160 e1882e490c6aed2bc6a3348c9303c5fdc118b721 SHA1 de9430ac7237f730fb8e9d08e972d4587e8cccc4 SHA256 8c93ed9ba750c872f8f69b8096c093e7aefdacff79400b34f80e68126f05d4a1
-MD5 c99c55591b59c9b26d0c8b9d347ad16a ChangeLog 17815
-RMD160 e1882e490c6aed2bc6a3348c9303c5fdc118b721 ChangeLog 17815
-SHA256 8c93ed9ba750c872f8f69b8096c093e7aefdacff79400b34f80e68126f05d4a1 ChangeLog 17815
+EBUILD dhcp-3.0.4-r1.ebuild 7029 RMD160 ff3995d0d03e1e63505b47921bb7c216908f16bd SHA1 d44a2227a5a46818cbc3e64c72be98f4c5516b4b SHA256 02f2bb7056168e1c10c33eb35c501cc167b532ac3526afa9171890e613355974
+MD5 6fd5e5109bfa4d1d944d726207f13f4f dhcp-3.0.4-r1.ebuild 7029
+RMD160 ff3995d0d03e1e63505b47921bb7c216908f16bd dhcp-3.0.4-r1.ebuild 7029
+SHA256 02f2bb7056168e1c10c33eb35c501cc167b532ac3526afa9171890e613355974 dhcp-3.0.4-r1.ebuild 7029
+MISC ChangeLog 17990 RMD160 1adbd56c5de59254b42d2e3325e0ae5f07563929 SHA1 299bee4f1f059a6bd9183a4052a46a4a08be880a SHA256 76dbc4cd61022c7bccc3bc7db5b9c8b859e96a5f53c0047fc856e4e15332fbc2
+MD5 9b598c03e3c0722beabd0e6af2cd8cb4 ChangeLog 17990
+RMD160 1adbd56c5de59254b42d2e3325e0ae5f07563929 ChangeLog 17990
+SHA256 76dbc4cd61022c7bccc3bc7db5b9c8b859e96a5f53c0047fc856e4e15332fbc2 ChangeLog 17990
 MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af
 MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330
 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330
@@ -118,9 +114,6 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r9 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r9 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r9 232
-MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4 232
-RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4 232
-SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4 232
 MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4-r1 232
 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4-r1 232
 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4-r1 232
diff --git a/net-misc/dhcp/dhcp-3.0.4.ebuild b/net-misc/dhcp/dhcp-3.0.4.ebuild
deleted file mode 100644
index 937e6ea2e88e..000000000000
--- a/net-misc/dhcp/dhcp-3.0.4.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.4.ebuild,v 1.2 2006/05/09 16:09:22 uberlord Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dhcp )
-	kernel_linux? ( sys-apps/net-tools )"
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	>=sys-apps/sed-4"
-
-PROVIDE="virtual/dhcpc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gentoo patches - these will probably never be accepted upstream
-	# Enable chroot support
-	epatch "${FILESDIR}/${PN}-3.0-paranoia.patch"
-	# Fix some permission issues
-	epatch "${FILESDIR}/${PN}-3.0-fix-perms.patch"
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-ntp.patch"
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-resolvconf.patch"
-	# Fix setting hostnames on Linux
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-hostname.patch"
-	# Allow mtu settings
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-mtu.patch"
-	# Allow dhclient to use IF_METRIC to set route metrics
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-metric.patch"
-	# Stop downing the interface on Linux as that breaks link dameons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
-	# Quiet the isc blurb
-	epatch "${FILESDIR}/${PN}-3.0.3-no_isc_blurb.patch"
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}/${PN}-3.0.4-dhclient-stdin-conf.patch"
-
-	# General fixes which will probably be accepted upstream eventually
-	# Install libdst, #75544
-	epatch "${FILESDIR}/${PN}-3.0.3-libdst.patch"
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch"
-
-	# NetworkManager support patches
-	# If they fail to apply to future versions they will be dropped
-	# Enable eXtended options
-	epatch "${FILESDIR}/${PN}-3.0.3-x-option.patch"
-	# Add dbus support to dhclient
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-dbus.patch"
-
-	# Brand the version with Gentoo
-	# include revision if >0
-	local newver="${MY_PV}-Gentoo"
-	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
-	sed -i -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
-		includes/version.h
-
-	# 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/*
-
-	# Remove these options from the sample config
-	sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf
-
-	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
-	local x=
-	for x in Makefile.dist $(ls */Makefile.dist) ; do
-		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}"
-	done
-
-	# 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
-	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
-}
-
-src_compile() {
-	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-	[[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O
-
-	use static && append-ldflags -static
-
-	cat <<-END >> includes/site.h
-	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
-	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
-	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
-	#define DHCPD_LOG_FACILITY LOG_LOCAL1
-	END
-
-	cat <<-END > site.conf
-	CC = $(tc-getCC)
-	LFLAGS = ${LDFLAGS}
-	LIBDIR = /usr/$(get_libdir)
-	INCDIR = /usr/include
-	ETC = /etc/dhcp
-	VARDB = /var/lib/dhcp
-	VARRUN = /var/run/dhcp
-	ADMMANDIR = /usr/share/man/man8
-	ADMMANEXT = .8
-	FFMANDIR = /usr/share/man/man5
-	FFMANEXT = .5
-	LIBMANDIR = /usr/share/man/man3
-	LIBMANEXT = .3
-	USRMANDIR = /usr/share/man/man1
-	USRMANEXT = .1
-	MANCAT = man
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
-		${CFLAGS}" || die "configure failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	insinto /etc/dhcp
-	newins server/dhcpd.conf dhcpd.conf.sample
-	newins client/dhclient.conf dhclient.conf.sample
-
-	dodoc README RELNOTES doc/*
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-
-	newinitd "${FILESDIR}/dhcpd.init" dhcpd
-	newinitd "${FILESDIR}/dhcrelay.init" dhcrelay
-	insinto /etc/conf.d
-	newins "${FILESDIR}/dhcpd.conf" dhcpd
-	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
-
-	keepdir /var/{lib,run}/dhcp
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
-
-pkg_postinst() {
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	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
-
-	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
-	einfo
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
-	einfo "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	local CHROOT="$(
-		sed -n 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
-		/etc/conf.d/dhcpd
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
-		return 1
-	fi
-
-	if [[ -d ${CHROOT} ]] ; then
-		ewarn "${CHROOT} already exists - aborting"
-		return 0
-	fi
-
-	ebegin "Setting up the chroot directory"
-	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-	cp /etc/{localtime,resolv.conf} "${CHROOT}/etc"
-	cp -R /etc/dhcp "${CHROOT}/etc/"
-	cp -R /var/lib/dhcp "${CHROOT}/var/lib"
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the dhcpd server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.4 b/net-misc/dhcp/files/digest-dhcp-3.0.4
deleted file mode 100644
index 03ec8dae9fa3..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 004ef935fd54b8046b16bdde31a9e151 dhcp-3.0.4.tar.gz 883245
-RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac dhcp-3.0.4.tar.gz 883245
-SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 dhcp-3.0.4.tar.gz 883245