ltsp-server: 5.3.7 stable for amd64 and x86

4 files changed, 7 insertions, 156 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 591c8c9..359f1d2 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 05 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.7:
+  Stable for amd64 and x86.
+
 *ltsp-server-5.3.7 (04 04 2012)
 
   04 04 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.7:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 66ba94a..9aa7bae 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,4 +1,3 @@
-EBUILD ltsp-server-5.2.19.ebuild 3362 RMD160 81fe236df687ff5f6b1857f21018a8b4688a3f33 SHA1 1c1e242cc5dc52df5a0790513b67e08d877d83ff SHA256 3de1bd3d4a22f9305511c042ec7e287072d718306c5ad51cf92dba817db40d5b
-EBUILD ltsp-server-5.3.7.ebuild 3663 RMD160 0fd9fc1ca3064a3f233b23abdc6d0f28ad429a97 SHA1 a1696da800f8b2e751d03f0ceaa740201c343bbd SHA256 1219921a31bd057e60a0ac6e01012d4abc0fa6fddaf1395b937ee75bdd93f689
-MISC ChangeLog 5635 RMD160 a540ddf7a10795a2c14bb8eb12de458ae24336d2 SHA1 aa18c25c7b1f00958b76b996be44430df0382ca8 SHA256 2dde59dafc0b01529e9c492aaa2ab874931ba3f4ddcdd85d014957f737fb6053
+EBUILD ltsp-server-5.3.7.ebuild 3433 RMD160 1cde9140e528db63da43921f22521de83ed04e8a SHA1 ce45cee1df11ab4cf889ae366c70275311ca4a05 SHA256 8595362ef87e3cfe172e917197673b83969b938503ddb4775981596825a2fb16
+MISC ChangeLog 5728 RMD160 d0afe941f8a6d23f2aea68336ec0a8ae0d48f84d SHA1 28e283f98af304b678ce6fc18fbfa80f704b2e10 SHA256 9b0a35acf0627d47043635a78dbc7e0cbf17a8922f10fc581c321a9e70ff1a70
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.19.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.19.ebuild
deleted file mode 100644
index 2001cc2..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2.19.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-EBZR_REVISION="1990"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-inherit bzr
-
-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 +pulseaudio +X"
-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
-	net-misc/openssh
-	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
-	nfs? (
-		>net-fs/nfs-utils-1.1.5
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	pulseaudio? (
-		media-sound/pulseaudio
-	)
-	X? (
-		x11-apps/xdm
-		x11-base/xorg-server
-	)
-	sys-fs/ltspfs
-	sys-apps/lsb-release
-	>sys-apps/quickstart-0.6
-	sys-apps/iproute2
-	>=app-portage/layman-1.3
-	sys-boot/syslinux
-	net-misc/ldminfod"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	insinto /etc/ltsp/profiles
-	doins server/configs/Gentoo/*.profile
-
-	insinto ${ltspdir}
-	doins ltsp-common-functions
-
-	insinto ${ltspdir}/plugins
-	doins -r server/plugins/*
-
-	insinto /etc/ltsp
-	doins server/configs/Gentoo/ltsp-build-client.conf
-		
-	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
-	dosbin server/scripts/debian/ltsp-chroot
-
-	doman localapps/doc/ltsp-localapps.1
-	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
-		dosbin server/ltsp-update-image
-		dosbin server/ltsp-swapfile-delete
-		dosbin server/nbd-update-config
-		dosbin server/nbdrootd
-		dosbin server/nbdswapd
-
-		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbd*
-		
-		insinto /etc/ltsp
-		doins server/configs/nbdswapd.conf 
-
-		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 localapps/doc/examples/*
-		dodoc server/doc/examples/*
-	fi
-}
-
-pkg_postinst(){
-	einfo
-	einfo "Starting from ltsp-server-5.2.18, quickstart and kicktoo"
-	einfo "are both supported ltsp-build-client installers."
-	einfo "All quickstart arguments are replaced by more generic"
-	einfo "installer arguments. Also, profiles are now available in"
-	einfo "/etc/ltsp/profiles ."
-	einfo "Quickstart is still the default installer."
-	einfo
-	einfo "Starting from ltsp-server-5.2.19, the default install"
-	einfo "architecture is i686, instead of x86. To keep using"
-	einfo "your binary packages, rename the arch dirs in the portage"
-	einfo "package dir accordingly."
-	einfo
-	 
-	if use nbd; then
-		einfo "Only NFS is supported for mounting the client chroot."
-		einfo "Mounting swap over NBD is supported."
-		einfo
-	fi
-
-	if use X; then
-		einfo
-		einfo "Don't forget to install a window manager,"
-		einfo "you can't log in with X onto your server without one."
-	fi
-}
-
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 9b98843..2ee8845 100644
--- a/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="LTSP server"
 HOMEPAGE="http://www.ltsp.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Default to nfs until nbd works
 IUSE="doc dhcp examples nbd +nfs +pulseaudio +X"
 DEPEND=""
@@ -122,11 +122,6 @@ pkg_postinst(){
 	einfo "You can choose to install a 5.2 or a 5.3 client by pointing"
 	einfo "to it's appropriate build profile in /etc/ltsp/profiles."
 	einfo "The default is set to a 5.2 client."
-	einfo
-	einfo "Starting from ltsp-server-5.2.19, the default install"
-	einfo "architecture is i686, instead of x86. To keep using"
-	einfo "your binary packages, rename the arch dirs in the portage"
-	einfo "package dir accordingly."
 	 
 	if use nbd; then
 		einfo
@@ -141,7 +136,7 @@ pkg_postinst(){
 	fi
 	
 	ewarn
-	ewarn "In line with upstream, ltsp-update-kernels tool now also"
+	ewarn "In line with upstream, the ltsp-update-kernels tool now also"
 	ewarn "removes old boot files from the tftpdir. It removes all"
 	ewarn "default genkernel generated filenames for which the version"
 	ewarn "is different from the chroot kernel. For details, look at"