gentoo resync : 07.01.2018

10 files changed, 6 insertions, 95 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index ad52d31b2986..f5d28bc913d8 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
index 04b08b654005..b19c599d69c1 100644
--- a/app-cdr/b5i2iso/Manifest
+++ b/app-cdr/b5i2iso/Manifest
@@ -1,5 +1,4 @@
 AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
 DIST b5i2iso.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
-EBUILD b5i2iso-0.2-r1.ebuild 583 BLAKE2B 2a7ec6762f578eb29d1bd364d50a972e28214ab90651ef9e578925dfb9fb5575360db84b59280ce0edc012af7722d51b996c0d97afdc740e8d3dd9455e747b21 SHA512 459c452c318d2112fd67e23e547b5d893f9fc09852da82aa61da16f296340cad155a4087505cc8b548c7788370fd312bfd73b6611582f7edcb5725acb58ba1af
-EBUILD b5i2iso-0.2.ebuild 479 BLAKE2B df5475bfb3ab90277f307ee82edc1a268dc91af650910b4585d2a7f32b43c3b3114dc61ae83bdfcb6be5cbbea8660cbc51e221f2d7d3216faaf781e3bd88aa24 SHA512 97d8b01c2a030cbc52b390ef2983efb15bf83f929ea1af3c39be4212312a664f9231e2a90868255f8fc9acbf533c6b5f16970219c480e74725a0566e55080f44
+EBUILD b5i2iso-0.2-r1.ebuild 581 BLAKE2B 88f162876dd3af073cd3af7c3a188cf998c3fd3ebac2e36880bd6379d9a6270ceea581d23c9f7bd30e9b83ed4fa62969a8ff408811becb12f0261684750e4496 SHA512 33048970e02ab8bd1d39a6a77be648e7e7e6bf20633b7ea10e5e274ab356dabac1b375a26442f699ca0324957b2dea62df7f013676e1f1470d6b9a12c4c5ca2a
 MISC metadata.xml 168 BLAKE2B 3e5971a4f8eec29fb98ca9e9e3e93e1ffb3ceecbc911e171844dee81b53f757ee37173d79fdeba5ceded1ae70f84cd00da36912efed91d3bbdfd09e339886166 SHA512 a0f46e63b4efc395be44cfec9bafd3f0067a239be0ac79de35b85c6ad14f6bb7dae7c4e82ce8d18fb4c089026426d6554ecbe2c54d4b0f8bdcd77cfee6467ec4
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
index 4fa520247588..f45009e3c802 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-segfault.patch" )
 
 S=${WORKDIR}/${PN}
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
deleted file mode 100644
index 7790eb38d225..000000000000
--- a/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="BlindWrite image to ISO image file converter"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${PN}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 880ea0110a6e..7f2c16e31b7c 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,6 +1,5 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
-EBUILD bchunk-1.2.0-r3.ebuild 502 BLAKE2B 6329085b7b5b1cd81e29e93850ea91ca860b6844c8c61e684a115400d1a1f4354b3baf89753c7a84361ded8f4aceefdfafe584e5cdb96870f89aaedd62441407 SHA512 8153d27a6bbffe3b0d4fb50da5b5c64c9a0187a9db6008516975fdd133d4550484d88ee54075146690a87a098e21f462e09426436f1e5f5c6695cb4b892b1f1e
 EBUILD bchunk-1.2.0-r4.ebuild 584 BLAKE2B e6cadb8e14ffb69db005f27c76dfaa7eb77db351b5293d084d948b52304cbd6e6f54a67d31fa24f2fac30e04130ce78f19eab37a03c426f289b858478addb65b SHA512 1eaf7fdb44aec8579926280b8fd9b5eb4f3841cd2ec6c89d6ad097709029b8d0108abcbd79b64a517a48e93f4244f8a6ddd6bc35bc5b3f2fc289eeb846be772b
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
deleted file mode 100644
index f8387e0cb352..000000000000
--- a/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
-HOMEPAGE="http://he.fi/bchunk/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
index 9080cef94a49..718a1598acf1 100644
--- a/app-cdr/uif2iso/Manifest
+++ b/app-cdr/uif2iso/Manifest
@@ -1,7 +1,5 @@
-AUX 0.1.7-Makefile 184 BLAKE2B 29aa6274bfc615b17ca825da5e191e30ab6aaddf9eaea4c614a16d462c8f195197fbeae99424a10eee5af1eb092f506d34bb2392166c7a0ab39ede4da19c2b08 SHA512 a38e7164c753273604272f07d141d6dff57102b989e647f7d0c3682f8afa719af4c4717ab64f6a1ed5a33b5081f5ea71a291b2ca1baa265ad9a00b6c77650d54
 DIST uif2iso-0.1.7c.zip 113727 BLAKE2B ae82e898cf27da8e3283af4c3d8dc2bea87fe29fbe998cf720f7876665c621495b1f68ab28af1250d7d041640404fc3d04c112eb7599476dfe4cb8118ab1dad9 SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f
 DIST uif2iso-test.iso 55296 BLAKE2B b17ea40509445665c9103b38fcf26fd8b6e84917e9a0d31c7a53bbb201c310685649c06d055454dc2883e1d566d98912003d74ffbb68f6e6dca8dd47c1705a59 SHA512 775f8fc87a51709c6ef10ae2751cc8600c22d70af419afd680a1917338a699e6a3934597af26400f67ff68fdea5db32e416d73fda370ef71f0d19a5bbdcbedd6
 DIST uif2iso-test.uif 499 BLAKE2B 8e5098629c11572e839bc481ef44e7ff79c46926e049c3f5fb41b1868f63775f509740679835b289222299cfc9710ae8ff7f1739089a44f6fabd1d12720251fb SHA512 6863305d325ec6cf6c8693512d011ec4150bcf0be94f84495e4075cea74412b9fd8ede17f77ad9f7d4b3cf205c9406adbd5440697c7857ab094e4659d074efeb
