public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2011-03-02 20:44 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2011-03-02 20:44 UTC (permalink / raw
  To: gentoo-commits

commit:     41bcb59d1b3eaddde279bfa0358dc87694e35bfc
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Wed Mar  2 20:43:59 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Wed Mar  2 20:43:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=41bcb59d

ltsp-server: Version bump to 5.2.6.

---
 net-misc/ltsp-server/ChangeLog                     |    7 ++++++-
 net-misc/ltsp-server/Manifest                      |    5 ++---
 .../files/ltsp-server-5.2.4-r1-layman.patch        |   18 ------------------
 ...er-5.2.4-r1.ebuild => ltsp-server-5.2.6.ebuild} |    9 +++------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 6174dc9..b655a50 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-misc/ltsp-server
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.6 (02 03 2011)
+
+  02 03 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.6:
+  Version bump.
+
 *ltsp-server-5.2.5 (08 12 2010)
 
   08 12 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.5:

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index d661757..7d347f6 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,6 +1,5 @@
-AUX ltsp-server-5.2.4-r1-layman.patch 972 RMD160 e310bd9a1a746d6743ae751d12ba55a269e579dc SHA1 4d426a3497b6ffa0292de8b630e45ddb2898b5b5 SHA256 c5048cf1b9fff4308d3c5dcda605c8da65f843f6281513855598b6098f4cbc10
-EBUILD ltsp-server-5.2.4-r1.ebuild 2324 RMD160 d29fe8eb8e71eaa7d23c38b163a039064b8ff4b9 SHA1 4b5acc829665337b5fc5eb1b57ce00d3850b886a SHA256 b063af7147f93778b4991850d01ec6718380a2b385f82236ba99686d16807358
 EBUILD ltsp-server-5.2.5.ebuild 2249 RMD160 a0b0179bd185269d75a0f7c3eba55927bed34f9a SHA1 3eda88018414a192fd5bf1d1b84cd275208060f8 SHA256 85b926d69de669c85ad5397a8f02d74fe17984f652d1956b2c3494fa55be4740
+EBUILD ltsp-server-5.2.6.ebuild 2249 RMD160 067872cd89b2c9a807ff5bf582bca09c90dfd0e2 SHA1 fd33994cd08ec69e1fd2e163b0320ed49113c82c SHA256 d8a316758c70cb1baf4fe44db3eeb040bc5931278f6cfac22bb96c03b24d18ce
 EBUILD ltsp-server-9999.ebuild 2246 RMD160 11d8c1a52dea01d81c96af1faefa8b2e6d75e3d8 SHA1 1fb3da71e22773d61b2ba451b2b064b4814b22d1 SHA256 cac45056c155d9108163a183c00065428ba20bb05be18b365909e7d48dfa5a63
-MISC ChangeLog 1849 RMD160 77ea3862da6edaba57fb61b8f32c5d20d2110acd SHA1 ba57b683c07e6f57198d4a87579b75ab20ef5f21 SHA256 e977d1707580854a1dd56d76e101dced8b00caa5ed4dc567d9e4bde81e0e1393
+MISC ChangeLog 1963 RMD160 69673cd5e8132808993cc18329fa37d2dc274275 SHA1 36d4ecc96138e77c4c01bf4db4b8c2a8f488eb13 SHA256 77a4bb13fdb366521113c523b59dba45dc95a69040fa5e2d6ca9225839273e28
 MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch
deleted file mode 100644
index a665677..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/configs/quickstart/profile.qs.orig	2010-08-06 23:50:59.000000000 +0200
-+++ server/configs/quickstart/profile.qs	2010-08-06 23:58:14.000000000 +0200
-@@ -82,11 +82,11 @@
- 	spawn "mount /usr/portage/packages/$ARCH ${chroot_dir}/usr/portage/packages -o bind"
- 	echo "${chroot_dir}/usr/portage/packages" >> /tmp/install.umount
- 
--	# bind mounting portage local, for overlay packages
-+	# bind mounting layman, for overlay packages
- 	# TODO: remove this mounting when the ltsp ebuilds are in the tree
--	spawn "mkdir ${chroot_dir}/usr/local/portage"
--	spawn "mount /usr/local/portage ${chroot_dir}/usr/local/portage -o bind"
--	echo "${chroot_dir}/usr/local/portage" >> /tmp/install.umount
-+	spawn "mkdir -p ${chroot_dir}/var/lib/layman"
-+	spawn "mount /var/lib/layman ${chroot_dir}/var/lib/layman -o bind"
-+	echo "${chroot_dir}/var/lib/layman" >> /tmp/install.umount
- 
- 	if [ -n "${MIRRORS}" ]; then
- 		echo "GENTOO_MIRRORS="${MIRRORS}"" >> ${chroot_dir}/etc/make.conf

