[gentoo-commits] proj/ltsp:master commit in: sys-apps/quickstart/, sys-apps/quickstart/files/

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

commit:     70f20217dcaae9ea7838eceb1e13f52f8953bc30
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Thu Apr 14 20:07:08 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Thu Apr 14 20:07:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=70f20217

quickstart: Version bump from 0.6 and doc use flag for all.

---
 sys-apps/quickstart/ChangeLog                      |   21 ++++++++++++++
 sys-apps/quickstart/Manifest                       |    9 ++++--
 .../files/quickstart-20101128-fetcher.patch        |   15 ++++++++++
 sys-apps/quickstart/quickstart-0.6.ebuild          |   30 +++++--------------
 ...t-9999.ebuild => quickstart-20101128-r1.ebuild} |   17 ++++++++--
 ...tart-9999.ebuild => quickstart-20101128.ebuild} |   11 ++++--
 sys-apps/quickstart/quickstart-9999.ebuild         |   12 ++++---
 7 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/sys-apps/quickstart/ChangeLog b/sys-apps/quickstart/ChangeLog
index 04e5a3f..135e902 100644
--- a/sys-apps/quickstart/ChangeLog
+++ b/sys-apps/quickstart/ChangeLog
@@ -2,12 +2,33 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*quickstart-20101128-r1 (14 04 2011)
+
+  14 04 2011; Wim Muskee wimmuskee@gmail.com quickstart-20101128-r1.ebuild:
+  Patch for tftp download option, adding curl as dependency.
+
+*quickstart-20101128 (14 04 2011)
+
+  14 04 2011; Wim Muskee wimmuskee@gmail.com quickstart-20101128.ebuild:
+  Version bump from 0.6, using last git commit.
+
+  14 04 2011; Wim Muskee wimmuskee@gmail.com quickstart-0.6.ebuild:
+  Added doc use flag for docs.
+
+  14 04 2011; Wim Muskee wimmuskee@gmail.com quickstart-9999.ebuild:
+  Removed tftp dependency, masking for all archs.
+
   24 03 2011; Wim Muskee wimmuskee@gmail.com quickstart-9999.ebuild:
   Added tftp dependency.
 
   20 02 2010; Wim Muskee wimmuskee@gmail.com quickstart-9999.ebuild:
   Changed svn to git repository.
 
+*quickstart-0.6 (08 04 2008)
+
+  08 04 2008; Johnny Robeson johnny@localmomentum.net quickstart-0.6.ebuild:
+  Initial import. 
+
 *quickstart-9999 (08 04 2008)
 
   08 04 2008; Johnny Robeson johnny@localmomentum.net quickstart-9999.ebuild:

diff --git a/sys-apps/quickstart/Manifest b/sys-apps/quickstart/Manifest
index 6783264..71b326f 100644
--- a/sys-apps/quickstart/Manifest
+++ b/sys-apps/quickstart/Manifest
@@ -1,5 +1,8 @@
+AUX quickstart-20101128-fetcher.patch 554 RMD160 fd77c846f60ef85571a6bde386bfd19e850a4ee7 SHA1 00f12f1aa14782ddd4a90960b7581bd81cfa49c7 SHA256 224c02972cfd23e04ca602a9d1e1bb6c9213d697827c98d434405c904e413e89
 DIST quickstart-0.6.tar.bz2 13411 RMD160 2141427ed32ba390bbf0d042fee3310092632f72 SHA1 3f293eb50762a48aae369dff69a6eb02a3c97222 SHA256 f2a03ba1433b429ad043660808c4efe067662d95580731dcbe4722a888a4f065
