ltsp-server: 5.2.19 stable for x86 and amd64

8 files changed, 15 insertions, 168 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 6d1aafa..33b12c2 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: $
 
+  25 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.19:
+  Stable for amd64 and x86.
+
 *ltsp-server-5.3 (17 02 2012)
 
   17 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 3209d7f..94541cb 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -3,8 +3,7 @@ AUX ltsp-server-5.2.18-kicktoo.patch 438 RMD160 dca7d76c3d2f9c1aad7ca6cdeee7a8de
 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 2811 RMD160 6df6c6107f313a7825549d917a2641f556970648 SHA1 a37bcd633b14b854c82e055943bc48c66e37201e SHA256 fd82379585881cc94654899b1b9c737ba6cd08d86db18494d08b2486699014d8
-EBUILD ltsp-server-5.2.19.ebuild 3286 RMD160 f81fa6cb3fd7f7b7014be9b0f0fa44f019b88fe5 SHA1 afeab7de4890ecfe706f0fe770a529b6aa755426 SHA256 d8c295bceb40f262a9ad653f7d63937094c0e7fea13161a57cf8571817ff3971
+EBUILD ltsp-server-5.2.19.ebuild 3284 RMD160 86733ed44faed433ab7b975b60cb868576c1ad51 SHA1 9acb91ba3f0f32a2f8a13f618ed3054e10f243e9 SHA256 bcf8cfd2ff2b12d0825ca6800356deb8cec6fdfd0acd2acd080730a7be64b1a3
 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 ChangeLog 4707 RMD160 f76b9ab32c889398b1dcf35cdafb3c121d5c8289 SHA1 084546f7d1dad1dd300de55c13aef25ece4bea34 SHA256 851f50cbc080ce562b6beaa20f604b3b0eba2b487b78a2e473c212bc2ee6f9a1
 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
index 057fd36..f2af462 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.19.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.19.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: $
 
@@ -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=""
diff --git a/net-misc/ltsp-server/ltsp-server-9999.ebuild b/net-misc/ltsp-server/ltsp-server-9999.ebuild
deleted file mode 100644
index cdeeba3..0000000
--- a/net-misc/ltsp-server/ltsp-server-9999.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-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=""
-# 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-1.1.5
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	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/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
-	
-	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/x11-misc/ldm/ChangeLog b/x11-misc/ldm/ChangeLog
index 8da7a8e..80c94e3 100644
--- a/x11-misc/ldm/ChangeLog
+++ b/x11-misc/ldm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 02 2012; Wim Muskee wimmuskee@gmail.com ldm-2.2.6.ebuild:
+  Add executable for ssh-hostchecker
+
 *ldm-2.2.6 (25 02 2012)
 
   25 02 2012; Wim Muskee wimmuskee@gmail.com ldm-2.2.6.ebuild:
diff --git a/x11-misc/ldm/Manifest b/x11-misc/ldm/Manifest
index 53640d1..381d158 100644
--- a/x11-misc/ldm/Manifest
+++ b/x11-misc/ldm/Manifest
@@ -1,5 +1,4 @@
 EBUILD ldm-2.2.4.ebuild 782 RMD160 0431f26bc46848814e7ea5151039a7237b6ab7ba SHA1 7bbd27f42b2b046646112cd8ddfb48d0eb2056e2 SHA256 e77d97c793102f12a68b89698a513f4fb0203e9463a4079c76ec63cbe4ecfba1
-EBUILD ldm-2.2.6.ebuild 783 RMD160 a0c1a9760e4398f8cf426bd9659350fd8e722eaf SHA1 710760e7bc07cbb4ed1beb8c5287db44523564b9 SHA256 67ecc418d521bfec4cabd61d572144540d462a4cb82156e5fc1ed3c71243b27e
-EBUILD ldm-9999.ebuild 765 RMD160 349e3747ef808072043be0952dfd769dbdeb35a3 SHA1 66303f783f7dd17b94b2b22a3af81a1fac8796fa SHA256 5ce92d8245d4ede4d4e7bb258c49ad6483e7f1589f3fc8bdb5788424ee2abb84
-MISC ChangeLog 2283 RMD160 16950840d5ba7db738381757b3dd9f08742bf6eb SHA1 48de0befabb726e176aa80eb17e651589264aa43 SHA256 a991f8b37b29ee968f1962dd7125dac1921f9885fd14b6be27bde1e6ae8fd9e6
+EBUILD ldm-2.2.6.ebuild 879 RMD160 d028c8822d4b10e3ad3ec8431148b0aa3af74c50 SHA1 5be9fa80ed5a731f02ef16a716f17e2b569848e6 SHA256 e9418c500145a08014efdbccc81b02a57a3b53d9492ec26ee9941378d6cf28d2
+MISC ChangeLog 2384 RMD160 f13f237c45e6c9fda2fbef4925df46008ed10162 SHA1 ec6e5b71c65d4c74252152ca0c118abe21650f4e SHA256 343252c812933f804f1b8fd3879c1df206fe79f4f2c13f8b4b704b62b5abefeb
 MISC metadata.xml 239 RMD160 5c09d64ce69a1c3ead8110ab2cc4242f4b79d361 SHA1 3569156a75f6a3e70bf78fec27420754f42f709c SHA256 81174591b128a73f77bd663c79dc842ce8df791b8b1b498d99c3aa1116a80a40
diff --git a/x11-misc/ldm/ldm-2.2.6.ebuild b/x11-misc/ldm/ldm-2.2.6.ebuild
index ddc21a4..16df46c 100644
--- a/x11-misc/ldm/ldm-2.2.6.ebuild
+++ b/x11-misc/ldm/ldm-2.2.6.ebuild
@@ -31,6 +31,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dosym ltsp /usr/share/ldm/themes/default
 
+	# ssh-hostchecker should be executable, but isn't
+	fperms 744 /usr/share/ldm/ssh-hostchecker
+	
 	dodoc README
 	dodoc README-DEVELOPMENT-POLICY
 	dodoc LTSP_LOGO_COPYRIGHT
diff --git a/x11-misc/ldm/ldm-9999.ebuild b/x11-misc/ldm/ldm-9999.ebuild
deleted file mode 100644
index 1dc1f18..0000000
--- a/x11-misc/ldm/ldm-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
-EBZR_BOOTSTRAP="autogen.sh"
-
-inherit bzr autotools
-
-DESCRIPTION="LTSP Display Manager"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-DEPEND=">=dev-libs/glib-2.21
-	>=x11-libs/gtk+-2.18
-	app-text/iso-codes
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0"
-RDEPEND="${DEPEND} x11-themes/gtk-engines
-	x11-apps/xdm
-	x11-base/xorg-server"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-    dosym ltsp /usr/share/ldm/themes/default
-    
-	dodoc README
-	dodoc README-DEVELOPMENT-POLICY
-	dodoc LTSP_LOGO_COPYRIGHT
-}