ltsp-server: Version bump to 5.2.4, removed 5.2*.

4 files changed, 14 insertions, 121 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 0f8e807..927e3bd 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.4 (02 08 2010)
+
+  02 08 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.4:
+  Version bump.
+
 *ltsp-server-5.2.3-r1 (28 07 2010)
 
   28 07 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.3-r1:
@@ -10,7 +15,6 @@
   28 07 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-9999:
   Updated layman dep to 1.3.
 
-
 *ltsp-server-5.2.2 (25 04 2010)
 
   25 04 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.2:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 1e1e73d..f55db74 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,9 +1,7 @@
-AUX ltsp-server-5.2-r1-quickstart.patch 351 RMD160 98eaab0cb3e67de30b711e763d6162644f970ad3 SHA1 4a7c9c931ff5e44dc596bc69e614641a38023fac SHA256 0d568b4f6dcae2f0ec53805221f7b10c6908d4fb85b33ad015140b4ef801196e
 AUX ltsp-server-5.2.3-r1-layman.patch 571 RMD160 e091d7abb916f85d562e4b54b56c4e66dae7b36c SHA1 b82d5ff71a827be5c0cd32be242b4e225a8e2a98 SHA256 41aa4d61f01dbfdfa8f809cedb25fc0eb19983e5948085d7d05417ffe3aff250
-EBUILD ltsp-server-5.2-r1.ebuild 2279 RMD160 c7c2790ebba6c3644e72de3f9d1ebb97f34a1b50 SHA1 ec42f18f7f05b4f7eeca40fcc88a8c52346b8ec4 SHA256 598ecbc778ce0dea1bf7d9484910d7685cc3dd8347ea8a645b492d0945b6eacb
 EBUILD ltsp-server-5.2.2.ebuild 2272 RMD160 44821f991c2546e893e3fa5efd47e778d96c58cb SHA1 2c1871f76135c42ff57f8bbaa8db987ebeda93f1 SHA256 1c90bd3f06e8af413f6110327154aea5cf88aa80b3a1e7501ffeee1ec20da74e
 EBUILD ltsp-server-5.2.3-r1.ebuild 2324 RMD160 5ed72c044337309b33650d8f0c32d27f83875da9 SHA1 66fca1a4f5b08e1378a7012ed582f6e3e81a06cf SHA256 a026c8eca0b5d4ce4a61d94300cddd487eeadac1963886f11445b4acd82ceb9a
-EBUILD ltsp-server-5.2.ebuild 2208 RMD160 70b02fb7c514b0168c7d6293312e865f6e7263e0 SHA1 79266d21931f5f959c943ac559bbd921ee479aff SHA256 85dff9f1e5b780eb15a3a5133aa334c469079126bb9c26f7785e980d3491a05b
+EBUILD ltsp-server-5.2.4.ebuild 2272 RMD160 6a286c6413bc5a699ae26304a303d98364ca6354 SHA1 0521994dc352a75505dbcc298da730be65ff1878 SHA256 8e538f3559f4a4d2eeb64a2911a4a3f2b367959586aa247d0f66019e17e1ffd3
 EBUILD ltsp-server-9999.ebuild 2246 RMD160 11d8c1a52dea01d81c96af1faefa8b2e6d75e3d8 SHA1 1fb3da71e22773d61b2ba451b2b064b4814b22d1 SHA256 cac45056c155d9108163a183c00065428ba20bb05be18b365909e7d48dfa5a63
-MISC ChangeLog 1413 RMD160 30c81fd3c86cdf712db13699cfc301ae3598be50 SHA1 e8f3dd018f9b2e46a93d51857f1dc45b80d07b36 SHA256 6f1e9817372187ec8660c46ec74e8c6917ac9254b6f21d69bbe866519e2604cf
+MISC ChangeLog 1526 RMD160 1cfbca3753e0f6f20758308ce8e563be77c6d485 SHA1 d64f9790c64c3ad569ed4ad3f2b1429fd26c1740 SHA256 7c65670b9da45f8903392669e5b221e553ad05b52301590e0349869dad1035f1
 MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3
