[gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-client/

[Wim Muskee]

commit:     5a9eceeb62303be914d3b77c1b61d65924079933
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Thu Aug 23 19:29:23 2012 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Thu Aug 23 19:29:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=5a9eceeb

ltsp-client: version bump to 5.4.3

---
 net-misc/ltsp-client/ChangeLog                     |   12 +++-
 net-misc/ltsp-client/Manifest                      |    6 +-
 net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild  |    4 +-
 ...lient-5.3.7.ebuild => ltsp-client-5.4.3.ebuild} |   75 ++++++++++----------
 4 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/net-misc/ltsp-client/ChangeLog b/net-misc/ltsp-client/ChangeLog
index 18f70e4..9420605 100644
--- a/net-misc/ltsp-client/ChangeLog
+++ b/net-misc/ltsp-client/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-client-5.4.3 (23 08 2012)
+
+  23 08 2012; Wim Muskee wimmuskee@×××××.com ltsp-client-5.4.3.ebuild:
+  Version bump, add bison and flex dep.
+
+*ltsp-client-5.2.12-r2 (22 08 2012)
+
+  22 08 2012; Wim Muskee wimmuskee@×××××.com ltsp-client-5.2.12-r2.ebuild:
+  Patch for /run bindmount.
+
 *ltsp-client-5.3.7 (10 04 2012)
 
   10 04 2012; Wim Muskee wimmuskee@×××××.com ltsp-client-5.3.7.ebuild:
@@ -15,7 +25,7 @@
 
 *ltsp-client-5.2.12-r1 (17 03 2012)
 
-  17 03 2011; Wim Muskee wimmuskee@×××××.com ltsp-client-5.2.12-r1.ebuild:
+  17 03 2012; Wim Muskee wimmuskee@×××××.com ltsp-client-5.2.12-r1.ebuild:
   Patch for lts.conf download arch, add dep on numlockx.
 
 *ltsp-client-5.3.3 (28 02 2012)

diff --git a/net-misc/ltsp-client/Manifest b/net-misc/ltsp-client/Manifest
index d5ad31d..cd97c20 100644
--- a/net-misc/ltsp-client/Manifest
+++ b/net-misc/ltsp-client/Manifest
@@ -1,7 +1,7 @@
 AUX lts.conf 274 SHA256 76948f0e4a3bf4a2b00d75a6fd39c9dfa662b271980d68d0aea2ad5599c1bf26 SHA512 0643bfbb160fa15e65770f731d61021cce0f2c7c5d6e8528fe719b74669a6c55148b9f819f30dcbb6c29915038888f8f82d19743e26bc581a412525db8c2f451 WHIRLPOOL 71966827597cfce263329d3e197b8e064f49da52247392b5f30fda7fee5dacaac227e1fba596323a910d5e94fa4ab0a0e14c162646c38bc0c09cbe998608af9f
 AUX ltsp-client-5.2.12-ltsdownloadarch.patch 503 SHA256 2f646c6931d1ab787006c879520327cba10029c63b189beefedde8f6f4e052bd SHA512 999e0099f49083d368d0c0176bd521157dd35bde4e376911c4bfbfb38f818995b4ed081a6ed280f266d871abdcfa1b34e2c0ff39b75b0067a04d7487afae9ecf WHIRLPOOL 358c5e9b03b910110d5357385b7f67589a8959c9241c29c34fe332a2bc4561a23b03e44acdcc5059f29c4e435db8991d853f7ae8b3758a07121fb6c44ff3c360
 AUX ltsp-client-5.2.12-setupconfd.patch 845 SHA256 35b43976776b613dc1660f301162cc98073f11bb9f1a4ff5bf7ea2269f947372 SHA512 6765a5ce674dbee253bc3375dfa3aa91f4058d27c1aed1ef6a78407fdebaaa0a703635d181c66adba96fa4206338591b31bba656652601a8a299183f96c05fa1 WHIRLPOOL 75784d6c440b97b2c4e39548ffca20a1246ffd713f0d6b65dab94910738aacc55ef9b02ec16a09651fd9c7e5f44798af828b5b5607807a94af4ef876536426c7
