gentoo resync : 08.06.2019

3 files changed, 3 insertions, 84 deletions

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index 3fc42174237e..f187adf6e6f1 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -4,6 +4,5 @@ DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979
-EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2094 BLAKE2B 710753e7fe91937f6b4fd1e44fa65f73121333294a899104061eba718f804cd2dc8e7f8b7a5ec5ebee51f2fca539247f589fdf44cd1153070dcb12b1b61cc815 SHA512 94b34c9801acc52c9952ceccab4aea3feafe265c28f88a58760c9183a70a45d1d6c39ae9414945fc7d2f81ad40d4cdf1e6013a3874e7db825fcdb31af78c42fe
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2093 BLAKE2B 2f238a548745ac8d76a26d2c29035973c638bc9f52e68774778aeddfc7c17418da7952cc5afe44e080e66b236bfa3f2a5b1f33a5e5cde6052511892d221e39e7 SHA512 758686f936ccd3a4523b8d5f61093cacd3a054480d9fde413a0416f586ed957845792c5ca8b4a4add64947fa4e4b66b394126bf81a3e904a9ee407780b68e9c8
 MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
deleted file mode 100644
index 0a8509a3a0bd..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils gnome2-utils qmake-utils
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-	http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-	texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	media-gfx/exiv2
-	media-libs/taglib
-	openclipart? ( media-gfx/openclipart[svg,-gzip] )
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	libav? ( >=media-video/libav-11:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	default_src_prepare
-}
-
-src_configure() {
-	eqmake5 QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	if use openclipart; then
-		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index f9cdfff4684f..b67615051edc 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}
 LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="