diff --git a/net-misc/ltsp-server/ltsp-server-5.2.4-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
similarity index 93%
rename from net-misc/ltsp-server/ltsp-server-5.2.4-r1.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
index dd1d98f..6413bf3 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.4-r1.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="1"
 
-EBZR_REVISION="1771"
+EBZR_REVISION="1806"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -39,7 +39,6 @@ RDEPEND="!net-misc/ltsp-client
 	)
 	sys-fs/ltspfs
 	sys-apps/lsb-release
-	sys-kernel/genkernel
 	>sys-apps/quickstart-0.6
 	sys-apps/iproute2
 	>=app-portage/layman-1.3
@@ -48,8 +47,6 @@ RDEPEND="!net-misc/ltsp-client
 
 src_unpack() {
 	bzr_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PF}-layman.patch"
 }
 
 src_install() {
@@ -102,7 +99,7 @@ src_install() {
 	if use examples; then
 		docinto examples
 		dodoc server/doc/examples/*
-	fi;
+	fi
 }
 
 pkg_postinst(){



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2011-03-29 18:15 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2011-03-29 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     cf1ab5a43c3406e3c2ff86177d652f3e089c2747
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Tue Mar 29 18:15:29 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Tue Mar 29 18:15:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=cf1ab5a4

ltsp-server: Fixed bootstrap and getstage plugins.

---
 net-misc/ltsp-server/ChangeLog                     |    5 ++++
 net-misc/ltsp-server/Manifest                      |    6 +++-
 .../files/ltsp-server-5.2.6-bootstrap.patch        |   22 ++++++++++++++++++++
 .../files/ltsp-server-5.2.6-setstage.patch         |   17 +++++++++++++++
 ...er-5.2.6.ebuild => ltsp-server-5.2.6-r1.ebuild} |    3 ++
 5 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index bb71285..5e03c8a 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.6-r1 (29 03 2011)
+
+  29 03 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.6-r1:
+  Fixed bootstrap and getstage plugins.
+
   24 03 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-9999:
   Added localapps man page and examples.
   

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 190811e..5ddc7b6 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,5 +1,7 @@
+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.5.ebuild 2257 RMD160 89ca6ff7c14d7b2c7d61a9e7f2594c4527240a70 SHA1 928e0bba4d7ba795413d671e4d8af92f6974a41e SHA256 144225dae00da1c7f9a9b396b1f613d42910f769afb164bd2b9de1a6c322562a
-EBUILD ltsp-server-5.2.6.ebuild 2309 RMD160 ce89f0aa7f0ba7fb0eb099ef182be0e0ac4a978a SHA1 a8ba0394c7d00e63d78f076c16183b55cec081c6 SHA256 d830455506d49dd8333fe15f935eddd226c2c85c1db20506af37edc20aef7398
+EBUILD ltsp-server-5.2.6-r1.ebuild 2401 RMD160 76f4cabc2ace640924ff30c18548a7c4b478918b SHA1 6cf207d4a9db56cf7f14a371203cdbe6aeaa0f27 SHA256 2333582b83990f6f9395c9a33773cc5ece2586583db7536072f452c65d52ec56
 EBUILD ltsp-server-9999.ebuild 2306 RMD160 8a9e987918761f52050dac41fd85a69a1d1ce234 SHA1 5630b29e5a21a443cd0b231e894598d954703fe5 SHA256 6a529607e9f51323f5a839fa4054eb2557cf6c6f8833b719e55849d64a62ad32
-MISC ChangeLog 2538 RMD160 d13082d7efb13d0f291b47c71b76393f8f041627 SHA1 932e3c15c1a95575798dd8c9cbb580e1798fa51a SHA256 77a727e27781c4ac514165d8906cc5f998372a3b14bd7a1756c0a17e40834334
+MISC ChangeLog 2682 RMD160 94a8f4c86acc33bc7065c6b0aa2e2e779037e150 SHA1 49af6ba03cf57f48a90af87417e2a5e423228510 SHA256 6556050af0d44c932452c31fd94fc3682fa40a8f30d7cee3c0b122b8de7363fc
 MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3

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
new file mode 100644
index 0000000..b596691
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch
@@ -0,0 +1,22 @@
+--- 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
new file mode 100644
index 0000000..0750309
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch
@@ -0,0 +1,17 @@
+--- 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.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild
similarity index 96%
rename from net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild
index 31d4b42..f4b0bde 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild
@@ -46,6 +46,9 @@ RDEPEND="!net-misc/ltsp-client
 
 src_unpack() {
 	bzr_src_unpack
+	cd $S
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+	epatch "${FILESDIR}/${P}-setstage.patch"
 }
 
 src_install() {



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2011-08-01 17:55 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2011-08-01 17:55 UTC (permalink / raw
  To: gentoo-commits

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@gmail.com ltsp-server-5.2.12:
+  Version bump, added nbd-update-config.
+  
+  01 08 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-9999:
+  Added nbd-update-config.
+
 *ltsp-server-5.2.9 (08 07 2011)
 
   08 07 2011; Wim Muskee wimmuskee@gmail.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
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2011-10-16 19:06 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2011-10-16 19:06 UTC (permalink / raw
  To: gentoo-commits

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"
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2011-11-05 10:20 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2011-11-05 10:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ada2096926071e046e56a6166c2973c1e2f8c040
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Sat Nov  5 10:20:17 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Sat Nov  5 10:20:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=ada20969

ltsp-server: Patch for new package use deps in new stage3.

---
 net-misc/ltsp-server/ChangeLog                     |   10 ++++++++++
 net-misc/ltsp-server/Manifest                      |    9 ++++++---
 .../files/ltsp-server-5.2.17-profile.patch         |   17 +++++++++++++++++
 .../files/ltsp-server-5.2.18-kicktoo.patch         |   17 +++++++++++++++++
 .../files/ltsp-server-5.2.18-quickstart.patch      |   17 +++++++++++++++++
 ...-5.2.17.ebuild => ltsp-server-5.2.17-r1.ebuild} |    6 +++++-
 ...2.18-r1.ebuild => ltsp-server-5.2.18-r2.ebuild} |    2 ++
 7 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 0599e7d..8518c53 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.18-r2 (05 11 2011)
+
+  05 11 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.18-r2:
+  Patch for new package use deps in new stage3.
+  
+*ltsp-server-5.2.17-r1 (05 11 2011)
+
+  05 11 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.17-r1:
+  Patch for new package use deps in new stage3.
+
 *ltsp-server-5.2.18-r1 (16 10 2011)
 
   16 10 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.18-r1:

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index bed70c4..160e69c 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,6 +1,9 @@
+AUX ltsp-server-5.2.17-profile.patch 436 RMD160 27086e88290c49846d6b4b6b571c896fbad908fa SHA1 1cfb75394e2353be6d3ba83d18fa9529702bf9c0 SHA256 6c2fac68b9be372948b350c0d746a0e7647de75995708a319ade5857805399cd
+AUX ltsp-server-5.2.18-kicktoo.patch 438 RMD160 dca7d76c3d2f9c1aad7ca6cdeee7a8dea50cd6c3 SHA1 7dac94886e5cf624d099c8ea35abb439d43d10b7 SHA256 6c8da09fe949a08c39eb39fd3515ef735cdde38c912213a92691427b9f57283c
+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.17.ebuild 2585 RMD160 a91b69ee3dda0ec18ab63f35213d1c62c357273f SHA1 8b126672f402c60eeb48d09049750eab811f6143 SHA256 00f2569c6e87209a172461325af8f477d5be6092ff2f1f72db97047735ba148e
-EBUILD ltsp-server-5.2.18-r1.ebuild 3072 RMD160 ec629f5b73bec7fae7b635c2d5f1f9dd6eee2ecf SHA1 a7b21978ffa26e1c052765ceaea96a1a7dbec13c SHA256 ac85fc5672513b215d26bf9270d9665a59dfaf5c093a84f9437f51dfc8cace0e
+EBUILD ltsp-server-5.2.17-r1.ebuild 2645 RMD160 6b1f40d7e507d4c4db684b7a205b18fd54668624 SHA1 62d27b61dd5880ef22d2a33ba61d4a5bb1958923 SHA256 2a3c91641fd4238808450832dfa26295eba6436aa674e4cf24b218fcca7ea351
+EBUILD ltsp-server-5.2.18-r2.ebuild 3157 RMD160 2fbd1f78190ff75c62f84966465274988f2129f7 SHA1 a035ffec6e1069722f90778e86e14a1b2b23b015 SHA256 0f2217c0badceaa912b52eb9a09b5fcee3c8856b8b09cf408e0326295c9866e3
 EBUILD ltsp-server-9999.ebuild 2437 RMD160 1a9941ac9cf4e51948ba4d38edcf770290b68bb8 SHA1 e61547f12188128133c931f91ba0228b709724e3 SHA256 b76e85c8b0b64a0b4762e31f22dc3c09af81204b06d797743fb9af705fbdd5cc
-MISC ChangeLog 3772 RMD160 ce05c76914b963ba29c208ed5fbc11a9292dde44 SHA1 8e6c3bd6128f8a5a1bfb7ccf2df0b29c1e3d60fb SHA256 79f426c7116e785139fdeba259e73b563d5d799d7645e07128169dd32398b455
+MISC ChangeLog 4082 RMD160 a6b3a4450a4c3cf8d4fa6b00097632ddfb23b0e8 SHA1 802c2e5c339e605839e5e8f056595e36fc04dc67 SHA256 cc569f1a97a3771b74c2a8416c714ca4248718531b28cc8529fbc97326817c29
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
new file mode 100644
index 0000000..43076d4
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
@@ -0,0 +1,17 @@
+--- server/configs/quickstart/profile.qs.orig	2011-11-05 10:59:55.000000000 +0100
++++ server/configs/quickstart/profile.qs	2011-11-05 11:00:24.000000000 +0100
+@@ -118,9 +118,13 @@
+ 	x11-misc/ldm
+ 	EOF
+ 
+-	# pulseaudio pulls udev[extras]
+ 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
++	# req by pulseaudio
+ 	sys-fs/udev extras
++	# req by xorg-server
++	dev-libs/libxml2 python
++	# req by mesa
++	x11-libs/libdrm libkms
+ 	EOF
+ }
+ 

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
new file mode 100644
index 0000000..80ef78b
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
@@ -0,0 +1,17 @@
+--- server/configs/Gentoo/kicktoo.profile.orig	2011-11-05 11:07:13.000000000 +0100
++++ server/configs/Gentoo/kicktoo.profile	2011-11-05 11:08:53.000000000 +0100
+@@ -104,9 +104,13 @@
+ 	x11-misc/ldm
+ 	EOF
+ 
+-	# pulseaudio pulls udev[extras]
+ 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
++	# req by pulseaudio
+ 	sys-fs/udev extras
++	# req by xorg-server
++	dev-libs/libxml2 python
++	# req by mesa
++	x11-libs/libdrm libkms
+ 	EOF
+ }
+ 

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
new file mode 100644
index 0000000..cc71f3f
--- /dev/null
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
@@ -0,0 +1,17 @@
+--- server/configs/Gentoo/quickstart.profile.orig	2011-11-05 11:07:21.000000000 +0100
++++ server/configs/Gentoo/quickstart.profile	2011-11-05 11:09:10.000000000 +0100
+@@ -117,9 +117,13 @@
+ 	x11-misc/ldm
+ 	EOF
+ 
+-	# pulseaudio pulls udev[extras]
+ 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
++	# req by pulseaudio
+ 	sys-fs/udev extras
++	# req by xorg-server
++	dev-libs/libxml2 python
++	# req by mesa
++	x11-libs/libdrm libkms
+ 	EOF
+ }
+ 

diff --git a/net-misc/ltsp-server/ltsp-server-5.2.17.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.17-r1.ebuild
similarity index 97%
rename from net-misc/ltsp-server/ltsp-server-5.2.17.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.17-r1.ebuild
index aaea739..de77d21 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.17.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.17-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 
 EBZR_REVISION="1924"
 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}-profile.patch"
+}
+
 src_install() {
 	ltspdir="/usr/share/ltsp"
 

diff --git a/net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
similarity index 97%
rename from net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
index 230367f..6542bf4 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.18-r1.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
@@ -50,6 +50,8 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-setstage.patch"
+	epatch "${FILESDIR}/${P}-quickstart.patch"
+	epatch "${FILESDIR}/${P}-kicktoo.patch"
 }
 
 src_install() {



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/
@ 2012-03-23 15:58 Wim Muskee
  0 siblings, 0 replies; 6+ messages in thread
From: Wim Muskee @ 2012-03-23 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     bd53280fdd55e2618d9fa5cc97d5d3795c28dc95
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Fri Mar 23 15:57:51 2012 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Fri Mar 23 15:57:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=bd53280f

ltsp-server: version bump to 5.3.6

---
 net-misc/ltsp-server/ChangeLog                     |    5 +
 net-misc/ltsp-server/Manifest                      |    9 +-
 .../files/ltsp-server-5.2.17-profile.patch         |   17 ---
 .../files/ltsp-server-5.2.18-kicktoo.patch         |   17 ---
 .../files/ltsp-server-5.2.18-quickstart.patch      |   17 ---
 .../files/ltsp-server-5.2.18-setstage.patch        |   11 --
 net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild  |  137 --------------------
 ...erver-5.3.5.ebuild => ltsp-server-5.3.6.ebuild} |    6 +-
 8 files changed, 9 insertions(+), 210 deletions(-)

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 413d143..62de96c 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.3.6 (23 03 2012)
+
+  23 03 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.6:
+  Version bump, removed nbdrootd stuff.
+
   11 03 2012; Wim Muskee wimmuskee@gmail.com ltsp-server-5.3.5:
   Add X and pulseaudio USE for optional server login support, thx to Tom Ribbens.
 

diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index b5c38e8..2d65e9b 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,9 +1,4 @@
-AUX ltsp-server-5.2.17-profile.patch 436 RMD160 27086e88290c49846d6b4b6b571c896fbad908fa SHA1 1cfb75394e2353be6d3ba83d18fa9529702bf9c0 SHA256 6c2fac68b9be372948b350c0d746a0e7647de75995708a319ade5857805399cd
-AUX ltsp-server-5.2.18-kicktoo.patch 438 RMD160 dca7d76c3d2f9c1aad7ca6cdeee7a8dea50cd6c3 SHA1 7dac94886e5cf624d099c8ea35abb439d43d10b7 SHA256 6c8da09fe949a08c39eb39fd3515ef735cdde38c912213a92691427b9f57283c
-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 2882 RMD160 2fa9a08d2d9c03ebd6b6a5c2a7cf6c0639da0c01 SHA1 d4f89b7343b03067a82537f82a55ac18653cd074 SHA256 ab6ae1c6d237e3db901eeb53b4579e0a82671ba0de9a89c315a34f63f4866429
 EBUILD ltsp-server-5.2.19.ebuild 3362 RMD160 81fe236df687ff5f6b1857f21018a8b4688a3f33 SHA1 1c1e242cc5dc52df5a0790513b67e08d877d83ff SHA256 3de1bd3d4a22f9305511c042ec7e287072d718306c5ad51cf92dba817db40d5b
-EBUILD ltsp-server-5.3.5.ebuild 3398 RMD160 da993aee2018ca196cbd8fdba8a678111af8d0a6 SHA1 78657c1fd8f559d3ed20921eb72cca2bcd4d61fa SHA256 62e5440e79544d7eb1d36cfb027175d8442b313f2bb0f4699bf9844290976a36
-MISC ChangeLog 5383 RMD160 f8d3d8be6bc2ac1b7810336ca2e9724095ffbc44 SHA1 b390438e8899070810724575d4152ed7572125fa SHA256 8d3ac5790f06b61d02741b7013ca9dc1068eff2aa0ace6a7cf9df520048d0fc8
+EBUILD ltsp-server-5.3.6.ebuild 3347 RMD160 90659e6a5fbf51e9bde7afee75e9962a847ad2fd SHA1 254b0a65e2f9800f0f90609da4e0b379bdaa36f6 SHA256 791d42a96f781624fecf3e2c192d49d1e16ccb0ff06ee040fd2c89ee6d21cb6b
+MISC ChangeLog 5521 RMD160 a099dc801d27c7ba00d09cb4262bf9e449aa2667 SHA1 a6bfefcca3147bdea11313887cd53e9ae0e1ac15 SHA256 199e5b8f55bb1f407d22bcd2c4b40fb3423e75189c0877ebb8624ee56aba1cb1
 MISC metadata.xml 444 RMD160 f1014f444eb3d555d78b7b1e2e788939df7e3a38 SHA1 2af254ffa6615daf4b7b31d658ed5ebeeb9758ec SHA256 a21bc5f20d5636b7afa7bea6071a916bb493381f5515cccc62bc5eed8484ee8e

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
deleted file mode 100644
index 43076d4..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.17-profile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/quickstart/profile.qs.orig	2011-11-05 10:59:55.000000000 +0100
-+++ server/configs/quickstart/profile.qs	2011-11-05 11:00:24.000000000 +0100
-@@ -118,9 +118,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
deleted file mode 100644
index 80ef78b..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-kicktoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/Gentoo/kicktoo.profile.orig	2011-11-05 11:07:13.000000000 +0100
-+++ server/configs/Gentoo/kicktoo.profile	2011-11-05 11:08:53.000000000 +0100
-@@ -104,9 +104,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 

diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
deleted file mode 100644
index cc71f3f..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-quickstart.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- server/configs/Gentoo/quickstart.profile.orig	2011-11-05 11:07:21.000000000 +0100
-+++ server/configs/Gentoo/quickstart.profile	2011-11-05 11:09:10.000000000 +0100
-@@ -117,9 +117,13 @@
- 	x11-misc/ldm
- 	EOF
- 
--	# pulseaudio pulls udev[extras]
- 	cat >> ${chroot_dir}/etc/portage/package.use <<- EOF
-+	# req by pulseaudio
- 	sys-fs/udev extras
-+	# req by xorg-server
-+	dev-libs/libxml2 python
-+	# req by mesa
-+	x11-libs/libdrm libkms
- 	EOF
- }
- 

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
deleted file mode 100644
index 860aabd..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.18-setstage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-r2.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
deleted file mode 100644
index e007104..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2.18-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-EBZR_REVISION="1935"
-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="amd64 x86"
-# Default to nfs until nbd works
-IUSE="doc dhcp examples nbd +nfs +pulseaudio +X"
-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
-	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
-	)
-	pulseaudio? (
-		media-sound/pulseaudio
-	)
-	X? (
-		x11-apps/xdm
-		x11-base/xorg-server
-	)
-	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_prepare() {
-	epatch "${FILESDIR}/${P}-setstage.patch"
-	epatch "${FILESDIR}/${P}-quickstart.patch"
-	epatch "${FILESDIR}/${P}-kicktoo.patch"
-}
-
-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
-
-	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/nbd-update-config
-		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
-
-	if use X; then
-		einfo
-		einfo "Don't forget to install a window manager,"
-		einfo "you can't log in with X onto your server without one."
-	fi
-}
-

diff --git a/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.6.ebuild
similarity index 96%
rename from net-misc/ltsp-server/ltsp-server-5.3.5.ebuild
rename to net-misc/ltsp-server/ltsp-server-5.3.6.ebuild
index cfcf627..504d558 100644
--- a/net-misc/ltsp-server/ltsp-server-5.3.5.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.3.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-EBZR_REVISION="2136"
+EBZR_REVISION="2146"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -91,17 +91,15 @@ src_install() {
     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*
+		doins server/xinetd.d/nbdswapd
 		
 		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
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-23 15:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-29 18:15 [gentoo-commits] proj/ltsp:master commit in: net-misc/ltsp-server/, net-misc/ltsp-server/files/ Wim Muskee
  -- strict thread matches above, loose matches on Subject: below --
2012-03-23 15:58 Wim Muskee
2011-11-05 10:20 Wim Muskee
2011-10-16 19:06 Wim Muskee
2011-08-01 17:55 Wim Muskee
2011-03-02 20:44 Wim Muskee

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox