Use dnsmasq a primary dhcp/tftp server.

6 files changed, 14 insertions, 8 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 1bfa7c9..ed048eb 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 09 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.4.3:
+  Prefer dnsmasq as dhcp server.
+
+  19 09 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.7:
+  Prefer dnsmasq as dhcp server.
+
   23 08 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.4.3:
   Remove !ltsp-client dep
 
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 7885b1d..93e2fb7 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,4 +1,4 @@
-EBUILD ltsp-server-5.3.7.ebuild 3410 SHA256 215c435014c2e6d38ac97b8c9bf98be7d294bcb94a4ee5f120cdcd85d8dd55bb SHA512 41a1365fdb109b88a9fbdf4a2f94788691e068ef1c54781442585907762395ea2923b669eec51a3553e85301c135f4cc750282d437a6d3caf4610409a80a0728 WHIRLPOOL 3749ee5892db7925f04406d05d4e7318e02b8d6e69568f12b615897cdf1e2a50a5f3254e5761e92a60bea868ea29ec3a43731df1214b0e9eaff07e4dff6271c4
-EBUILD ltsp-server-5.4.3.ebuild 3866 SHA256 d17a529726bc7b47a06e71f73c4841447d175578ac1ddfb8ccc9be5e0511aa6f SHA512 e11d13fedd38bd628340e8085011b80722df2088497ec7e0fc88a9bee6a4d4e7aa41f52c8b040f85460e355f753279583e15a633117f84847e1ab82cfd44f968 WHIRLPOOL d51b931d4069cd439c9fb18e27bed4942a0cbbd0b0d51268feb8d2cc31a18846978a49874498db9f75c6db70809d8b90724d2abbb15fadd61d02016be2250564
-MISC ChangeLog 6366 SHA256 1b10d7be17eda8a99611252e1cf75ba275e84741d238b2ab8c75380f75be7739 SHA512 db08f7cacef6fd7f676bebc47b1cf39766240c5e9d837823b7754d55e52790d0d1cb9f1806e0ea66d14f9d0b4de0621e3233ae0ac4e5d3f47458e9f6003e868e WHIRLPOOL dcef0a43c83b4d2835c3ae1413fb395195025ae9e817dce273d52d91113f50b7b32f441165fb1872374c6cd45950fd536c69503f36bdcfb3f42bdd6bdf35d43f
+EBUILD ltsp-server-5.3.7.ebuild 3410 SHA256 8674457ab42e409dfab054c158a1f06f3cf36d836c3fdcd5eff64a0af5a9a7b5 SHA512 fdcb603bba00cf706687be11f316b034068e83530641095ce91a388b745dec5ccf5c0f97ac360c482b79132e1566a82f196c1cf0a7161e06b5e85d21289c1b53 WHIRLPOOL 013d5aa121a8f34e1e0506dc646e2e8217c0a541051d860469787947cbb1a0989e3cc8599c80f054b34a9882347aee8261ef838df958934759670c8c00723791
+EBUILD ltsp-server-5.4.3.ebuild 3866 SHA256 bb414c243f16789c8b7652fd0c26cc0837e746f9f21000186391ad3f5841f5f6 SHA512 6177738ffad8add2ee9de4643ed2af158c15f23227e7e6068c7f2546b378dcaee9bce46f90e28eff1e92800a80998c472c2b6a53725fd4d95d476f45aed9b2ef WHIRLPOOL 4b25983846e81d93ffb1457c5a2421f4fc2dff6c767a099f49eaed8ebf936b1e2305931f21be3d536e03c480acc6150264b5c07586ce61a6570b99b098af6379
+MISC ChangeLog 6562 SHA256 f12f9278091d6562aacf125dbb859aa3efed3dd2f94d38eaeb54cf005d318e6f SHA512 c2fe93044e18f17b1ae11f92b107a91cf4f7bf4e618111dec326452945f54326e6a982a8991c893f48cdca1dfe70c8683f8a454047737f45aca41bc36308a544 WHIRLPOOL 243cff34353e6dc0945dcb73e61a68ced3c291e94596b1162feb303b288958517c99364ae8891a495724bb95511f4dfd95ecb1521f9d42553773b292a45df6d1
 MISC metadata.xml 528 SHA256 4adb661e3ac65b7092ff1360b903e0cfb4039ad305bf08102f16f0a689db1b4c SHA512 5fb79d5101906c1cdfd6cce2543f0e18f10964bb98186aa9b2166d33e917a7878a0eb1ad67d7ef4dfffb83c12cca7bd804f866bba70a201a3e17c8647256c348 WHIRLPOOL 0a9fa3c88a3c817aff74fb5f0cf78bfdf50cac6d0647b0a1fc8ad469539fccea8dcaf16b7e4653b59e1e655c1bb3074c4f9cd6b1a34d4f9c780a0b50d87899c2
diff --git a/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
index 88027e2..a595040 100644
--- a/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
@@ -23,7 +23,7 @@ DEPEND=""
 # iproute2 - ltsp-update-sshkeys requires ip
 RDEPEND="net-misc/openssh
 	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
+	dhcp? ( || ( net-dns/dnsmasq net-misc/dhcp ) )
 	nfs? (
 		>net-fs/nfs-utils-1.1.5
 	)
diff --git a/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild b/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild
index cd3e09a..6f076e2 100644
--- a/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.4.3.ebuild
@@ -23,7 +23,7 @@ DEPEND=""
 # iproute2 - ltsp-update-sshkeys requires ip
 RDEPEND="net-misc/openssh
 	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
+	dhcp? ( || ( net-dns/dnsmasq net-misc/dhcp ) )
 	nfs? (
 		>net-fs/nfs-utils-1.1.5
 	)
diff --git a/virtual/tftp/Manifest b/virtual/tftp/Manifest
index 5ad1dbb..bca571b 100644
--- a/virtual/tftp/Manifest
+++ b/virtual/tftp/Manifest
@@ -1 +1 @@
-EBUILD tftp-1.0.ebuild 596 RMD160 eaf263dd3a7eeb988af9ad65583a4a545a6ee568 SHA1 62a36e0274421128646c48ef9973a2c73c17f5a8 SHA256 7fe9fe9a3fb2b74443faeaa5a7fa709d0707e0c7d8079bda15b7194cd604b579
+EBUILD tftp-1.0.ebuild 612 SHA256 883e0585d9a078aed8b41c3cc45ca0c98e6696a5f9cee37eec68c4464259efb4 SHA512 8e097afc581c6c44228987a3e454b27c01e7f07d471cd185b2cc59fb33ece111527ad893425c2bc1b3255784b57652e89b41822fc4b5db961f70ad0dc285a37c WHIRLPOOL 9f0fbc89ddb31bd9f1196ea86dce77e96deb51013af882c3165995419e4616bac8f051bb125d2841c6f0c08e5d37ac05620bea9d79eb665bd34df04b0979b8c7
diff --git a/virtual/tftp/tftp-1.0.ebuild b/virtual/tftp/tftp-1.0.ebuild
index 6fa3046..8f8e933 100644
--- a/virtual/tftp/tftp-1.0.ebuild
+++ b/virtual/tftp/tftp-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,4 +12,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( net-ftp/atftp net-ftp/netkit-tftp net-ftp/tftp-hpa )"
+RDEPEND="|| ( net-dns/dnsmasq net-ftp/atftp net-ftp/netkit-tftp net-ftp/tftp-hpa )"