-EBUILD ltsp-client-5.2.12-r2.ebuild 2682 SHA256 442a3ae1c8293f4ec3db9e74adf35619e0adacc21c62c6e648fb8e460bfcb2ac SHA512 43e22acc3afedc22490d08376af48c8f2806ea6a0fac649ef91fdd42095a49787bf03bf1ecf64c6256bf33d6031d1b0f83227fb653c220b0e197035661318b25 WHIRLPOOL bb000d6a04cbbbfaaec3b8fddfd192bc4f4ed13b3520954e2dfe8723031f9dd3124f2d2c4b54d3586f5e065a31d86545a413949dc269f3d209048d8615360c1c
-EBUILD ltsp-client-5.3.7.ebuild 3136 SHA256 8342479ff4379bcf6df959be3a422aea4f5344b5ba974f9359abf565b6a915a7 SHA512 93a480036e1f671da22583e2c70affd4c88f0b948d59ea23287ddb498e43d2db29db29aefa8c1ab303ddf693f3b42dffed22451755f37cdd5746689b7f5c9f73 WHIRLPOOL e55c576cd0ae36509f9c4ff5abbcc0f78cb062aa4472d1d57c6e6bc9df7d4183643aa909e9a75adeff774f4306f090e84e94f50f9c42937a39f64f088c99a12a
-MISC ChangeLog 3636 SHA256 063c204ee6b995c89df2935f3c353ffac4687d1f1255641b6f89100db6f54fe8 SHA512 024dca4162ff1b50010af02d9bc3309bfceea15e061373dcb68d5a1a62f4a5724666e6a6e669186051edf36b17047877e97bc194864baeebc612d323c6602b46 WHIRLPOOL 3e7818224426f1456c013595e60e8096ca250375e026979ba966c1630d08f9abc3cb95d8c140147348bdd9fe7d83cd148a2e0d20f52b7b2fc20112d1f3931b40
+EBUILD ltsp-client-5.2.12-r2.ebuild 2715 SHA256 0bfbec1fda8e5c8128c16e4e82dbc2adadf6fa00fb07ceff2dc49b4413e7dcda SHA512 7afcc73dad7ed0863f372742e331d072ba12ea30cc1a895d0027b00c796aa39461396347735750dd78a0bc51cda2d780b2603e0a4059a5db2d97235523dd044d WHIRLPOOL 07af41233e4121a8995836606693ccaa1d41400e94e758474a88873d7da6590f7c2bc477459bcc6d5b3a37ec1b490648236b16206bf123b1dff4d25059d48e9f
+EBUILD ltsp-client-5.4.3.ebuild 3370 SHA256 3d1a3322bc6783637d70381cbf137a204253a7df572333ac370c68d19e1371cd SHA512 145ce44bb6ddbf5546f5176626564f8d9ca224aa32868be828fc9b9c4f8365009cd3a31d3acfa17ed1d1a18b835a2dbf406773c5b9fd6db3c5510fd5805349b2 WHIRLPOOL 7b9c86be83ea675cadd6d6e9b7fc6efb35d70672092d7011ce2ccb5404c79960fe99f528a577d7859e9f69adf8f90c15999ece21124c43e160777666058a1a52
+MISC ChangeLog 3922 SHA256 80dae735577b8ad163608c2df10e5a5740df4e12b7d11ebdaf9a87b2ed3ef37a SHA512 2464a063c8381f861dc9508be496033233fd7d17332f94b42048de38e195532a71993345de857836f8338b0f564013a09f3de3c538efab2395c0cec1cba162d2 WHIRLPOOL 9bef1eba1a37353e9641b273c74cc95c72f0f2a0815e488cfb11d39d1c10dfba7884cecd3007f65bc929671896c46933f28a821277298e37ad91564bd7576fd8
 MISC metadata.xml 239 SHA256 81174591b128a73f77bd663c79dc842ce8df791b8b1b498d99c3aa1116a80a40 SHA512 019b19a04bbfda5564503e9f647707149d2e76377883fa1ae81a1e2cca7e1ea7bf4491d98259805950895b296b2c50616dbd58dbe8668fd926623055df661c66 WHIRLPOOL d686b9fa4145998fc71d753c0167def1f1c430f0e92ee397290142dac533e6164cd8cf51a816d4cd46bfb47f0e957ea469dec028fcca5a053882695128a43ee1

diff --git a/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild b/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
index 4ff756d..c0b7780 100644
--- a/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
+++ b/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
@@ -20,7 +20,9 @@ IUSE=""
 # joystick for inputattach (serial devices)
 # run-mailcap for ltsp-remoteapps
 # numlockx for X_NUMLOCK
-DEPEND="x11-apps/xprop"
+DEPEND="x11-apps/xprop
+	sys-devel/bison
+	sys-devel/flex"
 RDEPEND="!net-misc/ltsp-server
 	media-sound/pulseaudio
 	>=sys-fs/ltspfs-0.5.0

diff --git a/net-misc/ltsp-client/ltsp-client-5.3.7.ebuild b/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
similarity index 56%
rename from net-misc/ltsp-client/ltsp-client-5.3.7.ebuild
rename to net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
index 80d75c7..aab8028 100644
--- a/net-misc/ltsp-client/ltsp-client-5.3.7.ebuild
+++ b/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
@@ -4,13 +4,13 @@
 
 inherit bzr
 