diff --git a/net-misc/ltsp-server/ltsp-server-5.2-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2-r1.ebuild
deleted file mode 100644
index 3eda28a..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2-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: $
-
-EAPI="1"
-
-EBZR_REVISION="1674"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-inherit bzr
-inherit eutils
-
-DESCRIPTION="LTSP server"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Default to nfs until nbd works
-IUSE="doc dhcp examples nbd +nfs"
-DEPEND=""
-
-# NOTES on the dependencies
-# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession
-# iproute2 - ltsp-update-sshkeys requires ip
-RDEPEND="!net-misc/ltsp-client
-	x11-apps/xdm
-	media-sound/pulseaudio
-	x11-base/xorg-server
-	net-misc/openssh
-	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
-	nfs? (
-		net-fs/nfs-utils
-		net-nds/portmap
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	sys-fs/ltspfs
-	sys-apps/lsb-release
-	sys-kernel/genkernel
-	>sys-apps/quickstart-0.6
-	sys-apps/iproute2
-	>=app-portage/layman-1.2
-	sys-boot/syslinux
-	net-misc/ldminfod"
-
-src_unpack() {
-	bzr_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PF}-quickstart.patch"
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	insinto /etc/ltsp/quickstart
-	doins server/configs/quickstart/*
-
-	insinto ${ltspdir}
-	doins ltsp-common-functions
-
-	insinto ${ltspdir}/plugins
-	doins -r server/plugins/*
-
-	dobin localapps/ltsp-localapps
-
-	dosbin server/ltsp-keys
-	dosbin server/ltsp-build-client
-	dosbin server/ltsp-update-kernels
-	dosbin server/ltsp-update-sshkeys
-
-	doman server/doc/ltsp-build-client.8
-	doman server/doc/ltsp-update-kernels.8
-	doman server/doc/ltsp-update-sshkeys.8
-
-	if use nbd; then
-		dosbin server/ltsp-update-image
-		dosbin server/nbdrootd
-		dosbin server/nbdswapd
-
-		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbd*
-
-		doman server/doc/ltsp-update-image.8
-		doman server/doc/nbdrootd.8
-		doman server/doc/nbdswapd.8
-	fi
-
-	if use doc; then
-		dodoc TODO
-		dodoc server/doc/CodingStyle
-		dodoc server/doc/QuickInstall
-		dodoc server/doc/lts-parameters.txt
-		dodoc server/doc/plugins
-		dodoc server/doc/swap
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc server/doc/examples/*
-	fi;
-}
-
-pkg_postinst(){
-	einfo "Don't forget to install a window manager,"
-	einfo "you can't log in to your ltsp-client without one."
-}
-
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.4.ebuild
index 0295256..f1e5e97 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="1"
 
-EBZR_REVISION="1674"
+EBZR_REVISION="1771"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -42,7 +42,7 @@ RDEPEND="!net-misc/ltsp-client
 	sys-kernel/genkernel
 	>sys-apps/quickstart-0.6
 	sys-apps/iproute2
-	>=app-portage/layman-1.2
+	>=app-portage/layman-1.3
 	sys-boot/syslinux
 	net-misc/ldminfod"
 
@@ -64,16 +64,18 @@ src_install() {
 
 	dobin localapps/ltsp-localapps
 
+	dosbin server/ltsp-info
 	dosbin server/ltsp-keys
 	dosbin server/ltsp-build-client
 	dosbin server/ltsp-update-kernels
 	dosbin server/ltsp-update-sshkeys
 
 	doman server/doc/ltsp-build-client.8
+	doman server/doc/ltsp-info.1
 	doman server/doc/ltsp-update-kernels.8
 	doman server/doc/ltsp-update-sshkeys.8
 
-	if use nbd; then
+    if use nbd; then
 		dosbin server/ltsp-update-image
 		dosbin server/nbdrootd
 		dosbin server/nbdswapd
@@ -84,9 +86,9 @@ src_install() {
 		doman server/doc/ltsp-update-image.8
 		doman server/doc/nbdrootd.8
 		doman server/doc/nbdswapd.8
-	fi
+    fi
 
-	if use doc; then
+    if use doc; then
 		dodoc TODO
 		dodoc server/doc/CodingStyle
 		dodoc server/doc/QuickInstall