Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
Date: Thu, 29 Sep 2016 16:20:51
Message-Id: 1475166028.3f0f1aa36016a95915f7648c46c6b81468bc4f63.zmedico@gentoo
1 commit: 3f0f1aa36016a95915f7648c46c6b81468bc4f63
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 16:17:20 2016 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 16:20:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f1aa3
7
8 app-emulation/rkt: rename rkt_stage1_kvm to rkt_stage1_kvm_lkvm
9
10 Package-Manager: portage-2.3.1
11
12 app-emulation/rkt/rkt-1.11.0.ebuild | 12 ++++++------
13 app-emulation/rkt/rkt-1.12.0.ebuild | 12 ++++++------
14 app-emulation/rkt/rkt-1.14.0.ebuild | 12 ++++++------
15 3 files changed, 18 insertions(+), 18 deletions(-)
16
17 diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
18 index fbf338c..9abbe39 100644
19 --- a/app-emulation/rkt/rkt-1.11.0.ebuild
20 +++ b/app-emulation/rkt/rkt-1.11.0.ebuild
21 @@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
22
23 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
24 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
25 -rkt_stage1_kvm? (
26 +rkt_stage1_kvm_lkvm? (
27 https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
28 mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
29 ${PXE_URI} -> ${PXE_FILE}
30 @@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
31
32 LICENSE="Apache-2.0"
33 SLOT="0"
34 -IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
35 -REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
36 +IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
37 +REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
38
39 DEPEND=">=dev-lang/go-1.5
40 app-arch/cpio
41 @@ -117,7 +117,7 @@ src_configure() {
42 use rkt_stage1_src && flavors+=",src"
43 use rkt_stage1_coreos && flavors+=",coreos"
44 use rkt_stage1_fly && flavors+=",fly"
45 - use rkt_stage1_kvm && flavors+=",kvm"
46 + use rkt_stage1_kvm_lkvm && flavors+=",kvm"
47 myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
48
49 if use rkt_stage1_src; then
50 @@ -127,7 +127,7 @@ src_configure() {
51 )
52 fi
53
54 - if use rkt_stage1_coreos || use rkt_stage1_kvm; then
55 + if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
56 myeconfargs+=(
57 --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
58 --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
59 @@ -179,7 +179,7 @@ src_install() {
60 dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
61 elif use rkt_stage1_fly; then
62 dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
63 - elif use rkt_stage1_kvm; then
64 + elif use rkt_stage1_kvm_lkvm; then
65 dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
66 fi
67
68
69 diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
70 index 0c604bb..77c2cae 100644
71 --- a/app-emulation/rkt/rkt-1.12.0.ebuild
72 +++ b/app-emulation/rkt/rkt-1.12.0.ebuild
73 @@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
74
75 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
76 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
77 -rkt_stage1_kvm? (
78 +rkt_stage1_kvm_lkvm? (
79 https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
80 mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
81 ${PXE_URI} -> ${PXE_FILE}
82 @@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
83
84 LICENSE="Apache-2.0"
85 SLOT="0"
86 -IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
87 -REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
88 +IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
89 +REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
90
91 DEPEND=">=dev-lang/go-1.5
92 app-arch/cpio
93 @@ -124,7 +124,7 @@ src_configure() {
94 use rkt_stage1_src && flavors+=",src"
95 use rkt_stage1_coreos && flavors+=",coreos"
96 use rkt_stage1_fly && flavors+=",fly"
97 - use rkt_stage1_kvm && flavors+=",kvm"
98 + use rkt_stage1_kvm_lkvm && flavors+=",kvm"
99 myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
100
101 if use rkt_stage1_src; then
102 @@ -134,7 +134,7 @@ src_configure() {
103 )
104 fi
105
106 - if use rkt_stage1_coreos || use rkt_stage1_kvm; then
107 + if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
108 myeconfargs+=(
109 --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
110 --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
111 @@ -186,7 +186,7 @@ src_install() {
112 dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
113 elif use rkt_stage1_fly; then
114 dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
115 - elif use rkt_stage1_kvm; then
116 + elif use rkt_stage1_kvm_lkvm; then
117 dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
118 fi
119
120
121 diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild
122 index 858c15b..4647369 100644
123 --- a/app-emulation/rkt/rkt-1.14.0.ebuild
124 +++ b/app-emulation/rkt/rkt-1.14.0.ebuild
125 @@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
126
127 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
128 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
129 -rkt_stage1_kvm? (
130 +rkt_stage1_kvm_lkvm? (
131 https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
132 mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
133 ${PXE_URI} -> ${PXE_FILE}
134 @@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
135
136 LICENSE="Apache-2.0"
137 SLOT="0"
138 -IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
139 -REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
140 +IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
141 +REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
142
143 DEPEND=">=dev-lang/go-1.5
144 app-arch/cpio
145 @@ -124,7 +124,7 @@ src_configure() {
146 use rkt_stage1_src && flavors+=",src"
147 use rkt_stage1_coreos && flavors+=",coreos"
148 use rkt_stage1_fly && flavors+=",fly"
149 - use rkt_stage1_kvm && flavors+=",kvm"
150 + use rkt_stage1_kvm_lkvm && flavors+=",kvm"
151 myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
152
153 if use rkt_stage1_src; then
154 @@ -134,7 +134,7 @@ src_configure() {
155 )
156 fi
157
158 - if use rkt_stage1_coreos || use rkt_stage1_kvm; then
159 + if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
160 myeconfargs+=(
161 --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
162 --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
163 @@ -186,7 +186,7 @@ src_install() {
164 dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
165 elif use rkt_stage1_fly; then
166 dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
167 - elif use rkt_stage1_kvm; then
168 + elif use rkt_stage1_kvm_lkvm; then
169 dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
170 fi