-EBUILD quickstart-0.6.ebuild 988 RMD160 c27679e1d885751c97f7825188e1435abbfe6a88 SHA1 4eb983edf4fcf0a133f7bbcc54dfcb24b64f0ca7 SHA256 f98ae6f79b4965be3819ca10c1d88aaf4742bfe875bc2d31c31eaffc011f13d2
-EBUILD quickstart-9999.ebuild 686 RMD160 5fbb65966fd821eee9085707f44c1a24d560e695 SHA1 a31dee717353ff6c9ef0d70db224f2d8ef501c37 SHA256 e3facbde4ad769e2221d848c63502fdecf71254476bad9cce3285af29880661c
-MISC ChangeLog 447 RMD160 5e0e42fcb12239c0f670dd114cc3c1b0e49d86bf SHA1 942e54bdf6c792604ba02601b4de2623c8c73d1f SHA256 3b8d1424fdb92525b89498325d35731c0fa8c00a4f4c72068e1c0c2b0165567d
+EBUILD quickstart-0.6.ebuild 676 RMD160 2f8965ec482a1d003ae816a8cba394409004f062 SHA1 7e4fa90ea58240626c98628cac81a49da5769e0b SHA256 ec81ba5880699567553f3f938e95f884f2757134308f59a5b55433ac1302f472
+EBUILD quickstart-20101128-r1.ebuild 835 RMD160 322b314846fb05ed1c60f4cd2f57f191a6ddb359 SHA1 3bc77290f472666451f14d5f898d25cc75209cd2 SHA256 bb6737bf7f9536b507049066e7cc9c9d37bd78902360385313d93dd5ee9aa242
+EBUILD quickstart-20101128.ebuild 727 RMD160 dc9a811a6c6b597421dc314d2085339f00065560 SHA1 51f9b8b3d9e9244ddab0be786fd79873fdcc75cc SHA256 bf1f0c7cba1d027ce602413dbf21cc0fe7c40d7feb48b6b0661bb398f67d0e2a
+EBUILD quickstart-9999.ebuild 661 RMD160 4aff706ca68887f69a2998b578291136d3fc97a0 SHA1 9f48616c6a6a388ef4b6942fa8766ed7d0caf117 SHA256 949cd39ab9032a0e9dec8adfe99ebe754aca4457771faac6a5951a580af34ce9
+MISC ChangeLog 1127 RMD160 6e5b2898230d69f119231c62a1f4d47da5fc3f8f SHA1 5c5a88e7c05b74967646f2385460bcafb554ddf8 SHA256 19645c80bac6e255345f3725aac812569589f0e01115cffeb5fb7b4d3f2b5fc7
 MISC metadata.xml 304 RMD160 84ae1f69cc8ecd59f9916319b6d55e4772370296 SHA1 1e314f501ad304a7316fc362fc52c004e68a3220 SHA256 3d4eb5270a5b625a4680fc14d938e590977510a29c953dc487bc559c09bbf715

diff --git a/sys-apps/quickstart/files/quickstart-20101128-fetcher.patch b/sys-apps/quickstart/files/quickstart-20101128-fetcher.patch
new file mode 100644
index 0000000..466a674
--- /dev/null
+++ b/sys-apps/quickstart/files/quickstart-20101128-fetcher.patch
@@ -0,0 +1,15 @@
+--- modules/fetcher.sh.orig	2011-03-29 20:38:27.711698040 +0200
++++ modules/fetcher.sh	2011-03-29 20:49:15.581697817 +0200
+@@ -79,8 +79,8 @@
+   local uri=$1
+   local localfile=$2
+ 
+-  uri=$(echo "${uri}" | sed -e 's|^tftp://||')
+-  host=$(echo "${uri}" | cut -d / -f 1)
+-  path=$(echo "${uri}" | cut -d / -f 2-)
+-  tftp -g -r "${path}" -l "${localfile}" "${host}" || die "could not fetch ${uri}"
++  spawn "curl ${uri} -o ${localfile}"
++  local curl_exitcode=$?
++  debug fetch_tftp "exit code from curl was ${curl_exitcode}"
++  return ${curl_exitcode}
+ }

diff --git a/sys-apps/quickstart/quickstart-0.6.ebuild b/sys-apps/quickstart/quickstart-0.6.ebuild
index d00415f..975ada9 100644
--- a/sys-apps/quickstart/quickstart-0.6.ebuild
+++ b/sys-apps/quickstart/quickstart-0.6.ebuild
@@ -1,32 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-if [[ ${PV} == 9999* ]]
-then
-	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
-	ESVN_REPO_URI="http://agaffney.org/repos/quickstart/trunk"
-	ESVN_PROJECT="quickstart"
-	inherit eutils subversion
-else
-	inherit eutils
-	SRC_URI="http://agaffney.org/quickstart/releases/${P}.tar.bz2"
-fi
+inherit eutils
 
+SRC_URI="http://agaffney.org/quickstart/releases/${P}.tar.bz2"
 DESCRIPTION="Quickstart automated installer"
