ltsp-server: Version bump to 5.3.

5 files changed, 42 insertions, 29 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 06232d5..6d1aafa 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for net-misc/ltsp-server
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.3 (17 02 2012)
+
+  17 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3:
+  Version bump.
+  
+  17 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-9999:
+  Added ltsp-chroot man and removed genkernel dep.  
+
 *ltsp-server-5.2.19 (31 12 2011)
 
   31 12 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.19:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 2443caa..3209d7f 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -2,9 +2,9 @@ AUX ltsp-server-5.2.17-profile.patch 436 RMD160 27086e88290c49846d6b4b6b571c896f
 AUX ltsp-server-5.2.18-kicktoo.patch 438 RMD160 dca7d76c3d2f9c1aad7ca6cdeee7a8dea50cd6c3 SHA1 7dac94886e5cf624d099c8ea35abb439d43d10b7 SHA256 6c8da09fe949a08c39eb39fd3515ef735cdde38c912213a92691427b9f57283c
 AUX ltsp-server-5.2.18-quickstart.patch 444 RMD160 d24ad8deb657ed9087ff707c5c8be0d233f416ef SHA1 2c4aa99ba813323f62814aaf8bacb77b707ae049 SHA256 bb134dfb588df4f0cc2e2c3f40fdb835184c33af9ab0bd8986d8045365c6bb90
 AUX ltsp-server-5.2.18-setstage.patch 678 RMD160 195f2a67352d4255917c157ef34798add1940aef SHA1 2572a93fbad8b5ba75f93c656e6146a6c73eaf68 SHA256 172842e76958c2086f57b7f2112018154ff9f8f62d2f786271923a2ba284edca
-EBUILD ltsp-server-5.2.17-r1.ebuild 2645 RMD160 6b1f40d7e507d4c4db684b7a205b18fd54668624 SHA1 62d27b61dd5880ef22d2a33ba61d4a5bb1958923 SHA256 2a3c91641fd4238808450832dfa26295eba6436aa674e4cf24b218fcca7ea351
-EBUILD ltsp-server-5.2.18-r2.ebuild 3155 RMD160 9d3d5bb34b2b905c3bdb4debd4df26e7fed689bf SHA1 c9ba7c068376ae544ce442b5ab103ac07f815676 SHA256 fd7eb611e98bae3d8557e8917cfd8690d523c4245e4d641bd0bb66ffff139b9c
+EBUILD ltsp-server-5.2.18-r2.ebuild 2811 RMD160 6df6c6107f313a7825549d917a2641f556970648 SHA1 a37bcd633b14b854c82e055943bc48c66e37201e SHA256 fd82379585881cc94654899b1b9c737ba6cd08d86db18494d08b2486699014d8
 EBUILD ltsp-server-5.2.19.ebuild 3286 RMD160 f81fa6cb3fd7f7b7014be9b0f0fa44f019b88fe5 SHA1 afeab7de4890ecfe706f0fe770a529b6aa755426 SHA256 d8c295bceb40f262a9ad653f7d63937094c0e7fea13161a57cf8571817ff3971
-EBUILD ltsp-server-9999.ebuild 2553 RMD160 2e8e5ac5a3ec4169225170e38ebcd5511547e528 SHA1 17fee967a1a760ccbbbbf4db8f919538a5c2bef7 SHA256 5670b70110e9530ab482ecd58501747f34fe6d4fea222282831fb19afeaa568e
-MISC ChangeLog 4384 RMD160 55ca1bee73de8864aead19abe5553bfba43aa311 SHA1 b916045e55c3f0474ea2c1fc649687de00445d19 SHA256 dd1eed8a1cfcdf79c36009dc0b36a7f223039f5010dd5431a6aa5895b7eb1c62
+EBUILD ltsp-server-5.3.ebuild 2942 RMD160 5f08641e6da8f165c30e244c0977e69be17001d7 SHA1 03a4984d08f677aa8906cce2e9a1626bd0aa9e6d SHA256 f85339c4b8bf62a89ed16d588dbcaf990c54ddc9a5a7c89945c15148c713a3fa
+EBUILD ltsp-server-9999.ebuild 2647 RMD160 19ecbd7ac6dd252d09751942965354dbad2645a6 SHA1 2443fba6e40b4825a734f410a7368a4b2fd5188d SHA256 de799c941ce19b322491f9bc571d7e7308e35664510fd98199ebb80038dffc09
+MISC ChangeLog 4613 RMD160 1e53bf804776558750922e81b96d2815f5f35bc7 SHA1 e12c2ca2693dd3c61c1e39135fb411211a823074 SHA256 07fd7f8aa755492da2127d21f88df9b2128576603edc7fac174206889976e6d8
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
index 6ec5f7f..749a289 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.18-r2.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: $
 
@@ -118,20 +118,13 @@ src_install() {
 }
 
 pkg_postinst(){
-	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 ""
-	 
 	if use nbd; then
+		einfo
 		einfo "Only NFS is supported for mounting the client chroot."
 		einfo "Mounting swap over NBD is supported."
-		einfo ""
 	fi
 	
+	einfo
 	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.17-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.ebuild
index de77d21..dbfcd54 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.17-r1.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 
-EBZR_REVISION="1924"
+EBZR_REVISION="2070"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -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"
 DEPEND=""
@@ -48,15 +48,11 @@ src_unpack() {
 	bzr_src_unpack
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-profile.patch"
-}
-
 src_install() {
 	ltspdir="/usr/share/ltsp"
 
-	insinto /etc/ltsp/quickstart
-	doins server/configs/quickstart/*
+	insinto /etc/ltsp/profiles
+	doins server/configs/Gentoo/*.profile
 
 	insinto ${ltspdir}
 	doins ltsp-common-functions
@@ -64,6 +60,9 @@ src_install() {
 	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
@@ -71,17 +70,18 @@ src_install() {
 	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
+	doman server/doc/ltsp-chroot.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
 
@@ -113,12 +113,19 @@ src_install() {
 }
 
 pkg_postinst(){
+	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
 		einfo "Only NFS is supported for mounting the client chroot."
 		einfo "Mounting swap over NBD is supported."
-		einfo ""
 	fi
 	
+	einfo
 	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-9999.ebuild b/net-misc/ltsp-server/ltsp-server-9999.ebuild
index 93e2ece..cdeeba3 100644
--- a/net-misc/ltsp-server/ltsp-server-9999.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-9999.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: $
 
@@ -37,7 +37,6 @@ RDEPEND="!net-misc/ltsp-client
 	)
 	sys-fs/ltspfs
 	sys-apps/lsb-release
-	sys-kernel/genkernel
 	>sys-apps/quickstart-0.6
 	sys-apps/iproute2
 	>=app-portage/layman-1.3
@@ -81,7 +80,6 @@ src_install() {
     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
 
@@ -113,6 +111,13 @@ src_install() {
 }
 
 pkg_postinst(){
+	if use nbd; then
+		einfo
+		einfo "Only NFS is supported for mounting the client chroot."
+		einfo "Mounting swap over NBD is supported."
+	fi
+	
+	einfo
 	einfo "Don't forget to install a window manager,"
 	einfo "you can't log in to your ltsp-client without one."
 }