gentoo resync : 06.08.2019

5 files changed, 5 insertions, 67 deletions

diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index c7be9bc5aa80..4c9023987c77 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,8 +1,5 @@
-AUX libzia-4.14-ldadd.patch 548 BLAKE2B 655b2d21e8c5a90c7559381ed546df0b661b2cabe9880eb78bcfe7a0d35463f064d078c396c0bd261ad476a131a4f6e16a9eac73a8408faff73d85aec725edf7 SHA512 3b7820de0dbda89ad571b6a98b8fc601c289fcb9981586a63391c9de6ee9eb9b71cd4626434b2c4341fc9155e183c5da6a292cc61327600312e122f99a662dd0
-DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
-DIST libzia-4.15.tar.gz 600728 BLAKE2B 7e359a09c9e440c65fe369a8ff9004883ecbc047cfa4995e671c74662f9658370e0e8f613e626f9480abb9fb6d94e777bde70b44d080d45f4e17b1f982c48237 SHA512 041e21e1506b4cc38a0b9a5fa07037de01d19a390b6ba46159688b2bd7c75c44faf6e84d1ec929a582a2c8038c60f986d6d172636b5e9cb1b2fc5a729ec2225f
 DIST libzia-4.16.tar.gz 623606 BLAKE2B 48c5eb65890c87ed48bfaee60a6683f5320c561c8f6bf55268690675e388aefeb52e229c16430b9ff04b8ae29749e52beb71ac7d7f0642f4fa255e1bef85b452 SHA512 cbf0e678abadd670acde1778dcb137a49ad11f8e8d8d8465ebac542deb964e1c138b65ebf61404ea0219e17cdb336585545eee3f63d4e0ac41bffe0010f2c2fb
-EBUILD libzia-4.14.ebuild 784 BLAKE2B 2073c5504b41ee7f4382dc902111d5058eb39cc58c8578b099e1db5d2be5613e331555e0fdc305344f4f1d2e20ef15721c7990264f48e3fbc39d8dadd42c9779 SHA512 9f73df3eee5f7caf277e4b9394ad1b179c11e00c9d7254c9707b85c74944cfd3f7037ccb5419a217df9fcfbe77957c4cee4c2421db4d84196dcae5427b65ee7c
-EBUILD libzia-4.15.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
-EBUILD libzia-4.16.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
+DIST libzia-4.17.tar.gz 626840 BLAKE2B f63ba0712dedd53736ae297f253fa6fcb3ed5afe8f374c33a45cfcfb36e942192ae5a1f520deaca8745ea2a9d990307e984ce2b62894514332dbcd1ee78af977 SHA512 8375cfca8b61c78a8d355ac2d0e329ac0ed3f61ed3c902dd6c3ad202fcc9a1960ef55c4389f46a0d2e1423d060750639eda3d196dec94c9a53b7feba902d5378
+EBUILD libzia-4.16.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
+EBUILD libzia-4.17.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/files/libzia-4.14-ldadd.patch b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
deleted file mode 100644
index 4d0becc5306c..000000000000
--- a/dev-libs/libzia/files/libzia-4.14-ldadd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# add local .libs directory to library search path during build of zsdltest
---- src/Makefile.am.orig	2018-10-27 19:44:55.332591275 +0200
-+++ src/Makefile.am	2018-10-27 19:45:54.268730862 +0200
-@@ -70,10 +70,11 @@
- library_includedir = $(includedir)/libzia
- 
- zsdltest_SOURCES = zsdltest.c
--zsdltest_LDFLAGS = -lzia 
-+zsdltest_LDFLAGS = -lzia -lm
-+zsdltest_LDADD = -L.libs
- 
--gpiotest_SOURCES = gpiotest.c
--gpiotest_LDFLAGS = -lzia 
-+#gpiotest_SOURCES = gpiotest.c
-+#gpiotest_LDFLAGS = -lzia 
- 
- EXTRA_DIST = regcomp.c regex_internal.c regexec.c 
- 
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
deleted file mode 100644
index 5a63aa43ba6f..000000000000
--- a/dev-libs/libzia/libzia-4.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/$P-ldadd.patch )
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 ${PATCHES}
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.16.ebuild b/dev-libs/libzia/libzia-4.16.ebuild
index 89fcf6a119f7..88159bfcae8d 100644
--- a/dev-libs/libzia/libzia-4.16.ebuild
+++ b/dev-libs/libzia/libzia-4.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libzia/libzia-4.15.ebuild b/dev-libs/libzia/libzia-4.17.ebuild
index 88159bfcae8d..89fcf6a119f7 100644
--- a/dev-libs/libzia/libzia-4.15.ebuild
+++ b/dev-libs/libzia/libzia-4.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2