-HOMEPAGE="http://dev.gentoo.org/~agaffney/quickstart.php"
+HOMEPAGE="http://agaffney.org/quickstart.php"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${P}.tar.bz2
-	fi
-}
+IUSE="doc"
 
 src_install() {
 	qsdir=/usr/share/quickstart
@@ -41,5 +25,7 @@ src_install() {
 	make_wrapper quickstart ./quickstart ${qsdir}
 	make_wrapper quickstartd ./quickstartd.pl ${qsdir}/server
 
-	dodoc doc/*
+	if use doc; then
+		dodoc doc/*
+	fi
 }

diff --git a/sys-apps/quickstart/quickstart-9999.ebuild b/sys-apps/quickstart/quickstart-20101128-r1.ebuild
similarity index 74%
copy from sys-apps/quickstart/quickstart-9999.ebuild
copy to sys-apps/quickstart/quickstart-20101128-r1.ebuild
index 577112b..550554a 100644
--- a/sys-apps/quickstart/quickstart-9999.ebuild
+++ b/sys-apps/quickstart/quickstart-20101128-r1.ebuild
@@ -2,16 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
+EAPI="2"
 inherit eutils git
 
+EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
+EGIT_COMMIT="4ce0bbd11acff6c3b09634b1b46a0887e966f7a3"
+
 DESCRIPTION="Quickstart automated installer"
 HOMEPAGE="http://agaffney.org/quickstart.php"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tftp"
-RDEPEND="tftp? ( net-ftp/tftp-hpa )"
+IUSE="doc tftp"
+RDEPEND="tftp? ( net-misc/curl )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fetcher.patch"
+}
 
 src_install() {
 	qsdir=/usr/share/quickstart
@@ -26,5 +33,7 @@ src_install() {
 	make_wrapper quickstart ./quickstart ${qsdir}
 	make_wrapper quickstartd ./quickstartd.pl ${qsdir}/server
 
-	dodoc doc/*
+	if use doc; then
+		dodoc doc/*
+	fi
 }

diff --git a/sys-apps/quickstart/quickstart-9999.ebuild b/sys-apps/quickstart/quickstart-20101128.ebuild
similarity index 85%
copy from sys-apps/quickstart/quickstart-9999.ebuild
copy to sys-apps/quickstart/quickstart-20101128.ebuild
index 577112b..ba77f12 100644
--- a/sys-apps/quickstart/quickstart-9999.ebuild
+++ b/sys-apps/quickstart/quickstart-20101128.ebuild
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
 inherit eutils git
 
+EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
+EGIT_COMMIT="4ce0bbd11acff6c3b09634b1b46a0887e966f7a3"
+
 DESCRIPTION="Quickstart automated installer"
 HOMEPAGE="http://agaffney.org/quickstart.php"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tftp"
-RDEPEND="tftp? ( net-ftp/tftp-hpa )"
+IUSE="doc"
 
 src_install() {
 	qsdir=/usr/share/quickstart
@@ -26,5 +27,7 @@ src_install() {
 	make_wrapper quickstart ./quickstart ${qsdir}
 	make_wrapper quickstartd ./quickstartd.pl ${qsdir}/server
 
-	dodoc doc/*
+	if use doc; then
+		dodoc doc/*
+	fi
 }

diff --git a/sys-apps/quickstart/quickstart-9999.ebuild b/sys-apps/quickstart/quickstart-9999.ebuild
index 577112b..219389c 100644
--- a/sys-apps/quickstart/quickstart-9999.ebuild
+++ b/sys-apps/quickstart/quickstart-9999.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
 inherit eutils git
 
+EGIT_REPO_URI="git://git.agaffney.org/quickstart.git"
+
 DESCRIPTION="Quickstart automated installer"
 HOMEPAGE="http://agaffney.org/quickstart.php"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tftp"
-RDEPEND="tftp? ( net-ftp/tftp-hpa )"
+KEYWORDS=""
+IUSE="doc"
 
 src_install() {
 	qsdir=/usr/share/quickstart
@@ -26,5 +26,7 @@ src_install() {
 	make_wrapper quickstart ./quickstart ${qsdir}
 	make_wrapper quickstartd ./quickstartd.pl ${qsdir}/server
 
-	dodoc doc/*
+	if use doc; then
+		dodoc doc/*
+	fi
 }