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

[Wim Muskee]

commit:     473e2933ee15586d3cee0978872e810ac62df439
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Mon Aug  1 17:31:31 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Mon Aug  1 17:31:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=473e2933

ltsp-server: Version bump to 5.2.12, added nbd-update-config.

---
 net-misc/ltsp-server/ChangeLog                     |    8 +++++++
 net-misc/ltsp-server/Manifest                      |    8 ++----
 .../files/ltsp-server-5.2.6-bootstrap.patch        |   22 --------------------
 .../files/ltsp-server-5.2.6-setstage.patch         |   17 ---------------
 ...r-5.2.6-r1.ebuild => ltsp-server-5.2.12.ebuild} |    6 +---
 net-misc/ltsp-server/ltsp-server-9999.ebuild       |    1 +
 6 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index bf8c687..bd7f0ac 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.12 (01 08 2011)
+
+  01 08 2011; Wim Muskee wimmuskee@×××××.com ltsp-server-5.2.12:
+  Version bump, added nbd-update-config.
+  
+  01 08 2011; Wim Muskee wimmuskee@×××××.com ltsp-server-9999:
+  Added nbd-update-config.
+
 *ltsp-server-5.2.9 (08 07 2011)
 
   08 07 2011; Wim Muskee wimmuskee@×××××.com ltsp-server-5.2.9:

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 5811b30..9c8d560 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,7 +1,5 @@
-AUX ltsp-server-5.2.6-bootstrap.patch 1320 RMD160 7fdbaf07f07736eca03ba7770f011eda21075e90 SHA1 05a69c800faf58e2bee817766859d19f1e7c22d5 SHA256 b1c1fd802f5a3c25a6559adf6ffe3098323f0a5664438ef3e43ae950421feaf7
-AUX ltsp-server-5.2.6-setstage.patch 828 RMD160 8f0e50e80abebef35dfa3faab36522b05467144f SHA1 fb8fe8a10b5bd9606328fc902bfca0de4ea43fd5 SHA256 d600fe8d9b36f089dfed109521b858734a177c57686bfdc20e1bbc1863590db0
-EBUILD ltsp-server-5.2.6-r1.ebuild 2401 RMD160 76f4cabc2ace640924ff30c18548a7c4b478918b SHA1 6cf207d4a9db56cf7f14a371203cdbe6aeaa0f27 SHA256 2333582b83990f6f9395c9a33773cc5ece2586583db7536072f452c65d52ec56
+EBUILD ltsp-server-5.2.12.ebuild 2343 RMD160 90770bf468e28aa381cd9028627f623ec1ae1d5a SHA1 80e2f48c6176a4aa02c2fafcdf2fbad8c6902c35 SHA256 d03b25508e6f4ab86efbd67bd55441722af9ed84f2e79ce85fdcfb9fb207c13a
 EBUILD ltsp-server-5.2.9.ebuild 2309 RMD160 cce289f6be797c5cfcbeadbcd5d974821a4ec8cf SHA1 dd209500da1aa0dd0c3052ef49f49a8369a7b264 SHA256 4792da35372bc946d7cee5418a18146cad8197617c07692e0c3e34278bb221fe