-EBUILD uif2iso-0.1.7c-r1.ebuild 1081 BLAKE2B 47a880b9f7d50227e432d36af99329c548df77c35192c17b95df9fc7bdc304d78b8af1fe32b40c3f11a2e72b1bd283378b1549bfa43ebe3653adaa9914457cd4 SHA512 8f3beb347f8a1b99c0d1b978163d96b87b6597a6b56caf72f4cd06e8efe8cacb8f6c102ae4d1fac3dcfde03d7b94d11d60e7155816bc4a96efa48dde21028605
-EBUILD uif2iso-0.1.7c.ebuild 697 BLAKE2B a61cf005963990492b0ed2d8e7c2a4c1e844a27c49a7277e51c4389a3d41d4e1527b9bfd71f964cd9bfebf334dbd9b8d749e97ceef351e9ce790207ccc483caf SHA512 e971f2cf73f4a65a19e47880ec0921389d2fbe2132a8d3ef0fbdb89a9d05ac51a908d2683260a5ae8fb58f29293393fe8bea392de1293ab4a019aef9e15c97c8
+EBUILD uif2iso-0.1.7c-r1.ebuild 1079 BLAKE2B 850274931d547bfd444f53a24f3566073f4980ef021a1b8dd4acb4b78480b1ef83dfae9d416bf6ba8f2d6e8eba8f6c230a72c35b1b7ce8aac7a54bee0db69fbf SHA512 8ef1cbb864c6554e1dd7452ba50fea697ff55dd7c4c43a50940757f265036ae7ef9b2f2486c5ca9cb5cc82596107c7231b580153f54836a039f8af07b28a32d7
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-cdr/uif2iso/files/0.1.7-Makefile b/app-cdr/uif2iso/files/0.1.7-Makefile
deleted file mode 100644
index 0b8a2bd95355..000000000000
--- a/app-cdr/uif2iso/files/0.1.7-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# We replace the makefile since the upstream one is not suitable for
-# us :(
-
-OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
-
-CFLAGS += -DMAGICISO_IS_SHIT
-
-LDLIBS = -lz
-
-uif2iso: $(OBJS)
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
index 97d523632af7..42e0d67928b1 100644
--- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND="sys-libs/zlib"
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
deleted file mode 100644
index 9d43caee44c3..000000000000
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Converts MagicISO CD-images to iso"
-HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/src"
-
-src_compile() {
-	# Yes we use our own makefile, I'll try to explain this to
-	# upstream _again_.
-	emake CC="$(tc-getCC)" -f "${FILESDIR}/0.1.7-Makefile" || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN} || die "failed to install"
-
-	dodoc "${WORKDIR}"/${PN}.txt "${WORKDIR}"/README
-}