gentoo resync : 21.05.2019

4 files changed, 5 insertions, 96 deletions

diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 930dec03cdf2..e418996d3185 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,7 +1,3 @@
-DIST libass-0.13.6.tar.xz 350144 BLAKE2B 8464c2a56531879c12b009d653099e9570d4fee5c451965e78f2a06bd82eeb5522f672a087957b8a70cd6a7a028ce3e28a22c08048f50c2a1004a5ece0c44c40 SHA512 8fad8ca3fc93143699ba6dbbc0893db3c2f3032ac341f69c2c90319f0bbe1b71fd4b358944a03851ee183f9065afcfec4d4c841432dbe0d9b1d4eb72964ff42b
-DIST libass-0.13.7.tar.xz 352752 BLAKE2B 7ab5dd5656b58b090718e000893e6eb1a05512f792a71ca553764b10f3cab00c19be333848e8db1d06da00b752e2bfcb99f50858588c53043fd499bd9e4d5ead SHA512 8f5531ab5ace0b4ec6160f37b2553b6f06f761a0e12b3521e1b6c78387f7b3b98f24f310a9a9ea47d76fc5529f3cd318c88bd770e08600b71c81f95a43258a21
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
-EBUILD libass-0.13.6.ebuild 1340 BLAKE2B dcdca280de6863af783fc81a57d803f284771eae3c38a6938f9135c1f04f2875890d28827949b87ecfce895b484d7256d29e799577644f14a06dbe5bcfea8ec2 SHA512 11fa0782ccad86072400819dc309c18c197f54f561bfac24ef53cc6f7462220c8dadfb4e9589fc14dd30bb46cc2f8768830db1a41ff7971d052aa8dbf8b693d4
-EBUILD libass-0.13.7.ebuild 1350 BLAKE2B 2b9c7009fbad3743ec1d53abab5c8eb72b5d49d9c625ddb2e22a109c3857d93eba2d08fc91197337f144e8fc77dd492181f19cbd997a7b445c81a8083ff3b855 SHA512 6db190fb50a10ef1ceab912daf9c8822bf35451f1f05e64292002887903400c89967e23685bf35fbab451036a8e4d221016d212f18a80849af4dffd857f915f4
-EBUILD libass-0.14.0.ebuild 1338 BLAKE2B b140b16f57f55b8ae4631fc9b7d6bd60f773c901f4ed6df15b323b18bc60cb38e58c85c43de3d0501a78a71520f0a5e0b83a138c5525391cd5e2aad2d2e854a9 SHA512 afa0480487719493899bb97374427449833bdc2fed88afb59aa73db6f68f3164d71069e5c144898804a8cf345923eb40856b4b08e763c269b09529431568723c
+EBUILD libass-0.14.0.ebuild 1358 BLAKE2B 74172f30132024f1b307dde9ee518aa7a760c5b8c63c09b555c713ac4a889e3b819294cf2e9182b0d240b1ab5e8f18ca351b52c65513b338e3851494f7b0301d SHA512 6d6c89e36a827f31fe133cec3587b45b12978dfea06e4fd9c2c624dd50c024257a83c926be12f856037933e7fe2774616b87e7da6e88a03fc58fc508d30d5f34
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.13.6.ebuild b/media-libs/libass/libass-0.13.6.ebuild
deleted file mode 100644
index b280701832db..000000000000
--- a/media-libs/libass/libass-0.13.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/9" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
-	DEPEND="${DEPEND}
-		${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fontconfig) \
-		$(use_enable harfbuzz) \
-		$(use_enable static-libs static) \
-		--disable-require-system-font-provider
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.13.7.ebuild b/media-libs/libass/libass-0.13.7.ebuild
deleted file mode 100644
index 85419ef69288..000000000000
--- a/media-libs/libass/libass-0.13.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
-	DEPEND="${DEPEND}
-		${i}? ( dev-lang/yasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fontconfig) \
-		$(use_enable harfbuzz) \
-		$(use_enable static-libs static) \
-		--disable-require-system-font-provider
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index a54a4a7f2197..af3abf1c6000 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune multilib-minimal
+
+inherit multilib-minimal
 
 DESCRIPTION="Library for SSA/ASS subtitles rendering"
 HOMEPAGE="https://github.com/libass/libass"
@@ -10,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
@@ -40,5 +41,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }