gentoo resync : 22.04.2018

10 files changed, 28 insertions, 296 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 8eead6d17db2..44fbcad2abd0 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 0df57b7ea34c..0520c18cf06b 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,8 +1,6 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
-DIST cdrtools-3.02a06.tar.bz2 2117648 BLAKE2B d9d4dc60d3919e87c6d96addba0e45b9e8682d1f289e45e23a8c29238eccd9aed838c2127e34bfc0f46679eb34d0218a4640eba6b4e1ce18f10a9b305cf5646e SHA512 31a0743e39513841e77dcaaa52d746cafc0867ba01d46d43310f89e4ef2a0759fcac2e812aa323854daaa9a5ce8627c0612b8e461072a6066c20883ebe639c0c
 DIST cdrtools-3.02a07.tar.bz2 2127058 BLAKE2B 5307a012a0d4a593d7e0fc879e2ac0dab8ddcca573772194b3a5bbb3be74fc8109d9af720dd12369b4ef5c51ddc70ebad9e8c5a672d6dee62e7462dc67407ab4 SHA512 7f9835dd32ccca119d2ab77de1cdbd8cfbacc8e9923ca42175a15a5b1f45a8aa238fa3b0917ff67697b54905edc78a142f7106af9127854f944adead4a0d826d
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha06.ebuild 8158 BLAKE2B d69b064e05a61b15567d7536622b65c0c8b69a137f6fa0f6840b2cf8616002d6fc327bf4441b95cc8d36ca166421ecc5f0d2ff1c5393b9551fd30bc9e8795c6e SHA512 fb91a63cd2f47b0342350ac527b23c2cb6454366e3f8c3aceeaa88752760fa4cd5950037ec16114bce390232047e9ada50f47e05d6b97cfd92665a222d830675
-EBUILD cdrtools-3.02_alpha07-r1.ebuild 8267 BLAKE2B c09518bb0e2d961d94e8ac0841ef754a0dce19754b2a7e92fe0b841912fba368409fe39711c0e81c3e2a13c1fa8dc86d7d4b47c8f84dbf1193da6effbad38c01 SHA512 c0094dd075d0113cc3bfd3bbbcc2ba5805d59c9ce145d673da9e255a1529c0656917685be59c91503a512d0a9ec30e963b61ba76a641c6714287b5489b409af0
-EBUILD cdrtools-3.02_alpha09.ebuild 8276 BLAKE2B 0117783e30ffa2875b56bbd2d7a26a895c41c0be60ac81266d6b42ac454c5c4b9d17e0216cf23fd2e2a8b30f84ad14a9bbe0a2dc941bba389e963597e17c4488 SHA512 cadb033f176fe74f98febb566a503f483249da124ad9621692b5a7d3b8260aa9a27a0987019700371bf991537ab2180981b75248293ec419b248d5c5df036059
+EBUILD cdrtools-3.02_alpha07-r1.ebuild 8266 BLAKE2B 0ca2f4a823bd5f74f3fc0dd991a75b74c28e22d8fa6f2ad543bcfeac2ac2a9175b1bb821f79d6c9a9b315d50eea44e4ee3521f8e3badbcfce52cb7a525e4048c SHA512 b53f2141f7a7f83445b09a745425fcce2c5225ea0870b525b7698dbc3f9958eb07913913e23a1273b400e867c5a0e12416236840a1ef01e27dc53b2b5adde7a2
+EBUILD cdrtools-3.02_alpha09.ebuild 8273 BLAKE2B 26243cab0653753190b1cf0c18aa63a5e33a5cc33a9bcbf0812efdd179566b0ef43b3b9b58e13201f8db66de10ed0a010cd474a3fc11be1b1c2bc6edbf6160d7 SHA512 46b82e2787bbdffa09d4afee03c21f459d98371e092dc626d7b38da848070f326d5b84172cf5ec9d1b2e3fab02e6c222447f8226ba04f245f00f8bf3cce0d22a
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
deleted file mode 100644
index e63128e7de94..000000000000
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
-	echo "${os}"
-}
-
-src_prepare() {
-	gnuconfig_update
-
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# going to include this so let's try to carry it forward.
-	# Contact me if it needs updating.  Bug #486782.
-	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
index 6703e37a190d..720f7505f5d7 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index 00aedaa47ff7..210a3d4d3693 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
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[@]}"
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
index 21802c859562..9518988cbbce 100644
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@@ -1,5 +1,5 @@
 AUX nero-4.0.0.0b-qa-desktop-files.patch 1072 BLAKE2B dbf4c8fdd85a6f08bacc7f78b318869b23ebf3c4b5728e7f35f22bc71f4bd2fd9ad2cf45256ae3c87da2302e367384794d20ddf287ddd1ce2c74444b2a18d2cb SHA512 4193e7fd12daac29e99928fd1e117fa5cb110a6ced2c2b294779d8b74b5c9c3bd1c971bd80e6a42d24e818d54cbcf44f827ef8ae22d54795e5e34e732e589afa
 DIST nerolinux-4.0.0.0b-x86.rpm 17391650 BLAKE2B 4d78b4fa09ba45709af0ff87dea28cf24e1d04f8dee2fab1432215ee0707e398f9564c05f5f6999da912ff1e163d08687c8db99498a0c90e469a524684543759 SHA512 2168f87d329054803b6ac33f671aeaee59f5b9e22fb07c23347ae519d63fc4547db9d6e535f58468f2fba4ac274399f934a34d828892ae93e75cf2c2b46d44c7
 DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 BLAKE2B 5e7cc99c4710bcafbc9b6eebfa7b5670534a4f6b4011d3ff756fc936375b7ef6a466c474f3065516a09455b8bf35b8f3db145aedca497293e2915a53ef2dbae5 SHA512 0e5d6c1c9f99b6c149a72f544c6ec7608e9ded4c0d31a7754785a0d16fb3ad77d9d82cc210617104ac6dc2470b3df778cdf132be86a0591813e7a867d3c75a51
-EBUILD nero-4.0.0.0b-r2.ebuild 2473 BLAKE2B a3754034ebd62ec2fc3bb8be95f9f263ea3aa6a99e107a070a47ddc67b063d54c7b1178a8ae12b67595a9e1ba5e28b285ea6643a68ed9ef1af1220e83cb3d6f0 SHA512 8bdfac22773c3aff2fec5a5e19998738d30b4acbfc4b63e4ebadaed4b6fca59f3f06385b350b198cbb3c756478d170941b1b5650a73cb86a8c88115f8894a06b
+EBUILD nero-4.0.0.0b-r2.ebuild 2462 BLAKE2B 9d7138ce92315a9cd9e78f53eefee54f90a8a088e653c82d3975b01303adb37e3cbabce0a333215e72e3f46a8f0f3f604c33e4664796733c52341a7ca6995a41 SHA512 bdcfa17d8a53711e390dd43ecf61b968b5c3d62a854635829928dd360e032b614b7463151fb0f1c5e07722cdb77a700a4261d94cc37219da00276b7279ccd239
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
index 0e03fce26b68..bed8d5a44fb7 100644
--- a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils fdo-mime gnome2-utils linux-info rpm
+inherit eutils gnome2-utils linux-info rpm xdg-utils
 
 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://nerolinux.nero.com"
@@ -92,15 +92,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 
 	nero --perform-post-installation || die
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }