gentoo (valentine's day) resync : 14.02.2021

3 files changed, 30 insertions, 3 deletions

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 8335f845b77a..04adbda61640 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,9 +1,10 @@
 AUX isomaster-1.3.14-include-path.patch 840 BLAKE2B e1247441758fb0ac40da3f2144187e62a80080181bb41bdddcf08de9745cfc3006bbe1a89db57c16a90365b41cb9411b942a1a46c8502dba7544ae6146ee4b4f SHA512 d25e5b8b81623b75377ba5ded5fe43d70a0879bc7956d3c1a60f9f417405cf7ebce808c4145c314a2c968561d8d26e7b8bba5488076593230e49824029626a6a
+AUX isomaster-1.3.15-ar.patch 615 BLAKE2B e21808e39f2e8ba947fe2daee1857a1bbf1094b6151a3e3a916e516c962b1c92736839669f56c744dcb6ffe2eaedbbdebe7ab0d436cdd462fc29c98265078adf SHA512 d482d9327a901bd6d7cb232876b65c99596e5109b590f877a8af225fe771afa0bc3eef4de73f277895ef7a3df20002672e21b6cf370222d79953ee21e898477e
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
 DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
 DIST isomaster-1.3.15.tar.bz2 251622 BLAKE2B 9a3dd4e4a0d6aa0ff5b76774322e2f66257dda18e01835cad911f7abaa83584de1388a6c21bed8a8c8b5b9e94d4a2f23801e656b2586cb24b38b5aa4ca074c15 SHA512 08d4b12ba1f35e8fdca75b05b3125b046a03e1f1dab6876226b45c76e8a40fa78296854e8142a0864402563913af4c935ffe338777b593026e40e121b4089661
 EBUILD isomaster-1.3.13.ebuild 1487 BLAKE2B d32458c38678cbd0d5c60e4d235ee2a81c74534fb8bd7c1d739ae040cbc76ebe9ba523ea088df59cf3eb4f3ed2dce02c8c2d4ec80eea261805e9d3e393a9bd67 SHA512 9368d45977bfde67e9c8badd96714581443130a319241be0333cdf37912407d2d622070ab5b0da745595c741778f39616d4759ec41c4c37d8a84c034ac36afc6
 EBUILD isomaster-1.3.14.ebuild 1495 BLAKE2B 3c508e9fb2edcad37f05cdf222f15e80453b3d150249ed47ca910769c7df07f288529f433c2c6d592eadcfc29ace212b0a9bc88f1b01d0e397cd5572b0bfbbe3 SHA512 e51aaf01126082cf2f2b41ce6ba7f240d04df5500663d65ed60870317130069486b04399c436920434ff2ff2a7f243c4eaae21a0f44cb11fdec92e1a212df437
-EBUILD isomaster-1.3.15.ebuild 1501 BLAKE2B c8fcdfe357b0a61538a4839b1de00a4b82821e0ac227227a0dea7ca98f9f6060a935d96fe9d9458bba1ab025ea477f8652df3fe454ad7125630874a78ca9bf88 SHA512 7f08a9bb73ad2b6ca183b3b0470d7b0b3a50fe758e30d70afa5995e8daf30b857630a931df5b3f93c4f388bfdc8299d83647116c04daa9d3ea2facd2d58e953d
+EBUILD isomaster-1.3.15.ebuild 1541 BLAKE2B f6466796089ea965b464af88b1e7a3aab16b861c86ea8beea19db935d9e2f179d8697318fd8ed3ac3331670105d973326a765cc000c5a19cf600310f7d361c1c SHA512 f3cbc1c411c408037fb0fb7ccb664e6a3224603ec81ada10f403b756f757c97be4a16212d4208c6210ff9318d61909ce4a521838a5fd569aa5d19a75b3b46128
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
new file mode 100644
index 000000000000..12c5ef4c3621
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
@@ -0,0 +1,25 @@
+From 1553ea30148f69bce545b3a79ab3f7847566c50a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Feb 2021 19:36:33 +0100
+Subject: [PATCH] Makefile: Give external AR="$(tc-getAR)" a chance to win
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f005099..98808f8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ OPTFLAGS ?= -Wall
+ 
+ # programs used in the Makefiles:
+ export CC      ?= gcc
+-export AR      = ar
++export AR      ?= ar
+ export RM      = rm -f
+ export INSTALL = install
+ export CP      = cp
+-- 
+2.30.0
+
diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild
index 4409476a71a0..f9907cc82e04 100644
--- a/app-cdr/isomaster/isomaster-1.3.15.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
+	"${FILESDIR}"/${PN}-1.3.15-ar.patch
 )
 
 pkg_setup() {
@@ -43,7 +44,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export CC
+	tc-export AR CC
 	emake "${myisoconf[@]}"
 }