gentoo resync 08.09.2018

4 files changed, 2 insertions, 75 deletions

diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 90da6afcf067..f85ccf15fb75 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,8 +1,5 @@
-AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57fb2029f49f581d9e15dc6bd36a8f9364be83eae551d7db4995da5975e2dc5c0b984e5bec38b4839aaa2b6c710876021e3db SHA512 3155814da1abcbf0ad3c144e3470b5b2ae9e93d9d1b1df2437dfdf16b31aaa9efb3642ceedb6facdc640685ddc41cfddf2e7266994d6ad5f1fa0f24e1473a89a
-DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
 EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
-EBUILD qrencode-4.0.2.ebuild 785 BLAKE2B b223dac0308d17648761f32b45339aa12074113f81f9c35f37f806198f2922239efe9634135a68fab44b7ffd4f7d2e29a6f14940e5911e765c51f2aa91a3a2d9 SHA512 a4d2e49119d9365f75f2d7c740496d6e302ad66dfefb1894925f6323c105ca3f3d0a5788afbafbeee85015ce4380626c8948f175ddf54d567086493c3eabb14c
+EBUILD qrencode-4.0.2.ebuild 779 BLAKE2B cd9c91203d9f5aca1897e1454a3580622737d139886b5c46a6ea4e0347acc764ed23499893f3176adbbbe7e6e24ee7bb5fff55cd7eb3bd39f637d548bd86a53f SHA512 e0470b7b3ab7395d035914f0298a75e0541c2d8e8bb98294cb8edeb0b31e3abf3d02b564d7c43d0d0edfd98c30a08e66b6f428f1dfb9272f6fda9e1ed979fb28
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
deleted file mode 100644
index 09c15eedfbe6..000000000000
--- a/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- Makefile.am  |    2 +-
- configure.ac |    9 +--------
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 55659c5..a065514 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libqrencode.pc
- 
- EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \
--			 Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \
-+			 Makefile.am qrencode.spec.in qrencode.spec \
- 			 qrencode.1.in Doxyfile tests/test_all.sh
- 
- if BUILD_TOOLS
-diff --git a/configure.ac b/configure.ac
-index 6fb1409..ca30225 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ AC_PROG_LIBTOOL
- AC_PROG_RANLIB
- PKG_PROG_PKG_CONFIG
- 
--AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1])
-+AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1])
- 
- AC_CHECK_FUNCS([strdup])
- 
-@@ -71,13 +71,6 @@ echo "#define __STATIC static" >>confdefs.h
- echo "/* #undef WITH_TESTS */" >>confdefs.h
- fi
- 
--if test x$build_tests = xyes ; then
--	SDL_REQUIRED_VERSION=1.2.0
--	AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.]))
--	AC_MSG_NOTICE([SDL check done.])
--	AM_ICONV_LINK
--fi
--AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
- 
- 
- dnl --enable-gprof
diff --git a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild b/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
deleted file mode 100644
index d08b8dbfe7e9..000000000000
--- a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-pngregenfix.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index a12c5fe02c0a..82528744c84c 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="