-EBZR_REVISION="2169"
+EBZR_REVISION="2384"
 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="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 # note on dependencies
@@ -18,9 +18,10 @@ IUSE=""
 # cron for crontabs and SHUTDOWN_TIME
 # numlockx for X_NUMLOCK
 # lsb-release for server ltsp-info
-DEPEND="x11-apps/xprop"
-RDEPEND="!net-misc/ltsp-server
-	media-sound/pulseaudio
+DEPEND="x11-apps/xprop
+	sys-devel/bison
+	sys-devel/flex"
+RDEPEND="media-sound/pulseaudio
 	>=sys-fs/ltspfs-1.1
 	net-analyzer/netcat
 	net-misc/openssh
@@ -47,7 +48,7 @@ src_compile() {
 	emake || or die "Could not make getltspcfg"
 	popd
 
-	pushd localapps
+	pushd client/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"
@@ -61,52 +62,50 @@ src_install() {
 	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
+	dobin client/localapps/ltsp-localappsd
+	dobin client/localapps/ltsp-genmenu
+	dobin client/localapps/ltsp-remoteapps
+	dobin client/localapps/ltsp-remoteappsd
+	dobin client/localapps/ltsp-open
+	dobin client/localapps/src/xatomwait
 
 	exeinto ${ltspdir}
-	doexe client/configure-x.sh
-	doexe client/screen_session
-	doexe client/update-kernels
-	doexe client/xinitrc
+	doexe client/share/ltsp/configure-x.sh
+	doexe client/share/ltsp/screen_session
+	doexe client/share/ltsp/kioskSession
+	doexe client/share/ltsp/update-kernels
+	doexe client/share/ltsp/xinitrc
 
 	exeinto ${ltspdir}/screen.d
-	doexe client/screen.d/*
+	doexe client/share/ltsp/screen.d/*
 	
 	exeinto /sbin
 	doexe client/init-ltsp
 
 	# plugins and libraries
 	insinto ${ltspdir}
-	doins client/ltsp-client-functions
-	doins client/ltsp-client-common-functions
-	doins client/ltsp_config
-	doins client/screen-x-common
-	doins client/kioskSession
+	newins common/ltsp-common-functions ltsp-client-common-functions
+	doins client/share/ltsp/ltsp-client-functions
+	doins client/share/ltsp/ltsp_config
+	doins client/share/ltsp/screen-x-common
 	doins client/initscripts/ltsp-init-common
-	doins client/functions/Gentoo/*
-	# backwards compatible for ldm-2.8
-	dosym ltsp-client-functions /usr/share/ltsp/ltsp-common-functions
+	newins server/Gentoo/share/ltsp/ltsp-server-vendor-functions ltsp-client-vendor-functions
 
 	insinto ${ltspdir}/xinitrc.d
-	doins client/xinitrc.d/*
+	doins client/share/ltsp/xinitrc.d/*
 
 	insinto ${ltspdir}/screen-session.d
-	doins client/screen-session.d/*
+	doins client/share/ltsp/screen-session.d/*
 	
 	insinto ${ltspdir}/ltsp_config.d
-	doins client/ltsp_config.d/*	
+	doins client/share/ltsp/ltsp_config.d/*	
 	
 	insinto ${ltspdir}/init-ltsp.d
-	doins -r client/init-ltsp.d/common/*
-	doins -r client/init-ltsp.d/Gentoo/*
+	doins -r client/share/ltsp/init-ltsp.d/*
+	doins -r client/Gentoo/share/ltsp/init-ltsp.d/*
 
 	insinto /usr/share/ldm/rc.d
-	doins localapps/ldm-rc.d/*
+	doins client/localapps/ldm-rc.d/*
 	
 	# directories
 	dodir /var/lib/ltsp-client-setup
@@ -114,22 +113,22 @@ src_install() {
 	dodir /var/cache/ltsp-localapps
 	
 	# init rc script
-	newinitd client/initscripts/Gentoo/ltsp-client.initd ltsp-client
+	newinitd client/Gentoo/initscripts/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
+	insinto /lib/udev/rules.d
+	doins client/share/ltsp/udev/ltsp-sound.rules
 
 	# man pages
 	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
+	doman client/localapps/doc/xatomwait.1
+	doman client/localapps/doc/ltsp-localappsd.1
+	doman client/localapps/doc/ltsp-genmenu.1
+	doman client/localapps/doc/ltsp-remoteapps.1
 
 	# default lts.conf
 	cp "${FILESDIR}/lts.conf" "${D}/etc/lts.conf"