-EBUILD ltsp-server-9999.ebuild 2306 RMD160 8a9e987918761f52050dac41fd85a69a1d1ce234 SHA1 5630b29e5a21a443cd0b231e894598d954703fe5 SHA256 6a529607e9f51323f5a839fa4054eb2557cf6c6f8833b719e55849d64a62ad32
-MISC ChangeLog 2796 RMD160 b65ea531623033676aeac5f7c6fd0d40f85439a7 SHA1 ce8000e9a2425a18c67803fdcbd9fd7d687c6644 SHA256 4f1a040571488a74f5db450bbaa87b06a09b09de55cbeafd303d90a76420ae0c
+EBUILD ltsp-server-9999.ebuild 2340 RMD160 a464ee3677054deeb113d7f26b419cbed4742d8e SHA1 7868a5cfa72c3be36ac5e02b8e25c7b4e060f050 SHA256 61e93e13c1c1f524e45dd6577a5fbcf0dfb37965c1b01e483f46300d12b01298
+MISC ChangeLog 3030 RMD160 abb1c9e8ce2dc3441ade10bb5c65208a38b071b7 SHA1 352df8ebd50c98f058d6381ac44e3d47ae39557f SHA256 e068468c568158380374420a2296fcbbd0ecf23fe93fadc4a85edfdb84e90604
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch
deleted file mode 100644
index b596691..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- server/plugins/ltsp-build-client/Gentoo/010-bootstrap.orig	2011-03-28 21:06:00.700447978 +0200
-+++ server/plugins/ltsp-build-client/Gentoo/010-bootstrap	2011-03-28 21:09:09.358697514 +0200
-@@ -6,7 +6,7 @@
-         add_option "quickstart-host" "`eval_gettext "Get profile from a Quickstart server"`" "advanced" "true"
-     ;;
-     configure)
--        if [ -n "$option_quickstart_profile_value" ] || [ -n ${QUICKSTART_PROFILE} ]; then
-+        if [ -n "$option_quickstart_profile_value" ] || [ -n "$QUICKSTART_PROFILE" ]; then
-             QUICKSTART_PROFILE=${option_quickstart_profile_value:-$QUICKSTART_PROFILE}
-             printf "`eval_gettext "Manual Quickstart: %s"`\n" $QUICKSTART_PROFILE
-         else
-@@ -26,8 +26,8 @@
-         if [ -n "$option_quickstart_verbose_value" ] || [ "${QUICKSTART_VERBOSE}" = true ]; then
-             QUICKSTART_ARGS="$QUICKSTART_ARGS --verbose"
-         fi
--        if [ -n "$option_quickstart_host_value" ] || [ -n ${QUICKSTART_HOST} ]; then
--            QUICKSTART_ARGS="$QUICKSTART_ARGS --client=${option_quickstart_host_value:-$QUICKSTART_HOST}"
-+        if [ -n "$option_quickstart_host_value" ] || [ -n "$QUICKSTART_HOST" ]; then
-+            QUICKSTART_ARGS="$QUICKSTART_ARGS --client ${option_quickstart_host_value:-$QUICKSTART_HOST}"
-         fi
-     ;;
-     install)

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch
deleted file mode 100644
index 0750309..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/plugins/ltsp-build-client/Gentoo/002-set-stage-file.orig	2011-03-28 21:05:48.460448127 +0200
-+++ server/plugins/ltsp-build-client/Gentoo/002-set-stage-file	2011-03-29 18:44:14.002448307 +0200
-@@ -3,8 +3,13 @@
-         add_option "stage-uri" "`eval_gettext "Stage 3 URI"`" "advanced" "true"
-         ;;
-     configure)
--        if [ -n "$option_stage_uri_value" ] || [ -n $STAGE_URI ]; then
-+        if [ -n "$option_stage_uri_value" ] || [ -n "$STAGE_URI" ]; then
-             STAGE_URI="${option_stage_uri_value:-$STAGE_URI}"
-+            PROTOCOL=$(echo ${STAGE_URI} | sed -e 's|://.\+$||')
-+        fi
-+
-+        # only download if stage not local
-+        if [[ "$PROTOCOL" != "file" ]]; then
-             STAGE_ARCH=${ARCH}
-             DISTFILES_BASE="http://distfiles.gentoo.org/releases/${ARCH}/autobuilds"
- 

diff --git a/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.12.ebuild
similarity index 95%
rename from net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.12.ebuild
index f4b0bde..aea6d7d 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.12.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="1"
 
-EBZR_REVISION="1806"
+EBZR_REVISION="1877"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -46,9 +46,6 @@ RDEPEND="!net-misc/ltsp-client
 
 src_unpack() {
 	bzr_src_unpack
-	cd $S
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
-	epatch "${FILESDIR}/${P}-setstage.patch"
 }
 
 src_install() {
@@ -79,6 +76,7 @@ src_install() {
 
     if use nbd; then
 		dosbin server/ltsp-update-image
+		dosbin server/nbd-update-config
 		dosbin server/nbdrootd
 		dosbin server/nbdswapd
 

diff --git a/net-misc/ltsp-server/ltsp-server-9999.ebuild b/net-misc/ltsp-server/ltsp-server-9999.ebuild
index ebd0477..d836145 100644
--- a/net-misc/ltsp-server/ltsp-server-9999.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-9999.ebuild
@@ -76,6 +76,7 @@ src_install() {
 
     if use nbd; then
 		dosbin server/ltsp-update-image
+		dosbin server/nbd-update-config
 		dosbin server/nbdrootd
 		dosbin server/nbdswapd