gentoo resync : 23.12.2017

4 files changed, 124 insertions, 2 deletions

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index fa8426caed99..a4453bd4d491 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,10 +1,16 @@
 AUX ffdiaporama-2.1-ffmpeg-2.4.patch 755 BLAKE2B 0a69dbb6ba4a6208461c1c5697fe732f2d3824e807f941e59714b6e32849c38e0919802043ffddb04f092749e821ad394079cbaa581102438ab9ed14648e7a32 SHA512 791a4885188536b4bfb5d4877783c887e1d457878c1d69d925c4e4257ae65864cc0a8eb1ab0063ea082ac13a57791147c16be80087b663fe81b1c8e68dbd8f38
 AUX ffdiaporama-2.1-ffmpeg-3.0.patch 9617 BLAKE2B b270dbbb426c39a365e46b4ba93da6cc4f4f2dd9ed01710fc964e968d61ed99d7b59cd8fbdf5b6ac50b465b921656f1396c26727adf0eb1992ec3495da7e5ed3 SHA512 427df6b22b8c758d6e47a53de0219c1b84806cbb7b9bcdacff40e797e5d52fccd2f90ddba1aabe39f1c184628309d712ca521ad33bdabd0d07caead29b407399
+AUX ffdiaporama-2.2-qt4multimedia.patch 750 BLAKE2B bc1d45a21ec546dd15d2aa8a821610c52c6abade8cb903f3d1828ec078aaeffc196f04e9e194f2d825b0ac8e68381113ae9620197978e6bc5d7756681ba921d8 SHA512 9bd9ad4e0948b1bf31635c87473c901f306556bde8d39a1e660d0f6deca714607a6231b9ab5e8b756ec40c166b2226b238b6999ffb6848ec3718cfd052087a42
 DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54 SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
+DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
+DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
 DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6 SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
+DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
+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
 DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473
-EBUILD ffdiaporama-2.1-r1.ebuild 2251 BLAKE2B 2efadabf5302d8dfe6cf293f61b9d380adeb47efd0cf1cec044f33b6875239aafa6298917a957dca2abc548683cbffdb048c55226d3f6ff97619f24d76cf6869 SHA512 31a139ae4667dd85da0e1760dbcbff2e6af1c658a98da6629e4de7d42007814b13db9fce59e0a20e6d969a00c2e2f92435a5265f4118cd4b2f90d7ca19cde650
+EBUILD ffdiaporama-2.1-r1.ebuild 2275 BLAKE2B b5216e5e6c85e2184cffa8364dc73116bcb3b4cb5026561630c5090d60ea8c57aa538bde441ddda3aaeea205d3561ced5b1726fb870b51304ffc37516505b1e2 SHA512 d235e42333d57429e6e03a41df3c7168d984c4a8ddfc16ddc0614bee0c79b49e3b342c6302fae27c3c625bacf5fbf1558c76f4efa969bfc1aa361efcfda8413f
 EBUILD ffdiaporama-2.1.ebuild 2163 BLAKE2B f3594ffa917a15ea0fb609224d48d90b222037032a3bfc3c4d33a28b31bfdd3ece5a6f9ef1c067318f97c3c8bce16f241f3d095f00f16511b4acff9aa6b683c6 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52
+EBUILD ffdiaporama-2.2_pre20140701.ebuild 2303 BLAKE2B 5995296adc68000b6d20b337f0d5b0c8ee76b7b8982602de7d842f699be860bf8d8795c851674f5d31836ddf14c1147d1e3ab31d7bf7ee1d62f68dea240c7453 SHA512 932d83e57f7fc6a097c46c129be6eaa69e01bf10d22481c9265eaf4d8f9eeb91359ee60709195d90db357dd76e286f363bb37f2fd0ed7c9cd10da94d052a018e
 MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
index ea066ecd17b2..da652736f010 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-{ffmpeg-2.4,libav10,ffmpeg-3.0}.patch )
+PATCHES=( "${DISTDIR}"/${P}-libav10.patch "${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch )
 
 S="${WORKDIR}/ffDiaporama"
 
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
new file mode 100644
index 000000000000..1d9d671b5400
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 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 qt5 texturemate"
+
+RDEPEND="
+	media-gfx/exiv2
+	media-libs/taglib
+	openclipart? ( media-gfx/openclipart[svg,-gzip] )
+	qt5? (
+		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
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qthelp:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtsvg:4
+	)
+	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 "${FILESDIR}"/${PN}-${MY_PV}-qt4multimedia.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() {
+	use qt5 && eqmake5 QMAKE_CFLAGS_ISYSTEM=
+	! use qt5 && eqmake4 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/files/ffdiaporama-2.2-qt4multimedia.patch b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
new file mode 100644
index 000000000000..6dd0367337e2
--- /dev/null
+++ b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
@@ -0,0 +1,25 @@
+--- ffDiaporama.ori/src/ffDiaporama/ffDiaporama.pro	2014-05-04 10:33:56.000000000 +0200
++++ ffDiaporama/src/ffDiaporama/ffDiaporama.pro	2016-12-06 00:03:27.392114339 +0100
+@@ -26,19 +26,13 @@
+ 
+ greaterThan(QT_MAJOR_VERSION,4) {
+     # QT5 version
+-    QT += widgets concurrent help multimedia
++    QT += widgets concurrent help
+ } else {
+     # QT4 version
+-    CONFIG += help mobility
+-    MOBILITY = multimedia
+-
+-    unix {
+-        INCLUDEPATH += /usr/include/QtMultimediaKit
+-        INCLUDEPATH += /usr/include/QtMobility
+-    }
++    CONFIG += help multimedia
+ }
+ 
+-QT          += core gui xml network svg sql
++QT          += core gui xml multimedia network svg sql
+ QMAKE_STRIP  = echo
+ APPFOLDER    = ffDiaporama
+ TARGET       = ffDiaporama