gentoo resync : 07.01.2018

4 files changed, 3 insertions, 46 deletions

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
-}