ltsp-client: version bump to 5.3.3

4 files changed, 29 insertions, 122 deletions

diff --git a/net-misc/ltsp-client/ChangeLog b/net-misc/ltsp-client/ChangeLog
index fea73e7..5c9646e 100644
--- a/net-misc/ltsp-client/ChangeLog
+++ b/net-misc/ltsp-client/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-client-5.3.3 (28 02 2012)
+
+  28 02 2012; Wim Muskee wimmuskee@gmail.com ltsp-client-5.3.3.ebuild:
+  Version bump.
+
   23 02 2011; Wim Muskee wimmuskee@gmail.com ltsp-client-9999.ebuild:
   Adding new ltsp init scripts.
 
diff --git a/net-misc/ltsp-client/Manifest b/net-misc/ltsp-client/Manifest
index a834702..cda5e3c 100644
--- a/net-misc/ltsp-client/Manifest
+++ b/net-misc/ltsp-client/Manifest
@@ -1,6 +1,5 @@
 AUX lts.conf 284 RMD160 c2f2f5fac6701fb58160376f082d5d2c551aaad5 SHA1 57dfa6a212284f2811e05ff518961c80d2aa4cc9 SHA256 eb2648ae9b3b38d30eabe92a363e790c06ddae1e9472618b7876ec2c9cf853e2
 EBUILD ltsp-client-5.2.12.ebuild 2516 RMD160 178d905436ea48d90193c27ba5dba0423e6c359d SHA1 3a4caf8c9babb16e8b5058d0298f32aa4cff927f SHA256 48b6bec922d68c6513878af1959e8fbd6ef1811f527ed09d4a6f6dfd4eaf7d8d
-EBUILD ltsp-client-5.2.9.ebuild 2518 RMD160 5f59ffb4b44bcafdc07080d9adfc627311a16ac7 SHA1 356f168bff3ba2a5110ca4987a483e0701d3791c SHA256 51454e66ae9a6e30a27e2a6b74f55463e652a8b501a657bc6a5506e2ad6f6e59
-EBUILD ltsp-client-9999.ebuild 2804 RMD160 4d66a9e25417bcbeb8a411be358b3293864e10a5 SHA1 c146304d9d7b7d1c5d72445a9acd395981f0318b SHA256 4d0b0eca99e5fd2ba0e17e2bc63a5875b03956bc4552dc578267331542721560
-MISC ChangeLog 2968 RMD160 25d52f9b18fd0941efe6e9a4740ce5a7353869ee SHA1 94284b8662bf092863f93d460fb2498cf61c7f16 SHA256 d91a76e51048d7a59c970abb7a9b7219bed5efee9bfb5758c0bfa84ff1c39429
+EBUILD ltsp-client-5.3.3.ebuild 2855 RMD160 142621a121244bcd4f45268df7a6ee480b753e21 SHA1 0e7d97c578aa07d29b0ea66690db7bbffa674647 SHA256 50d790de09070f5479374d082c186fe34a65055a94aaa04d90a5231940e260c3
+MISC ChangeLog 3089 RMD160 e85e345106d3e942ec200bb839d025e12d4ec8c5 SHA1 ddde2a66b0da8895daf39d2ffcf7f514c689067f SHA256 3327e7dad4de803a198716d307f3544b1a2035688bc5d3ac396cf3463c20d64b
 MISC metadata.xml 239 RMD160 5c09d64ce69a1c3ead8110ab2cc4242f4b79d361 SHA1 3569156a75f6a3e70bf78fec27420754f42f709c SHA256 81174591b128a73f77bd663c79dc842ce8df791b8b1b498d99c3aa1116a80a40
