[gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/

["Wim Muskee" <wimmuskee@gmail.com>]

commit:     8fb7e02f87bfffe74cdeee39e1c053ca1abbc747
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Sun Oct 16 19:06:10 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Sun Oct 16 19:06:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=8fb7e02f

ltsp-server: Patch for broken setstage.

---
 net-misc/ltsp-server/ChangeLog                     |    5 +++++
 net-misc/ltsp-server/Manifest                      |    5 +++--
 .../files/ltsp-server-5.2.18-setstage.patch        |   11 +++++++++++
 ...-5.2.18.ebuild => ltsp-server-5.2.18-r1.ebuild} |    6 +++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 7c30bda..0599e7d 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.18-r1 (16 10 2011)
+
+  16 10 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.18-r1:
+  Patch for broken setstage plugin.
+
 *ltsp-server-5.2.18 (13 10 2011)
 
   13 10 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.18:

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 107629a..bed70c4 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,5 +1,6 @@
+AUX ltsp-server-5.2.18-setstage.patch 678 RMD160 195f2a67352d4255917c157ef34798add1940aef SHA1 2572a93fbad8b5ba75f93c656e6146a6c73eaf68 SHA256 172842e76958c2086f57b7f2112018154ff9f8f62d2f786271923a2ba284edca
 EBUILD ltsp-server-5.2.17.ebuild 2585 RMD160 a91b69ee3dda0ec18ab63f35213d1c62c357273f SHA1 8b126672f402c60eeb48d09049750eab811f6143 SHA256 00f2569c6e87209a172461325af8f477d5be6092ff2f1f72db97047735ba148e
-EBUILD ltsp-server-5.2.18.ebuild 3011 RMD160 d2fbdf9e2c59c64bb1950beac1d3435dfb44b16d SHA1 883a553d578fdc9da4b146642e5e7160bf5f3121 SHA256 8e4f98501f9159ace74656020865b79cea3d81633de5911e84a691599a1b9d6c
+EBUILD ltsp-server-5.2.18-r1.ebuild 3072 RMD160 ec629f5b73bec7fae7b635c2d5f1f9dd6eee2ecf SHA1 a7b21978ffa26e1c052765ceaea96a1a7dbec13c SHA256 ac85fc5672513b215d26bf9270d9665a59dfaf5c093a84f9437f51dfc8cace0e
 EBUILD ltsp-server-9999.ebuild 2437 RMD160 1a9941ac9cf4e51948ba4d38edcf770290b68bb8 SHA1 e61547f12188128133c931f91ba0228b709724e3 SHA256 b76e85c8b0b64a0b4762e31f22dc3c09af81204b06d797743fb9af705fbdd5cc
-MISC ChangeLog 3630 RMD160 41799745904ffd35a8291a0c40a5008cf0b5603d SHA1 e72b854bc8abe2fe0cfe0bf04db61e6a5ddedcd1 SHA256 2cc70e6dc5acd45f7b83806cd0d66cbef1ba7a7fd702348866a2331bd1cc00e9
+MISC ChangeLog 3772 RMD160 ce05c76914b963ba29c208ed5fbc11a9292dde44 SHA1 8e6c3bd6128f8a5a1bfb7ccf2df0b29c1e3d60fb SHA256 79f426c7116e785139fdeba259e73b563d5d799d7645e07128169dd32398b455
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e

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
new file mode 100644
index 0000000..860aabd
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.18-setstage.patch
@@ -0,0 +1,11 @@
+--- 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.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild
similarity index 97%
rename from net-misc/ltsp-server/ltsp-server-5.2.18.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild
index 7a88d91..230367f 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.18.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 
 EBZR_REVISION="1935"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
@@ -48,6 +48,10 @@ src_unpack() {
 	bzr_src_unpack
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-setstage.patch"
+}
+
 src_install() {
 	ltspdir="/usr/share/ltsp"