gentoo resync : 18.05.2019

3 files changed, 2 insertions, 47 deletions

diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 07cbe413685a..e1cbca853441 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,6 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r1.ebuild 1154 BLAKE2B a718acbc16b40036f3407fc063622cd6b26afb84e9ddb2f9bd652c6719519445054b66d8085bacb142acdf433b3a6818460ca38a6f4f28fb0b8d53ffa9b1dd01 SHA512 2113ec3bb1b239d64b167cba172e135027d575873740b6bf238f49a4db386048cefa43dcc734b3eabdf601608464b7ea7975ba50384506f140790f5fbfd29ec0
-EBUILD libgii-1.0.2-r2.ebuild 1260 BLAKE2B 30977687e7c60707578be4f961fc9fe0e9231837ec8c0f7123acbebf4a6d3e2cf228f303569261d9143c43387152913a798e3c12165350ee8f3e55714169d706 SHA512 3c379d9c627b517a46e8746908665cf98dd21c248e625758477b7b0532e65ca48967420dcee0fb16940c0752c1c78f841233b5521502ea0411e8e4acf96ab96e
+EBUILD libgii-1.0.2-r2.ebuild 1259 BLAKE2B 468754125626dd72b21c39f7e463a55bbbc8376386d0c9663929833600cd09a9e817fd598b4c9e1ca0bc90fb76ee80a2307369f6f310bcdf9c77ffa945f0fa38 SHA512 90f35f055e20d3b0e8eb0ede452aa2b158cf779d4067b4fde036bafdba9a31915932d55336b770348ed7fa604d51989badf6e7e5434722b6ee9193ba7c6f8ade
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/libgii-1.0.2-r1.ebuild b/media-libs/libgii/libgii-1.0.2-r1.ebuild
deleted file mode 100644
index 09e2746d488e..000000000000
--- a/media-libs/libgii/libgii-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib
-
-DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="X? (
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0-linux26-headers.patch
-	"${FILESDIR}"/${P}-configure-cpuid-pic.patch
-	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
-)
-
-DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
-
-src_prepare() {
-	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
-	AT_M4DIR=m4 autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_with X x) $(use_enable X x) )
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index d731617ef338..7e32b4039f7c 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="