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

[Wim Muskee]

commit:     fca71162b9c2cb2b2d14c558d77b7f92d31121aa
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Wed Nov 21 20:01:52 2012 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Wed Nov 21 20:01:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=fca71162

kicktoo: release to stable 0.4.4-r2

---
 sys-apps/kicktoo/ChangeLog                         |    5 ++
 sys-apps/kicktoo/Manifest                          |    6 +-
 .../kicktoo/files/kicktoo-0.4.4-makeconf.patch     |   11 ++++
 sys-apps/kicktoo/kicktoo-0.4.3.ebuild              |   62 --------------------
 ...too-0.4.4-r1.ebuild => kicktoo-0.4.4-r2.ebuild} |   10 ++-
 5 files changed, 26 insertions(+), 68 deletions(-)

diff --git a/sys-apps/kicktoo/ChangeLog b/sys-apps/kicktoo/ChangeLog
index 231053b..bee31e2 100644
--- a/sys-apps/kicktoo/ChangeLog
+++ b/sys-apps/kicktoo/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kicktoo-0.4.4-r2 (21 11 2012)
+
+  21 11 2012; Wim Muskee wimmuskee@×××××.com kicktoo-0.4.4-r2.ebuild:
+  Patch for /etc/make.conf to /etc/portage/make.conf.
+
 *kicktoo-0.4.4-r1 (05 08 2012)
 
   05 08 2012; Wim Muskee wimmuskee@×××××.com kicktoo-0.4.4-r1.ebuild:

diff --git a/sys-apps/kicktoo/Manifest b/sys-apps/kicktoo/Manifest
index f436c75..b0a5338 100644
--- a/sys-apps/kicktoo/Manifest
+++ b/sys-apps/kicktoo/Manifest
@@ -1,4 +1,4 @@
-EBUILD kicktoo-0.4.3.ebuild 1210 SHA256 5fc5567c347489a19966c765090e033227f561b0da7a85559682f0f4ce6bd216 SHA512 ba89cdb5c9b6895b9c8cf50a1c9dfa972cc648e5ed3e9d50b074e2f546781459e25f3940cfe2ced6a137211d3ad45718ea80918db13e8721426270fb799bada1 WHIRLPOOL c77d1d21b91671eb1c4d6249b28c4983d76c5299b3fe335510d494fdab12c6817012fd239eafb39ca6ea26f5cbd8dee94a0dc46ff6b7f757b8ead4644d73e84c
-EBUILD kicktoo-0.4.4-r1.ebuild 1243 SHA256 e8ca248d285c85afd3963806408c6c1b71706c13bd39b9c71169f380e2b6edda SHA512 a3262c42753c2d5ee1df70d63bb2ec9499273958859032fe39a700227969fb9a1b9dd58b690a3a524dbf5b2bf0b1edba98f7ec7e6fbea1c6fdd57e539fbed176 WHIRLPOOL b9401b6e2d37bf35baebd49cd37e34a3360f835c6d5438df9ff01c60e3998b51496e7e39b9e8534ed82161976bda6197d8b3f75bcf3c481144b9481fb56073b0
-MISC ChangeLog 1492 SHA256 f781666224ca83c5a185106c748e50de4a196ef77c950fcf74f0234ca9adb350 SHA512 c9eaeac93f193564f7f306f2e11493dadcf7d4a513eac41c92451fc2baac5c29eadfd7feaf15ad24de59443d07bd10a4c6015d858d2e1a86b8b024c3992cf854 WHIRLPOOL 538a0e7fc8ebca7e6a961790de5fceedc59b35ac9601e2cc0e4cf0e3d5f9823c39c891a80aa56a579afd3891c325d6f23ad5a29f2763dfdf5041a2cfbc69bed3
+AUX kicktoo-0.4.4-makeconf.patch 427 SHA256 3401df126e87ff4db930f56bf3a65974ca55b520a575d55439295480ae139dfe SHA512 1cd7173f1d310c267477009064f627a116eaf586fccaa9edda040deb93c2f1739e487e1d7d1f81995df5b05107099d5e53bad588e408b7427462c1b1024b438e WHIRLPOOL 349d6761e20c1b76f9c4938aa2dd98828290892ca138fa4bd8e2a3a0a6a9c581154083c0fe25ca8ad9baff3f1013c6f8c14dca2b582a26417edfa29593be57e1
+EBUILD kicktoo-0.4.4-r2.ebuild 1309 SHA256 31370f9e243f8da8ad937ba9801efb88afced11a7ac7a78ffb905ae5e338a364 SHA512 b24caa03df45b297054c5dcbb162b18d72c24b19bb7793fd47f144249fae39f8405c7b991e61c13f0b64de1d0439d19e16b65276dd69879ec510ceea7d7fed03 WHIRLPOOL a7819441eaef15a30678bfdd082f60ad88969b7df8a7b33adce913eeac5933a4cb7206729d00a572e339679de0604f389f833b43124d79f8ed4bb5267c48ae4a
+MISC ChangeLog 1649 SHA256 9444080e8c9754e7ffbf9b77c6c6343876fa8646744a4caf920dfc0817c3136f SHA512 6a0d5109503ae6f6b30c657f43bd523e32beee6a98725550d56a51bdaac94b36c7fc11cdce99a5e4b7a8dc12f4adfa1253b0cd99843e0a1e7fb69d376fe22e70 WHIRLPOOL dcda36e01dc4e1b9f76172d5eb9a885242c28b8c86076483fb0ff7d447753e03484baaba36af1051cc5d2d3ae6d0e734dc315ebaf8662b06b688cd2c7419f0c3
 MISC metadata.xml 381 SHA256 a8b3dab38afa3d53f8a46ee5b1a03f48616751bbdb41d87ca5b85018857da929 SHA512 0df8ec40e21c2d719b04bc8f0244934deaa87e67cfbac72bea79e18734579f2471a9f0904305b698c1abf6ce0221f05da53cb238be59773e6884e0cca528596a WHIRLPOOL f8be587f7f9d976e50eda0ccdf362b07438984771f68c5aa933833f8342f5547419cd6da7fd4e9d125c49ae42efed8397dfce42d003f4345f62a323f89e60e6d