diff --git a/net-misc/ltsp-client/ltsp-client-5.2.9.ebuild b/net-misc/ltsp-client/ltsp-client-5.2.9.ebuild
deleted file mode 100644
index fd3b5c4..0000000
--- a/net-misc/ltsp-client/ltsp-client-5.2.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit bzr
-
-EBZR_REVISION="1842"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-DESCRIPTION="LTSP client scripts"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# note on dependencies
-# joystick for inputattach (serial devices)
-# run-mailcap for ltsp-remoteapps
-DEPEND="x11-apps/xprop"
-RDEPEND="!net-misc/ltsp-server
-	media-sound/pulseaudio
-	>=sys-fs/ltspfs-0.5.0
-	net-analyzer/netcat
-	net-misc/openssh
-	sys-block/nbd
-	sys-apps/lsb-release
-	net-ftp/tftp-hpa
-	>=sys-fs/sshfs-fuse-2.1
-	sys-apps/iproute2
-	games-util/joystick
-	media-sound/alsa-utils
-	media-plugins/alsa-plugins
-	app-misc/run-mailcap
-	net-misc/ntp"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_compile() {
-	pushd client/getltscfg
-	emake || or die "Could not make getltspcfg"
-	popd
-
-	pushd localapps
-	./autogen.sh || or die "Could not generate configure for xatomwait"
-	econf || or die "Could not configure xatomwait"
-	emake || or die "Could not make xatomwait"
-	popd
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	dobin client/getltscfg/getltscfg
-	dosbin client/jetpipe/jetpipe
-
-	dobin localapps/ltsp-localappsd
-	dobin localapps/ltsp-genmenu
-	dobin localapps/ltsp-remoteapps
-	dobin localapps/ltsp-remoteappsd
-	dobin localapps/ltsp-open
-	dobin localapps/src/xatomwait
-
-	dodir /var/lib/ltsp-client-setup
-	dodir /var/cache/ltsp
-	dodir /var/cache/ltsp-localapps
-
-	exeinto ${ltspdir}
-	doexe client/configure-x.sh
-	doexe client/screen_session
-	doexe client/update-kernels
-	doexe client/xinitrc
-
-	exeinto ${ltspdir}/screen.d
-	doexe client/screen.d/*
-
-	insinto ${ltspdir}
-	doins ltsp-common-functions
-	doins client/ltsp_config
-	doins client/screen-x-common
-	doins client/initscripts/ltsp-init-common
-
-	insinto ${ltspdir}/xinitrc.d
-	doins client/xinitrc.d/*
-
-	insinto ${ltspdir}/screen-session.d
-	doins client/screen-session.d/*
-
-	insinto /usr/share/ldm/rc.d
-	doins localapps/ldm-rc.d/*
-
-	newinitd client/initscripts/Gentoo/ltsp-client-setup.initd ltsp-client-setup
-	newinitd client/initscripts/Gentoo/ltsp-client.initd ltsp-client
-	newconfd client/initscripts/Gentoo/ltsp-client-setup.confd ltsp-client-setup
-
-	doman client/jetpipe/jetpipe.8
-	doman client/getltscfg/getltscfg.1
-	doman localapps/doc/xatomwait.1
-	doman localapps/doc/ltsp-localappsd.1
-	doman localapps/doc/ltsp-genmenu.1
-	doman localapps/doc/ltsp-remoteapps.1
-
-	cp "${FILESDIR}/lts.conf" "${D}/etc/lts.conf"
-}
diff --git a/net-misc/ltsp-client/ltsp-client-9999.ebuild b/net-misc/ltsp-client/ltsp-client-5.3.3.ebuild
index 6fbe93a..2fcc52d 100644
--- a/net-misc/ltsp-client/ltsp-client-9999.ebuild
+++ b/net-misc/ltsp-client/ltsp-client-5.3.3.ebuild
@@ -4,21 +4,23 @@
 
 inherit bzr
 
+EBZR_REVISION="2114"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 DESCRIPTION="LTSP client scripts"
 HOMEPAGE="http://www.ltsp.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~x86"
 IUSE=""
 
 # note on dependencies
 # joystick for inputattach (serial devices)
 # run-mailcap for ltsp-remoteapps
+# cron for crontabs and SHUTDOWN_TIME
 DEPEND="x11-apps/xprop"
 RDEPEND="!net-misc/ltsp-server
 	media-sound/pulseaudio
-	>=sys-fs/ltspfs-0.5.0
+	>=sys-fs/ltspfs-1.1
 	net-analyzer/netcat
 	net-misc/openssh
 	sys-block/nbd
@@ -30,7 +32,9 @@ RDEPEND="!net-misc/ltsp-server
 	media-sound/alsa-utils
 	media-plugins/alsa-plugins
 	app-misc/run-mailcap
-	net-misc/ntp"
+	net-misc/ntp
+	app-admin/sysklogd
+	sys-process/vixie-cron"
 
 src_unpack() {
 	bzr_src_unpack
@@ -51,6 +55,7 @@ src_compile() {
 src_install() {
 	ltspdir="/usr/share/ltsp"
 
+	# executables
 	dobin client/getltscfg/getltscfg
 	dosbin client/jetpipe/jetpipe
 
@@ -61,10 +66,6 @@ src_install() {
 	dobin localapps/ltsp-open
 	dobin localapps/src/xatomwait
 
-	dodir /var/lib/ltsp-client-setup
-	dodir /var/cache/ltsp
-	dodir /var/cache/ltsp-localapps
-
 	exeinto ${ltspdir}
 	doexe client/configure-x.sh
 	doexe client/screen_session
@@ -77,6 +78,7 @@ src_install() {
 	exeinto /sbin
 	doexe client/init-ltsp
 
+	# plugins
 	insinto ${ltspdir}
 	doins ltsp-common-functions
 	doins client/ltsp_config
@@ -99,16 +101,22 @@ src_install() {
 	insinto /usr/share/ldm/rc.d
 	doins localapps/ldm-rc.d/*
 	
-	insinto /lib/udev
-	doins client/udev/ltsp-sound
+	# directories
+	dodir /var/lib/ltsp-client-setup
+	dodir /var/cache/ltsp
+	dodir /var/cache/ltsp-localapps
+	
+	# init rc script
+	newinitd client/initscripts/Gentoo/ltsp-client.initd ltsp-client
+	
+	# udev
+	exeinto /lib/udev
+	doexe client/udev/ltsp-sound
 	
 	insinto /etc/udev/rules.d
 	doins client/udev/88-ltsp-sound.rules
 
-	newinitd client/initscripts/Gentoo/ltsp-client-setup.initd ltsp-client-setup
-	newinitd client/initscripts/Gentoo/ltsp-client.initd ltsp-client
-	newconfd client/initscripts/Gentoo/ltsp-client-setup.confd ltsp-client-setup
-
+	# man pages
 	doman client/jetpipe/jetpipe.8
 	doman client/getltscfg/getltscfg.1
 	doman localapps/doc/xatomwait.1
@@ -116,5 +124,6 @@ src_install() {
 	doman localapps/doc/ltsp-genmenu.1
 	doman localapps/doc/ltsp-remoteapps.1
 
+	# default lts.conf
 	cp "${FILESDIR}/lts.conf" "${D}/etc/lts.conf"
 }