From 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 22 Apr 2018 14:25:03 +0100
Subject: gentoo resync : 22.04.2018

---
 app-cdr/isomaster/Manifest                |  4 ++--
 app-cdr/isomaster/isomaster-1.3.13.ebuild | 18 +++++++++++-------
 app-cdr/isomaster/isomaster-1.3.14.ebuild |  8 ++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'app-cdr/isomaster')

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 96351bd4b231..b39b29c07f35 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B c3e40379dfa8b44d84228af0fad6b6f0225b40a730ad05e698c1dcb225fc91575b36c19a0637a8e568e2f249dfd6b8650abb2f5a7a78a1fa2e762951f9009f20 SHA512 03567d3fb41abdeb969d334f2742b1596c12ba78e5ac4ec8148027fc4fa062a66af8b88d020c2ea081d441ff5808105448ec447ca8731d7b3edaf787d9374857
-EBUILD isomaster-1.3.14.ebuild 1473 BLAKE2B 12789fd1bc0365ac1025ff9a65c8584451e96eec11085c55ea65f1399629da86bd82683127bc28d0bcdd7341fab5ec0c4cb3bf827c509e14396ac83bf4f900db SHA512 fd23d77b5846a30e5eba2db43e78d13cef3bca824d9427fd3874578611aad9bdf6a68194c4b2493273b8914f9293dcd87c81f75a4b8ab8da9975b008af977488
+EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B 7376caeaac6a4cafafe18935bde267b56b09bbc30255598c0d66a1bb7f67b22bb5e23abfc94dac2d9a7db4947144e293c3046331093ac7ba786d9f2942a1774d SHA512 7504b26b144abf3c32e9fbceaa0768db744d4934df495c9c40dcea003c7f5edc3ff5abcde9c5f5c9fa1e857b72e9d3a251bade719859776168848f8ed3e1444b
+EBUILD isomaster-1.3.14.ebuild 1463 BLAKE2B 94b41867d4993b287787ec280f8c0547ec0aba5dc44a44a820fae1a96eb1e78dcb562412d3ec8d6ecdeaffe5e598990957e820598af15bdf0528bcc960f1467d SHA512 d4d890cb728f0a3169c3f404010b03b23981913756717d991278325e4aee788258e039b2bf4be1b8c5eed9cd59e63ad74c9b7348d22383cebf9eeea30091e927
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
index 42e53494fa5c..5497413a82de 100644
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils fdo-mime toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
 HOMEPAGE="http://littlesvr.ca/isomaster"
@@ -19,6 +20,10 @@ 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
@@ -31,12 +36,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
+	default
+	rm -f configure || die #274361
 	rm -R iniparser-2.17 || die
 }
 
-src_configure() { :; } #274361
-
 src_compile() {
 	tc-export CC
 	emake "${myisoconf[@]}"
@@ -60,9 +64,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
index aed6f0647fdd..8dd88dcd9ad1 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils xdg-utils toolchain-funcs
+
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
 HOMEPAGE="http://littlesvr.ca/isomaster"
@@ -32,12 +33,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+	rm -f configure || die #274361
 	rm -R iniparser-4.1 || die
-	eapply_user
 }
 
-src_configure() { :; } #274361
-
 src_compile() {
 	tc-export CC
 	emake "${myisoconf[@]}"
-- 
cgit v1.2.3