diff --git a/sys-apps/kicktoo/files/kicktoo-0.4.4-makeconf.patch b/sys-apps/kicktoo/files/kicktoo-0.4.4-makeconf.patch
new file mode 100644
index 0000000..ed037cc
--- /dev/null
+++ b/sys-apps/kicktoo/files/kicktoo-0.4.4-makeconf.patch
@@ -0,0 +1,11 @@
+--- modules/install_steps.sh.orig	2012-11-21 20:52:03.000000000 +0100
++++ modules/install_steps.sh	2012-11-21 20:53:04.000000000 +0100
+@@ -267,7 +267,7 @@
+ 
+     for var in $(set | grep ^makeconf_[A-Z]); do
+         makeconfline=$(echo $var | sed s/makeconf_// | sed s/\'/\"/g )
+-        cat >> ${chroot_dir}/etc/make.conf <<- EOF
++        cat >> ${chroot_dir}/etc/portage/make.conf <<- EOF
+ 		${makeconfline}
+ 		EOF
+     done

diff --git a/sys-apps/kicktoo/kicktoo-0.4.3.ebuild b/sys-apps/kicktoo/kicktoo-0.4.3.ebuild
deleted file mode 100644
index b5560e9..0000000
--- a/sys-apps/kicktoo/kicktoo-0.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-inherit git-2
-
-EGIT_REPO_URI="git://github.com/r1k0/kicktoo.git"
-EGIT_COMMIT="3f88a45fc3"
-DESCRIPTION="A Portage based installer/profiler for Gentoo/Funtoo (/Exherbo RIP)"
-HOMEPAGE="https://github.com/r1k0/kicktoo"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# making the profiles optional, included by default
-# they are not required for the tool
-IUSE="crypt doc +examples server"
-RDEPEND="sys-block/parted
-	net-misc/curl
-	crypt? (
-		dev-libs/libgcrypt
-		dev-libs/popt
-		dev-libs/libgpg-error
-		sys-apps/util-linux
-		sys-fs/cryptsetup
-	)
-	server? (
-		dev-perl/HTTP-Daemon
-	)"
-
-src_install() {
-	ktdir=/usr/share/kicktoo
-
-	insinto ${ktdir}/modules
-	doins modules/*
-	
-	dobin kicktoo
-	
-	if use server; then
-		dobin daemon/kicktood
-		
-		insinto /etc/kicktoo
-		doins daemon/kicktood.conf
-	fi
-	
-	if use doc; then
-		dodoc README
-		dodoc TODO
-		newdoc profiles/config.txt profile-config.txt
-	fi
-	
-	if use examples; then
-		insinto ${ktdir}/kbin
-		doins kbin/*
-		insinto ${ktdir}/kconfig
-		doins kconfig/*
-		insinto ${ktdir}/profiles
-		rm profiles/config.txt
-		doins -r profiles/*
-	fi
-}

diff --git a/sys-apps/kicktoo/kicktoo-0.4.4-r1.ebuild b/sys-apps/kicktoo/kicktoo-0.4.4-r2.ebuild
similarity index 91%
rename from sys-apps/kicktoo/kicktoo-0.4.4-r1.ebuild
rename to sys-apps/kicktoo/kicktoo-0.4.4-r2.ebuild
index 4c5d624..1e60be6 100644
--- a/sys-apps/kicktoo/kicktoo-0.4.4-r1.ebuild
+++ b/sys-apps/kicktoo/kicktoo-0.4.4-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 
-inherit git-2
+inherit eutils git-2
 
 EGIT_REPO_URI="git://github.com/r1k0/kicktoo.git"
 
@@ -13,7 +13,7 @@ DESCRIPTION="A Portage based installer/profiler for Gentoo/Funtoo (/Exherbo RIP)
 HOMEPAGE="https://github.com/r1k0/kicktoo"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # making the profiles optional, included by default
 # they are not required for the tool
 IUSE="crypt doc +examples server"
@@ -30,6 +30,10 @@ RDEPEND="sys-block/parted
 		dev-perl/HTTP-Daemon
 	)"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makeconf.patch"
+}
+
 src_install() {
 	ktdir=/usr/share/kicktoo