gentoo resync : 10.04.2018

6 files changed, 2 insertions, 286 deletions

diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 34529f43e560..f0757bf483c8 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,11 +1,4 @@
 AUX unetbootin-581-desktop.patch 707 BLAKE2B 9de8d50b00bbe6fe5968cb26f31aca08cf4dc8aa580a00b9af31e921a973ee62c6213b8154867902b61b5882377b8beddfbfa096ee7d4382f6adba05342b26cd SHA512 036f887c7fb4209cd08710be88ef25671e8c1e481e3d82bc78cc1e3b1480224573cbbbf8c290846373937863400ee108b72521c1d6a9a883e01209c1da33cae2
-AUX unetbootin-647-frebootbutton.patch 301 BLAKE2B e35b2e0672e998f93e1388d2df0e818cdadafd8834796230d2caa7913a661333d90f1b5db31528af6b989826247cc33cf7a2e75224db3f09b38602e1cd288cef SHA512 21a452adc3a4c157d99a785d65550e2dba4add3fe9ce8545d7e0588d1884d768a2557d5bedd025c592b5e6d40c038eaff64706ebf95e84df6c1c5355c06fcf0d
-DIST unetbootin-625.tar.gz 22671470 BLAKE2B 7420d804f1a490edd701646a3c228687316f0ec17005bf0832104858f9e46fbbf184b13c6aa5f8b6f30bf411e033cddfefece9b9ee6f6fcc7872440af9f88b48 SHA512 0dc672097eb857f8516208f8cbe5a0ec3229aa5dbe56108f64c415d2d9d4679a41e3f8a4b7279c511197303a2e020c95293a305de4df2dc63dc4522b3d13259b
-DIST unetbootin-647.tar.gz 16253287 BLAKE2B 4095e2cc990de6a01d46e3861d20cbbd1dbb04ad90c929ea72034d935b82669e482032ca3289e717fa9d7cdd9a147bb19ce2e5c610f046f5ab9470a494a35d83 SHA512 487be195286dd1e7712afa86cb75f8a79a3acce77f5cbd2571ddad74533d84a90e17b96afecfd2c9831825975b6c562bfb218b583a042600c49a14179129e8bb
-DIST unetbootin-655.tar.gz 16258032 BLAKE2B 2cdf307702851d87302aac3246118c13c5c2a99f1a3a3b98156c5e0ca905d8fe79c87ce90817fee696adf2572bf26a4684f56245ff1e3573a1b7f97a489da970 SHA512 723b4c1499b5c9afd93e5ee3803c9ca18ee5ef5f7731797eedc194a2bbcc2c5be93cc6cb1059f8514f93a8c9e6d650aec40513f649b41382ae27c2f92389d709
 DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
-EBUILD unetbootin-625.ebuild 1962 BLAKE2B bf40e2f7ab23fd371e6b385f5f245b3001f16b50e0923f51936f468ed746ea7bd1f50690fd51879a4aa40259b01093fa1cc3c594ee78dd60ff92375e4a24bc48 SHA512 9c54b4cf3d88fa728865aea999e049875facd460f0af6e614518f4a3cc0af85abe31d01949f60e299226a3f013ea580b495c4951214066f033dc62cfe04e38cc
-EBUILD unetbootin-647.ebuild 1888 BLAKE2B ec32565d87d00884b6823cad4cdcbd1684a552a9d90b344447081d0743ad17387b18db49052bb5e645685f9422e6ae9044ed000f4b86a1ddf6d0c6fe3ac750fc SHA512 a2c221ea7e54db5f8721bd96db2eb378211b2bacc771f4dea73306b050bb742f6db9191c9a8b3aef4123da211323101f1bb2249ff2e600175df3bdc9f361dd3c
-EBUILD unetbootin-655.ebuild 1843 BLAKE2B fbc38365167912476120e0fc56ac796b9456211aaf67f89a865adc97e485e11a56cdf0110ba36be82db3a6dc7215aac94e4ce5f1099841dbbafc3bfefa67c0c6 SHA512 37fb11db5eed45c16369e6cb16b39297a6f035cba952badc355944e24d90ae23a191072e607b9070be8786812ab433cb69ca752803f1af51e1b56137804413bf
-EBUILD unetbootin-657.ebuild 1843 BLAKE2B fbc38365167912476120e0fc56ac796b9456211aaf67f89a865adc97e485e11a56cdf0110ba36be82db3a6dc7215aac94e4ce5f1099841dbbafc3bfefa67c0c6 SHA512 37fb11db5eed45c16369e6cb16b39297a6f035cba952badc355944e24d90ae23a191072e607b9070be8786812ab433cb69ca752803f1af51e1b56137804413bf
+EBUILD unetbootin-657.ebuild 1841 BLAKE2B 16d81eecfdff3af01e3825a8d6fa81074a541a9326de6437af784f7999319a640d0a4099f4f3bd8d17321724f75671daf171739be7def326e3f95044967955b9 SHA512 f7e972624c154460f6caaadd06ba1a3fdd28e9917008c63ee160edffd289ef082139f6f146336327e7bff3a2cbc2e903fc069dfc2f3c95d3898305f012de6b12
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/files/unetbootin-647-frebootbutton.patch b/sys-boot/unetbootin/files/unetbootin-647-frebootbutton.patch
deleted file mode 100644
index d616d12c7406..000000000000
--- a/sys-boot/unetbootin/files/unetbootin-647-frebootbutton.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/unetbootin.ui
-+++ b/unetbootin.ui
-@@ -708,7 +708,6 @@
-   <tabstop>driveselect</tabstop>
-   <tabstop>okbutton</tabstop>
-   <tabstop>cancelbutton</tabstop>
--  <tabstop>frebootbutton</tabstop>
-   <tabstop>fexitbutton</tabstop>
-   <tabstop>intromessage</tabstop>
-   <tabstop>rebootmsgtext</tabstop>
diff --git a/sys-boot/unetbootin/unetbootin-625.ebuild b/sys-boot/unetbootin/unetbootin-625.ebuild
deleted file mode 100644
index 49f0d802f768..000000000000
--- a/sys-boot/unetbootin/unetbootin-625.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="
-	${DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-581-desktop.patch"
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Make room between the last line of TRANSLATIONS and the next definition
-	sed -i \
-		-e '/^DEFINES/s|.*|\n&|g' \
-		${PN}.pro || die
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt4_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake4 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-647.ebuild b/sys-boot/unetbootin/unetbootin-647.ebuild
deleted file mode 100644
index a8e28b868c27..000000000000
--- a/sys-boot/unetbootin/unetbootin-647.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="
-	${DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-581-desktop.patch"
-	"${FILESDIR}/${PN}-647-frebootbutton.patch"
-)
-
-src_prepare() {
-	default
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt4_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake4 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-655.ebuild b/sys-boot/unetbootin/unetbootin-655.ebuild
deleted file mode 100644
index f615c0100f45..000000000000
--- a/sys-boot/unetbootin/unetbootin-655.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="
-	${DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-581-desktop.patch"
-)
-
-src_prepare() {
-	default
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt4_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake4 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild
index f615c0100f45..f675b358ca6b 100644
--- a/sys-boot/unetbootin/unetbootin-657.ebuild
+++ b/sys-boot/unetbootin/unetbootin-657.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 UNBI_LINGUAS="
 	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it