ltsp-server: version bump to 5.3.6

8 files changed, 9 insertions, 210 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 413d143..62de96c 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.3.6 (23 03 2012)
+
+  23 03 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.6:
+  Version bump, removed nbdrootd stuff.
+
   11 03 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.5:
   Add X and pulseaudio USE for optional server login support, thx to Tom Ribbens.
 
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index b5c38e8..2d65e9b 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,9 +1,4 @@
-AUX ltsp-server-5.2.17-profile.patch 436 RMD160 27086e88290c49846d6b4b6b571c896fbad908fa SHA1 1cfb75394e2353be6d3ba83d18fa9529702bf9c0 SHA256 6c2fac68b9be372948b350c0d746a0e7647de75995708a319ade5857805399cd
-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.18-r2.ebuild 2882 RMD160 2fa9a08d2d9c03ebd6b6a5c2a7cf6c0639da0c01 SHA1 d4f89b7343b03067a82537f82a55ac18653cd074 SHA256 ab6ae1c6d237e3db901eeb53b4579e0a82671ba0de9a89c315a34f63f4866429
 EBUILD ltsp-server-5.2.19.ebuild 3362 RMD160 81fe236df687ff5f6b1857f21018a8b4688a3f33 SHA1 1c1e242cc5dc52df5a0790513b67e08d877d83ff SHA256 3de1bd3d4a22f9305511c042ec7e287072d718306c5ad51cf92dba817db40d5b
-EBUILD ltsp-server-5.3.5.ebuild 3398 RMD160 da993aee2018ca196cbd8fdba8a678111af8d0a6 SHA1 78657c1fd8f559d3ed20921eb72cca2bcd4d61fa SHA256 62e5440e79544d7eb1d36cfb027175d8442b313f2bb0f4699bf9844290976a36
-MISC ChangeLog 5383 RMD160 f8d3d8be6bc2ac1b7810336ca2e9724095ffbc44 SHA1 b390438e8899070810724575d4152ed7572125fa SHA256 8d3ac5790f06b61d02741b7013ca9dc1068eff2aa0ace6a7cf9df520048d0fc8
+EBUILD ltsp-server-5.3.6.ebuild 3347 RMD160 90659e6a5fbf51e9bde7afee75e9962a847ad2fd SHA1 254b0a65e2f9800f0f90609da4e0b379bdaa36f6 SHA256 791d42a96f781624fecf3e2c192d49d1e16ccb0ff06ee040fd2c89ee6d21cb6b
+MISC ChangeLog 5521 RMD160 a099dc801d27c7ba00d09cb4262bf9e449aa2667 SHA1 a6bfefcca3147bdea11313887cd53e9ae0e1ac15 SHA256 199e5b8f55bb1f407d22bcd2c4b40fb3423e75189c0877ebb8624ee56aba1cb1
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
deleted file mode 100644
index 43076d4..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/quickstart/profile.qs.orig	2011-11-05 10:59:55.000000000 +0100
-+++ server/configs/quickstart/profile.qs	2011-11-05 11:00:24.000000000 +0100
-@@ -118,9 +118,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
deleted file mode 100644
index 80ef78b..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/Gentoo/kicktoo.profile.orig	2011-11-05 11:07:13.000000000 +0100
-+++ server/configs/Gentoo/kicktoo.profile	2011-11-05 11:08:53.000000000 +0100
-@@ -104,9 +104,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
deleted file mode 100644
index cc71f3f..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/Gentoo/quickstart.profile.orig	2011-11-05 11:07:21.000000000 +0100
-+++ server/configs/Gentoo/quickstart.profile	2011-11-05 11:09:10.000000000 +0100
-@@ -117,9 +117,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-setstage.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-setstage.patch
deleted file mode 100644
index 860aabd..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-setstage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/plugins/ltsp-build-client/Gentoo/002-set-stage-file.orig	2011-10-16 20:58:01.000000000 +0200
-+++ server/plugins/ltsp-build-client/Gentoo/002-set-stage-file	2011-10-16 20:58:11.000000000 +0200
-@@ -19,7 +19,7 @@
-             fi
- 
-             # getting the correct stagefile from gentoo and grepping out hardened
--            LATEST_STAGE=$( /usr/bin/wget -qO- ${DISTFILES_BASE}/latest-stage3.txt | grep ${STAGE_ARCH}-[0-9]\{8\}" )
-+            LATEST_STAGE=$( /usr/bin/wget -qO- ${DISTFILES_BASE}/latest-stage3.txt | grep "${STAGE_ARCH}-[0-9]\{8\}" )
-             STAGE_URI="${DISTFILES_BASE}/${LATEST_STAGE}"
- 
-             if [[ "${STAGE_URI}" != *.tar.bz2 ]]; then
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
deleted file mode 100644
index e007104..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-EBZR_REVISION="1935"
-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_prepare() {
-	epatch "${FILESDIR}/${P}-setstage.patch"
-	epatch "${FILESDIR}/${P}-quickstart.patch"
-	epatch "${FILESDIR}/${P}-kicktoo.patch"
-}
-
-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
-
-	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(){
-	if use nbd; then
-		einfo
-		einfo "Only NFS is supported for mounting the client chroot."
-		einfo "Mounting swap over NBD is supported."
-	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.5.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.6.ebuild
index cfcf627..504d558 100644
--- a/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.3.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-EBZR_REVISION="2136"
+EBZR_REVISION="2146"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -91,17 +91,15 @@ src_install() {
     if use nbd; then
 		dosbin server/ltsp-update-image
 		dosbin server/ltsp-swapfile-delete
-		dosbin server/nbdrootd
 		dosbin server/nbdswapd
 
 		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbd*
+		doins server/xinetd.d/nbdswapd
 		
 		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