gentoo resync : 14.04.2018

6 files changed, 4 insertions, 29 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 5e6c4719d7cf..d7833e280423 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
index 60da67cf1dad..9bffc0ad9125 100644
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@@ -1,6 +1,5 @@
 DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922aa32ebabecc15a3b3bb8d021f0dc3e13661351626a36365c76e325cded37046d7ac0f84ce6239c034a87e1 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68
 DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba
 DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7
-EBUILD nrg2iso-0.4-r1.ebuild 605 BLAKE2B 9e89e6ed10385f37c93a63e68ca6cf1ad56a1267258009ba43d2794e86df13bf8cfd7854963e9445f05faae36f9bf47dc6b5b5f44ad658fc070f3170b6244e4e SHA512 2b7c582b8d78b701974457a00440e347393de25771a5c149427a668205f98ce1a550f143c6782846b25d9c8f185f9172f742245aaa5ead67afc8f3cd44c082e9
-EBUILD nrg2iso-0.4-r2.ebuild 966 BLAKE2B 2ca8a75f0be3aba7270951936f3e0183a542201e1e602dbdc2a92381c09a03eb092c5aa5c1bc9d04f580efd754a5637946dd4b4d794f1e52bca787c7935d336c SHA512 f527992d3ce7e31dda39147318a96d52a9ed271ed06015aefa1918078b78cd24d99ee128a95c4c5c232e1e4adf276dd131aef0c2492eaab9f34db36a817ff170
+EBUILD nrg2iso-0.4-r2.ebuild 965 BLAKE2B aa2f6ae8666fb3f816683fc803b3f7b534858f5290b612519c8a1f1a71e9f182181c35390634580ed67e2640eef73b2b148cce95bab662d0d373495273db009b SHA512 778e679f7d0d828dddf9f94cfb8b339d303ed1a7c6ccfea25f9d942b0674faef02b15b2c83a21677d24d1333effd7e428829ab7f3db5251e4e58fc7a1ea0f3e8
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
deleted file mode 100644
index 2e22e8734e76..000000000000
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts Nero nrg CD-images to iso"
-HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
-SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o nrg2iso nrg2iso.c || die "compile failed."
-}
-
-src_install() {
-	dobin nrg2iso || die "dobin failed."
-	dodoc CHANGELOG
-}
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
index 0c19765db935..25312a18564b 100644
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 DOCS=( CHANGELOG )
 
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index b08ce8aea637..4436b1d6b084 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,5 +1,5 @@
 AUX xbiso-0.6.1-libs.patch 831 BLAKE2B 3be6bfd500f834d455ed0a8f471276c139871bb6876247ae38ccc4344ccf71b1694df67ece512398128202b025976fe0b751ea934201983cb51b20786627e18a SHA512 abbbd8cbb8ff0a2e3c13a6cac2598b42cc213a087e19c46d0665d95a3b394a513009609118cb661bbc207bb6121e335f2d6e755f3fdcba0cf03864bcd048b51f
 DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r2.ebuild 875 BLAKE2B 2ad6a7c80b170bc61912b3dcd72df226420a761d2f07d5852b50a04c3df8c42620da0da7970b7d4dccc9f1898092a3d517c076bce8db79e640e94b950256ba14 SHA512 8ac33f6c979abc9d88ed8f71f33bf6262451c0b9ba79e756a797d24393b117f780af8e7c543e5d849a8470f1b2111d3afd19f0019d2773da8e1c4c13f6efafe0
+EBUILD xbiso-0.6.1-r2.ebuild 874 BLAKE2B b3a16c9762bb44c42f4d010014d1d68146bbf9edab3d0016ac4773868daffd3cb64ad34cf49f7d6c27a658ea6d32ff3249711e0b7bdc52fa428f7ba3f78722de SHA512 e1248654a198074e9b7f0d1b9ecfee94623a5d788339b1daf6dc272d62c636adb89a57c40b4388a085629e0ed49cad937b4a62fc7c23523beaae0f021e561d64
 EBUILD xbiso-0.6.1.ebuild 622 BLAKE2B d6e0ec454d81dd063a60db9d518f6353a6bbc20b783d98196c135f17ae53871ce785cec77cf1cb6d0b26aa6107b816109000768417ed39081e54827591159890 SHA512 c48d49d1fb2a16174d505d70464d90434c1deb45baa86e80e96880b11a55419b5dfcb1ff7f606b595fcd531d4532be288601bb55d68cfd57d28ff7b52e62728a
 MISC metadata.xml 323 BLAKE2B 6a0770e71ff7ea1d4aec6a1c463ef0e61da6e67d233faabe667fb48d66178810bb5a8cb45089aa9c6e9be72a10e88befa475ce12c2c5c5874276011543a67952 SHA512 688b4299ad48494730835903feb951941c1da2a69705d49dd4c64c7d0b8d9f5e6576e162f735739787063db73ff2dff41d5444375181e8488cff21f31c3d89f6
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
index a8cad8936f45..0bfb72aa0667 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ftp"
 
 RDEPEND="ftp? ( <net-libs/ftplib-4 )"