gentoo resync : 23.09.2020

3 files changed, 105 insertions, 13 deletions

diff --git a/dev-embedded/kobs-ng/Manifest b/dev-embedded/kobs-ng/Manifest
index c3e24a8b0538..71e82de5c6fe 100644
--- a/dev-embedded/kobs-ng/Manifest
+++ b/dev-embedded/kobs-ng/Manifest
@@ -1,6 +1,7 @@
 AUX kobs-ng-fix-array-violation.patch 338 BLAKE2B f8eeb81566e16d67b9d8d2df4c40a950cfbd0c8d29dd754f5ebffc68889366a142c84078428172693e096904fb913305dc6dbdb020ed22028e57ff5bc8f64e35 SHA512 311fac99b85264a25dc3984096e7467894a286be2ff6ee1fb8a11681ba5833e61b5938ef01312a35bb3a4e7cf90c0fbec163a54e9cc6c844e49da3bb856d2937
 AUX kobs-ng-fix-mtd-defines.patch 2170 BLAKE2B 97a067399e534d7c1d468aa1657e3a6212f37f99a470a9f789752388b7d1fb428c3704dc045e2f41fca4b489ba2db0f46768e0befb2bed150162af67105d58d8 SHA512 5d192d1b6f36ccd1500f33c8a89bbd8bdd7b8f489fe04be56142101b93dd1f7c5b00ca5dffb681aeec15ed58927530dcd487e80b9a02e4af1c3ff46b732d6697
 AUX kobs-ng-fix-open-without-mode.patch 390 BLAKE2B bacf3a3a0c40ff0663f398eeb75648db3ed6cdda8b18accfbd7fa9192446bc2f66c6c81f0e46fda205312e5fde7eb393de13a53e4841e5a618997a652fa3f0c4 SHA512 6574ab1e96833a8fa90fcaa81d71258b28069177fd66d69d0b5b4f7c4988faceac86c6655dfccea192c930bc0c08adb01ff33c68e48447f53bb482ea40dd708b
+AUX kobs-ng-fix-stdint.patch 1947 BLAKE2B 8e82138a29c1a73e2520defed1d49452549cef7f162fbfe7af69ede03b502d64426dc4ccec4ecde47a31ed60173887a87dc4509fd23e3c45deb838f770d3190d SHA512 1efe648deea0c8972bba03a01944288c3b6db504d8005bde9e0f62c5828ae41768b74a0d4891876f7de7ddeddbc4c390fd65a38419ba7dbd62c3e2d9e9fc9303
 DIST kobs-ng-3.0.35-4.1.0.tar.gz 145817 BLAKE2B eed8a20be261c5ee03f0cff0d0381079353a7f0887202201eabe1377bc14387b7e5b2240bdf4e5d908aaa38dd58ec3299e8a1ea264122970a872cc29aadaf23b SHA512 b2bb27202ecbf31bebec8eadcf04362178ec74337400416259237880b94ac2e5fcffae59b48857e9fcfa1b1aae584b181901d4dafea63eb1e0972ed3bc3b9e6e
-EBUILD kobs-ng-3.0.35.4.1.0.ebuild 763 BLAKE2B 5eb5e2d5f24191157c89fc5d06751b6e3d15740de24e6c42d485a608010005092536328a69e3afec3088f411fd832941991ec9da2be13fb0d4001cb0482ceb63 SHA512 16ccc0739c6145526374e0adc2121c57a2968b9b8bf9c2c0c846ba5b44587d0fc3f764903a99d5e5da1c8097950f40521c4eafb741a89c9dee46190ee5bc4437
+EBUILD kobs-ng-3.0.35.4.1.0.ebuild 687 BLAKE2B b89342e123bc816562178616a61a9479ecf5bbd1dbb658a775cc91df73de185e396b1f3fae1aa5825a1d44b9a4f8692dc8333ffda668c284d16d4532399422f3 SHA512 03eb55026cf257559f81820bc33256e37052a9568b0ff7e01445b90e115e1aaf015a08ae4f80b33e002388c23a0461ec2b9e5dec08d6bb760b44ca868cf9a032
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
new file mode 100644
index 000000000000..d323da1d09ec
--- /dev/null
+++ b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
@@ -0,0 +1,93 @@
+--- a/src/BootControlBlocks.h
++++ b/src/BootControlBlocks.h
+@@ -20,6 +20,8 @@
+ #ifndef BOOTCONTROLBLOCKS_H_
+ #define BOOTCONTROLBLOCKS_H_
+ 
++#include <stdint.h>
++
+ #define NCB_FINGERPRINT1	0x504d5453	//!< 'STMP'
+ #define NCB_FINGERPRINT2	0x2042434e	//!< 'NCB<space>' - NAND Control Block
+ #define NCB_FINGERPRINT3	0x4e494252	//!< 'RBIN' - ROM Boot Image Block - N
+--- a/src/bootstream.c
++++ b/src/bootstream.c
+@@ -30,6 +30,7 @@
+ #include <time.h>
+ #include <alloca.h>
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ #include "config.h"
+ #include "mtd.h"
+--- a/src/dcp_bootstream_ioctl.h
++++ b/src/dcp_bootstream_ioctl.h
+@@ -20,6 +20,8 @@
+ #ifndef DCP_BOOTSTREAM_IOCTL_H
+ #define DCP_BOOTSTREAM_IOCTL_H
+ 
++#include <stdint.h>
++
+ /* remember to have included the proper _IO definition
+  * file before hand.
+  * For user space it's <sys/ioctl.h>
+--- a/src/mtd.c
++++ b/src/mtd.c
+@@ -24,6 +24,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <stdio.h>
++#include <stdint.h>
+ #include <malloc.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+--- a/src/mtd.h
++++ b/src/mtd.h
+@@ -25,6 +25,8 @@
+ #ifndef MTD_H
+ #define MTD_H
+ 
++#include <stdint.h>
++
+ #include <mtd/mtd-user.h>
+ #include <endian.h>
+ 
+--- a/src/ncb.c
++++ b/src/ncb.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <stdint.h>
+ 
+ #include "mtd.h"
+ #include "config.h"
+--- a/src/plat_boot_config.h
++++ b/src/plat_boot_config.h
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ #include "mtd.h"
+ 
+--- a/src/rom_nand_hamming_code_ecc.c
++++ b/src/rom_nand_hamming_code_ecc.c
+@@ -32,6 +32,7 @@
+ //   Includes and external references
+ ////////////////////////////////////////////////////////////////////////////////
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include "rom_nand_hamming_code_ecc.h"
+--- a/src/sha1.c
++++ b/src/sha1.c
+@@ -23,6 +23,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include "sha.h"
diff --git a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
index fa662e6a10ef..0b1be3432977 100644
--- a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
+++ b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-)"
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4-)"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="utility to write u-boot images to NAND on Freescale iMX devices"
+DESCRIPTION="Utility to write u-boot images to NAND on Freescale iMX devices"
 HOMEPAGE="http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW"
 SRC_URI="http://storage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/kobs-ng-fix-mtd-defines.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-open-without-mode.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-array-violation.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-mtd-defines.patch
+	"${FILESDIR}"/${PN}-fix-open-without-mode.patch
+	"${FILESDIR}"/${PN}-fix-array-violation.patch
+	"${FILESDIR}"/${PN}-fix-stdint.patch
+)