Drop old `emerge --config` comment #362535#9 by Petr Pisar.

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

4 files changed, 13 insertions, 10 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index fb8f2cb52a22..0c8e1e55b0b5 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.187 2011/09/17 05:28:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.188 2011/09/18 19:18:11 vapier Exp $
+
+  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild,
+  files/dhcpd.conf2:
+  Drop old `emerge --config` comment #362535#9 by Petr Pisar.
 
 *dhcp-4.2.2-r2 (17 Sep 2011)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index cf762769c73a..3e685ea8a834 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -29,7 +29,7 @@ AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 RMD160 7527ea3e52a6913ae3ba2d8a6e
 AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 RMD160 9d43cb04b50ca91c680b195eb33ca68c2d06a2a7 SHA1 5ceb5ea6ec3c444df14c04585ff1482ffe8b9e35 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe
 AUX dhcp-4.2.2-nogateway.patch 1671 RMD160 bf401172a4c379f4c51c7afcd912c3e7faef6140 SHA1 1a82353a031d49ecc27441bbb9640de9e6ff5530 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e
 AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
-AUX dhcpd.conf2 1100 RMD160 92d7fa24ddedf568fd4eaab2c9f49cf17c7d89ea SHA1 37a41582b3506af2c24d29a9f659c62b579a6d18 SHA256 431cf602f9be36475e296cde7efba7e3e8d5f05b61558dbd2ac28ff8c4e84150
+AUX dhcpd.conf2 1068 RMD160 35491b4bffec15f51c64946e6bc397c9a7937826 SHA1 7a90d5582aca68ea1ca90bb47a4094cc09e5fb82 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7
 AUX dhcpd.init2 2421 RMD160 baa01ae97b227edba7653cd51735613be2dac652 SHA1 f2068ceb2d79d7992f46b31e6a6e3277a0167dce SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5
 AUX dhcpd.init3 2525 RMD160 d56c77e6f2e3981c78c3fefad04347615e9d9d60 SHA1 c04f470d0cc3b262cf87cc766ceee5a35aec8b43 SHA256 69f5e6bee391a9a03554bead07c9dd5775e1fbb2a0ae515b7930cec328a8959c
 AUX dhcpd.init4 2892 RMD160 7f8684f6ae32fded0aee6e8b499266d71cda2572 SHA1 65e8daa6529f892e36e246d131ecd4057cb016f2 SHA256 b573cf0fe9cf2f48b544901603bae78cf173757dae02212b1d88c60c3d89625e
@@ -44,14 +44,14 @@ EBUILD dhcp-3.1.2_p1.ebuild 7582 RMD160 d7f42417b80f9f17e0c8c217c978707506802a22
 EBUILD dhcp-3.1.3_p1.ebuild 7741 RMD160 62ef4cf524beadef2847675416ea5982f23a3f8e SHA1 3995b5c53d6b11fde440cf43c0dacac31f084d72 SHA256 7a71c86e1685858826a09f28dff77d69a98ec1d37c93bbb6e4dd216af00ce96c
 EBUILD dhcp-4.2.1_p1.ebuild 6610 RMD160 0d058e755de185a58fc62a3d047021671de9a54a SHA1 5cf96d94250ba44b3120ae6a961c04e4f01996b5 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a
 EBUILD dhcp-4.2.2-r1.ebuild 7894 RMD160 13f3a4e2a9ea39fbd76dd6e6b2fd0794643a86c9 SHA1 0495e7fc318b19242a61e78b6179ff61700e7d99 SHA256 6787973217634489e3e45e67c212ff60ce80bd721a198cf3348b2961ddd17e8e
-EBUILD dhcp-4.2.2-r2.ebuild 6698 RMD160 d957fe323bad82c00677d0f55065716b2bcac12c SHA1 f1f523f62cfd7ce347057431771d191963c837b2 SHA256 4f549da39007a18926f6853eec748db8be1ac5e66bacb9434c6b8adc9972777f
+EBUILD dhcp-4.2.2-r2.ebuild 6699 RMD160 134dba8517369a9ad61f8262c1a80c804f99d278 SHA1 a7c6e5a9cf4fea08acbc51f17f72bbc31eb45eb1 SHA256 2c48a433efef3562aa06b1d513b721c729629e884417445351e08270382ea76a
 EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
-MISC ChangeLog 32394 RMD160 340c2b7591672a444e166ce46c6d788981069b2d SHA1 a7586fd40d88ae48e0710191499c030b06ba2a68 SHA256 8ca0decbbdfb43486dec3d468083daab395282c0b3075a81f751f6784ba93257
+MISC ChangeLog 32550 RMD160 cfbc249c8a6cd7103a0fd1479601f830ac6ade5a SHA1 5240e4fa50c7f68fa05a307398fdbe3a0f760c0e SHA256 2680ac8069979d0b65707e52e7fb85db6a91514d0f02acb93d48cc6b96b40b8e
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk50MCAACgkQaC/OocHi7JYdWgD+J899XRRy9awIFhYlq6SXM6dK
-I3n7K2kJ9glAerqCdL0A/24QcPg279BzYGR7S6hUq4/LfdTaF8U2DwIcFU6jZ0pX
-=wZ8f
+iF4EAREIAAYFAk52Q/kACgkQaC/OocHi7JYX7wD/VzCN4AAO+crXacD3jykETZqy
+U8dMqwDu5/2td2556v8A/19iRVRRVYj2YmpqtjZUm8XUz91qgIboPICMmHxk2bYF
+=h2ck
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
index bd5705519470..90148be06389 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.1 2011/09/17 05:28:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.2 2011/09/18 19:18:11 vapier Exp $
 
 EAPI="2"
 
@@ -192,7 +192,7 @@ src_install() {
 		fi
 
 		newinitd "${FILESDIR}"/dhcpd.init3 dhcpd || die
-		newconfd "${FILESDIR}"/dhcpd.conf dhcpd || die
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd || die
 		newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay || die
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay || die
 	fi
diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2
index c3aa146f0be0..5cd2eeca3f71 100644
--- a/net-misc/dhcp/files/dhcpd.conf2
+++ b/net-misc/dhcp/files/dhcpd.conf2
@@ -13,7 +13,6 @@
 # If you wish to run dhcpd in a chroot, uncomment the following line
 # DHCPD_CHROOT="/var/lib/dhcp/chroot"
 
-# Then run emerge dhcp --config
 # All file paths below are relative to the chroot.
 # You can specify a different chroot directory but MAKE SURE it's empty.