gentoo resync : 17.12.2017

3 files changed, 2 insertions, 33 deletions

diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index b29c8e4251c4..94da16ed2350 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,10 +1,8 @@
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.10.3.tar.xz 3426164 BLAKE2B d5084567d7f1382db936034173c4d32ace63e8b8ddd0ff7538c53ef0713085d44f1cede27d86eecbae956a303af55bf6e3bd4c64f05bdcfeccc17d69878d9548 SHA512 ae1523e374715b4f65509eb63d987118510fc4fe61b5ac2a98e4ec06feb2ec65899557976d796ea09644b32652f3a321aca462b8fe1621308e0c00dd6913e592
 DIST gst-plugins-good-1.10.5.tar.xz 3425088 BLAKE2B 1e8eab244f8cb4915100c78e7c3a9e5bc66150a278ecdcf8e7898b334ce39351eeb3df011b2e96513514e0775e07988919a7dd29125990d30022e01e122fc206 SHA512 556bb5f95f3d52722849b5abf2ece1abeba9eae556aa2bebccaeda419639aa93b517bacbe74a0b3c0ce481d1e56ed2793de892a3054fdb06ec9652e207d69e16
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9abc969bbf6338f65e42c2a74abb425f9e48e9cf2f71e89b92eefbcb9a3eff0ce765336b35b648a386214164cfecf66d03c2fd SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4
 EBUILD gst-plugins-ximagesrc-0.10.31-r1.ebuild 785 BLAKE2B 466fb8947374996c5ad87988bd8ebfd8178d0d9133384e4eced35d66fa9dc0aa019438e4c993ccb04193826edd05934e72a7b072f616deded59fffd6f6563cc7 SHA512 5d99881342ab4a484ada960f520d4b0bfdf012148fd4da5b100c9d8cca0458bef15f437bd94aad91d9f050052e9f64be1dac4056147c3531b44f8261981a491a
 EBUILD gst-plugins-ximagesrc-0.10.31-r2.ebuild 849 BLAKE2B 0390fd2f0912fa3b61f6c427341e00089651f48e1b7cefd6afa1a7593a1765200548d5f95d3a4ac2aab79ca66071b501202597b289b2fbdfe83a336d54b66fb9 SHA512 b4b219838acaf7807a9a3d5644440464197e77b8e26b3b9085755605882845e249d7fb43071fe5540a1b8b85f844d2629a2a8a6991ff04d7ff4a9366634723d1
-EBUILD gst-plugins-ximagesrc-1.10.3.ebuild 861 BLAKE2B 7d9dc264a9701e92eab07fc74200bf29c88eed8a2d3f9994ccde8eae67157a78c104876a827f915083fc6f743799083b25fcce27820b6705991db6449a400d19 SHA512 4fc077fb27a2324eb69e0d00da96060a82f19d1cf34719c8e35e0b547ee105d4aefa4da951bc57323ee746aaf7ace92301c4270f71824cb5cbdc38e80edc673a
 EBUILD gst-plugins-ximagesrc-1.10.5.ebuild 861 BLAKE2B 7d9dc264a9701e92eab07fc74200bf29c88eed8a2d3f9994ccde8eae67157a78c104876a827f915083fc6f743799083b25fcce27820b6705991db6449a400d19 SHA512 4fc077fb27a2324eb69e0d00da96060a82f19d1cf34719c8e35e0b547ee105d4aefa4da951bc57323ee746aaf7ace92301c4270f71824cb5cbdc38e80edc673a
-EBUILD gst-plugins-ximagesrc-1.12.3.ebuild 862 BLAKE2B 611b17d9998f6b08c75b18cf002c801a246979d7531f54d814e146d58a8828e0700d6fb036ae9b5a5b165e7b6e295d4f16b28e35578167e5ad7bc35b21242348 SHA512 90959bdfd7d08ecd089ea399fe9d409a53f0265f60a93d1dba1d7f7e2090713fb8098da351f169660072529fe1485c424f8f18c915908afef5e7c7afd5134ffc
+EBUILD gst-plugins-ximagesrc-1.12.3.ebuild 861 BLAKE2B 7d9dc264a9701e92eab07fc74200bf29c88eed8a2d3f9994ccde8eae67157a78c104876a827f915083fc6f743799083b25fcce27820b6705991db6449a400d19 SHA512 4fc077fb27a2324eb69e0d00da96060a82f19d1cf34719c8e35e0b547ee105d4aefa4da951bc57323ee746aaf7ace92301c4270f71824cb5cbdc38e80edc673a
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild
deleted file mode 100644
index 46d150ccc6ab..000000000000
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-"
-
-# xshm is a compile time option of ximage
-GST_PLUGINS_BUILD="x xshm"
-GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
index b05e93595f37..46d150ccc6ab 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="