gentoo resync : 21.07.2018

3 files changed, 2 insertions, 43 deletions

diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index ec4101d7b9a7..c4529024d96b 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,9 +1,7 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
-DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d385af3611aaa003e1f0f315747f8df1680529c4c0332c5b4130eadfbcbd57d18b7fa1deb794e07cc9b0d8db22b98e27d9cee SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 DIST gst-plugins-ugly-1.14.1.tar.xz 884668 BLAKE2B 8e1cef0ebabac65ad2b1d6ac3fdc04fbb3ae0da0b9f4c0d18f03533ae12dda03d04763bbeab079aebe3637df664dc2e94adc36008cacfb6c00b9ac8b4a228241 SHA512 0eaa9435e93596cb2c2ed1d3540dd3c4f4de1dd18da8359ca5918b0fbdccda9d5b8f33e5aeb54186ed9d70518712aca92e8ffe7884fc13a3ca3174552c10a688
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
-EBUILD gst-plugins-ugly-1.12.3.ebuild 1028 BLAKE2B 0ab269cb2db715e6c7cabcc1f40f7355fd646fd110ae98587db9e882b6ac60dcfc25801345e0f343052452e35816c2f38021e0474e750913701ffc01b969df67 SHA512 68a1e42a72aac1427d57a79be67a7f611c0a83caa6d5852d82579623dd3f8e1d946f5e5bbf3c0c69859e4114cec199002c2b9bb94d8b5de5ce7b60d5accf0330
 EBUILD gst-plugins-ugly-1.12.4.ebuild 1029 BLAKE2B 552f9a5075bd61c3b8cfa6659fa834fef445a19059f9a10cf7c6ac0e72db070dfa807f02db3534a037eebf94c1effd3555f701d1131b2868f0694ec9dae3f81e SHA512 6c0815445be549b133012a5e1fe90fe798df27f4c55f73e8bf816db04f5871c4e12f5c8978ad117696a1afaf3202e5627f8a849b78e642d97a76543ccabdbdd2
-EBUILD gst-plugins-ugly-1.14.1.ebuild 973 BLAKE2B a2b1e717b3d055ffb47535ee724a4ff000ce6ee512896d0ad5884b761db45ba350b1ccf7d6294a1539962fc4fb9f9fb37165155a7411ae6514133ea164040066 SHA512 0836934452813ae059837938ee8244fd6c3fd1a8078fd50b2848afcbbe19c2abc1d9ac04f32177aabb33118bcd9590655eb99e7aa1d310eb8ad73287ea87ff80
+EBUILD gst-plugins-ugly-1.14.1.ebuild 971 BLAKE2B ec697b8dcb53d1f6b24436bd90f61e7b36bf595d5ff700be4f6a66d772aa723d1407c47a313533776c7d4acf657d00786f326007cab6cb813bfa044611d9bdd6 SHA512 bf5ab5623e1aaed37de2b0575f204d21de077748b985dbe9518edf6dffd01da756a27a19385121d14cf3314f5038ae9b0c4fc8456921794ec2bf039deb003ae7
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
deleted file mode 100644
index 3900a8995fc0..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit eutils gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
index 5239eada034d..3fb380a37599 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]