Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/
Date: Mon, 10 Dec 2018 16:45:27
Message-Id: 1544460304.cdccf0cca5cfff203bc806c69b37b27b7f07b7f6.whissi@gentoo
1 commit: cdccf0cca5cfff203bc806c69b37b27b7f07b7f6
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 10 16:44:41 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 10 16:45:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdccf0cc
7
8 sys-apps/toybox: bump to v0.7.8
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sys-apps/toybox/Manifest | 1 +
14 .../toybox/{toybox-9999.ebuild => toybox-0.7.8.ebuild} | 16 ++++++++--------
15 sys-apps/toybox/toybox-9999.ebuild | 16 ++++++++--------
16 3 files changed, 17 insertions(+), 16 deletions(-)
17
18 diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
19 index 7fc0f6a8456..02052b026af 100644
20 --- a/sys-apps/toybox/Manifest
21 +++ b/sys-apps/toybox/Manifest
22 @@ -1,3 +1,4 @@
23 DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127
24 DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb
25 DIST toybox-0.7.7.tar.gz 843039 BLAKE2B fb4ef2ad483acd2b42905e765f7287b41fa8b1822796579c4a57a8ad3f5a3cdb8bbcd0e6790eddc8daf2ec41c50be478c7d19623d1c8db2e7b1d4db8b52fbbc6 SHA512 89369662eaf48bb52909f49932b98395eed6e672f6a37387819a02ba9c33f6b737686782ca3bf0ed0f9b60e1e2fff88ad1ebb678999582986acfec371d100827
26 +DIST toybox-0.7.8.tar.gz 903344 BLAKE2B e223dabd7b44a050bb884d595235ea469524ffbcf3b29ee8a106354dff3250b5e9c7922cb8b499ff343e170735e29b321b9c00c370c67a1d20c8a5e44ab2bdd2 SHA512 125e4b22deda1e707a62c49b40bf7ac8a36122af27fd70ed45c651a61b5607765cf1c9b3b1c3103c0a5b5f4e7760a50e87ac62bfc89aa870a22ae8ad0aacad65
27
28 diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-0.7.8.ebuild
29 similarity index 74%
30 copy from sys-apps/toybox/toybox-9999.ebuild
31 copy to sys-apps/toybox/toybox-0.7.8.ebuild
32 index 3fc7451c702..722524f4045 100644
33 --- a/sys-apps/toybox/toybox-9999.ebuild
34 +++ b/sys-apps/toybox/toybox-0.7.8.ebuild
35 @@ -1,15 +1,15 @@
36 -# Copyright 1999-2015 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 -EAPI=5
41 +EAPI="7"
42
43 -inherit eutils multiprocessing savedconfig toolchain-funcs
44 +inherit multiprocessing savedconfig toolchain-funcs
45
46 if [[ ${PV} == 9999 ]]; then
47 inherit git-r3
48 EGIT_REPO_URI="https://github.com/landley/toybox.git"
49 else
50 - SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
51 + SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
52 KEYWORDS="~amd64 ~x86"
53 fi
54
55 @@ -17,7 +17,7 @@ fi
56 RESTRICT="test"
57
58 DESCRIPTION="Common linux commands in a multicall binary"
59 -HOMEPAGE="http://landley.net/code/toybox/"
60 +HOMEPAGE="https://landley.net/code/toybox/"
61
62 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
63 LICENSE="BSD-2"
64 @@ -25,7 +25,7 @@ SLOT="0"
65 IUSE=""
66
67 src_prepare() {
68 - epatch_user
69 + default
70 restore_config .config
71 }
72
73 @@ -35,7 +35,7 @@ src_configure() {
74 return 0
75 else
76 einfo "Could not locate user configfile, so we will save a default one"
77 - emake defconfig > /dev/null
78 + emake -j1 defconfig > /dev/null
79 fi
80 }
81
82 @@ -53,5 +53,5 @@ src_test() {
83
84 src_install() {
85 save_config .config
86 - newbin toybox_unstripped toybox
87 + newbin generated/unstripped/toybox toybox
88 }
89
90 diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
91 index 3fc7451c702..722524f4045 100644
92 --- a/sys-apps/toybox/toybox-9999.ebuild
93 +++ b/sys-apps/toybox/toybox-9999.ebuild
94 @@ -1,15 +1,15 @@
95 -# Copyright 1999-2015 Gentoo Foundation
96 +# Copyright 1999-2018 Gentoo Authors
97 # Distributed under the terms of the GNU General Public License v2
98
99 -EAPI=5
100 +EAPI="7"
101
102 -inherit eutils multiprocessing savedconfig toolchain-funcs
103 +inherit multiprocessing savedconfig toolchain-funcs
104
105 if [[ ${PV} == 9999 ]]; then
106 inherit git-r3
107 EGIT_REPO_URI="https://github.com/landley/toybox.git"
108 else
109 - SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.bz2"
110 + SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
111 KEYWORDS="~amd64 ~x86"
112 fi
113
114 @@ -17,7 +17,7 @@ fi
115 RESTRICT="test"
116
117 DESCRIPTION="Common linux commands in a multicall binary"
118 -HOMEPAGE="http://landley.net/code/toybox/"
119 +HOMEPAGE="https://landley.net/code/toybox/"
120
121 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
122 LICENSE="BSD-2"
123 @@ -25,7 +25,7 @@ SLOT="0"
124 IUSE=""
125
126 src_prepare() {
127 - epatch_user
128 + default
129 restore_config .config
130 }
131
132 @@ -35,7 +35,7 @@ src_configure() {
133 return 0
134 else
135 einfo "Could not locate user configfile, so we will save a default one"
136 - emake defconfig > /dev/null
137 + emake -j1 defconfig > /dev/null
138 fi
139 }
140
141 @@ -53,5 +53,5 @@ src_test() {
142
143 src_install() {
144 save_config .config
145 - newbin toybox_unstripped toybox
146 + newbin generated/unstripped/toybox toybox
147 }