gentoo resync : 17.02.2021

5 files changed, 5 insertions, 104 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index cd39022c257c..59e8c7111f2e 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 04adbda61640..c83b306a158f 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,10 +1,7 @@
 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
+DIST isomaster-1.3.16.tar.bz2 254872 BLAKE2B 18d6b656fc1d3bc1e9fcd727a14a581e954d6656d4c5fbb5d717ee46e434cb35f3d546484a8ac6d278cb13018cf427d4d97e6d442c05557c144bb2bc729b57e7 SHA512 431b99db3b304585fb2aac63630cd57294178a7a8b658e4a17119a35fc83ae2f8b4a80442f7a49566bf0e50bc40669b003da45a15d3cd2b2ab30fb76c1eaf89f
 EBUILD isomaster-1.3.15.ebuild 1541 BLAKE2B f6466796089ea965b464af88b1e7a3aab16b861c86ea8beea19db935d9e2f179d8697318fd8ed3ac3331670105d973326a765cc000c5a19cf600310f7d361c1c SHA512 f3cbc1c411c408037fb0fb7ccb664e6a3224603ec81ada10f403b756f757c97be4a16212d4208c6210ff9318d61909ce4a521838a5fd569aa5d19a75b3b46128
+EBUILD isomaster-1.3.16.ebuild 1506 BLAKE2B 8134f78538b0a81a1ecb33ffea00374bb3954d42eb7c75ec8a7cf316a4f176082c7ced2263fe11b5052d7da8a49d4a05cf50b8a73f11cd065f131241c5e9c21a SHA512 85294dcf266287c696413a16218704bc99f585a8cf85e8545efff742d562232a12f0f3b0b45dc77d0feea59db96da2191c5496d240fa6209717d5d7e7a30ee12
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
deleted file mode 100644
index 902028a660a2..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d2cea534819267e9e8b7348b7cf6fdbad72c7b11 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2012 21:34:33 +0100
-Subject: [PATCH] Fix compilation against iniparser 3.0.0 (bug #399629)
-
----
- Makefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3f4b383..43187fc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -66,6 +66,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
- 
- ifdef USE_SYSTEM_INIPARSER
- CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
-+CPPFLAGS += -Diniparser_setstr=iniparser_set  # Define went away with iniparser 3.0.0, Gentoo bug #399629
- endif
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
--- 
-1.7.8.4
-
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
deleted file mode 100644
index 18d0da27808c..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
-)
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-2.17 || die
-}
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.16.ebuild
index cbe941cb2b92..ada30c8db94b 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.16.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
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
 
 PATCHES=(
-	"${FILESDIR}"/${P}-include-path.patch
+	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
 )
 
 pkg_setup() {
@@ -43,7 +43,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export CC
+	tc-export AR CC
 	emake "${myisoconf[@]}"
 }