Merge updates from master

7 files changed, 68 insertions, 1 deletions

diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 5b5ec5abbd50..1fb918e66c87 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,3 +1,4 @@
+DIST ffmpegthumbs-15.08.3.tar.xz 20336 SHA256 b3ce3e592e542b2c5725b56eff0336d92a2bf053c81c6d8b90b8689f23744b97 SHA512 176c4e48eb2d0ef6546ae5f194dcef5037056a2cfd8f339d18b1e3ddc7dabebf8a8c81561468398cc7063780d2a0a32d6d724218994b06276580d94edfb46cd2 WHIRLPOOL 08b2fa1c30eea9053aa06d88235b9fe692853d68f7db165795418c24f9764434f0871170bf103645133fbc9ffd28788c6fbc6d0c09c6c4710ccb6557f7062c2a
 DIST ffmpegthumbs-15.12.3.tar.xz 20460 SHA256 29049266330bbbeb0db2d17593106c4c59a003202826cd45c14eb90afbf87df2 SHA512 ba17d0b95b3879c302deef2e33d28228d4a0f5a0ecd4a87bcead746ebfcd4ef15210d757b472ccfc7a40b802878559d6ff4f27559e2116c8d81636b4a2993980 WHIRLPOOL 8dd2e037ad4a9a5398b79155eecceb91a44f96a1112a8cf348e6616e25b8a5aeb605aa9c8c397432a33b0f36652a455a171915313ff7082e527952ba999d1d8f
 DIST ffmpegthumbs-16.04.1.tar.xz 20440 SHA256 1c2a056d867c3d8262d5ede78a967c26fd0e4261ac0dbaa2c665fd57675f2499 SHA512 a42646e8e6678fd197b8fa1ba2bd0110e59ef99bb458e979587b04f44206c5b65b793ead27f2c5f5fe8eef433a47f069dfa18dba5e7964eafda5dbb7f231f653 WHIRLPOOL b3b7409b9f851f7a6a1a977fc17c9889a03c732658a89a2d3fea419866ec2abc2bef7a26e80e6ee51ad906fec8cdbf6e8a133bfb2790d3965099618f3456c734
 DIST ffmpegthumbs-4.14.3.tar.xz 20228 SHA256 79f0856b370787ec598a161174e659d7c59bfc53e10601209a181168b50052f1 SHA512 d127bfbbb6ac507e0fa7378894ace878bb74c0642c2858520c27f22757764973f6c22450f593879b34c93fe2297a830eb569ec1edeaf232394367ca6d729be93 WHIRLPOOL 3b5e27467854c6d303bfbcdd2acc6cbbb8d693df7315afc986cdd37ade9a747127aaf10c54c75a9057d7765724da83c9250ec198e7f78da244369f4e42ebe49d
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild
new file mode 100644
index 000000000000..035551534866
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	virtual/ffmpeg
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdebase-kioslaves)
+"
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 780fdd9d65e9..27bb73e639cb 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,3 +1,4 @@
+DIST kamera-15.08.3.tar.xz 35460 SHA256 1fa27239a84ce6a224afd4f327813625a3f05717b852503fc55914a557e79eca SHA512 c68486a46555f29ddae89529c30f387676c13f48aa9b2064582d4e6319eaec1c7b48e13218777711faddf20e7d45e89ec582d044ef9e4117b8e449a0e5a22488 WHIRLPOOL d51d5f8877c446610e84d7f5b6ae477f6cc800ccdb2b256d463e8ddf7abd64a1ed3b4fa1861090fd38772086842057ce25451600a654543ef42056e4b2914857
 DIST kamera-15.12.3.tar.xz 37488 SHA256 c69861a887107c885bc2979deec1054454d96bd036057ef0944ed50764dbffab SHA512 07a9fb02b3f13fa473ba6bb592b7ee58d66025810c31f29f024205fd4f8dfda8e9f9384efbce944e0e40d4d557211479aae6a5563ebace3d1143d038ee705353 WHIRLPOOL b8cc41ac6c786ffdd9678ccdd6053e1dd4950b0c97797473ed8b2c60c31d276e80ccf2843eaf87fbf14ea87a7162ca385f31e79727cc2c2fcb96705d9b93d377
 DIST kamera-16.04.1.tar.xz 37492 SHA256 7ab8cb32762d0434a32748f34f1630848ad40eca299db6d9c76b5fa3ecbfcee8 SHA512 de32eca6ad079272e4ef338a56553c01437ba23e98b2e546f42ba2b980a6de709f0ec20bb175193c2b9e130e568fcefb119d2847327916aa6a20c9b0ed8d25b2 WHIRLPOOL 2d102be8764746177bb778062fbc3e05815ed612608a9c08fd20ad32f624c58bb751a3e2baee6136d4866c1a24146c7308e185aa224e044a565982857dcb4f3a
 DIST kamera-4.14.3.tar.xz 35324 SHA256 6f0beae8b6e55aa6313d34d7478a6a7b80a0a4c1e2c874b5ebddd00d430bc126 SHA512 fbdbc8236bb870ca02bc34a4b2b787380e5ec50658b2e6d157725e1cf5e202366fc4d0e6146098b59af9cb82a82a04f62e2d7c8262972a1da468f89e5bd48129 WHIRLPOOL 48d83b8120d31f76f21ecfdb4c9f94b941ec9a0f0371ead4dba714e64c12e3f971a4fa04805f7a7f98ad8f5ba0b32ee791547e063ecd321cd97bce674a73296e
diff --git a/kde-apps/kamera/kamera-15.08.3.ebuild b/kde-apps/kamera/kamera-15.08.3.ebuild
new file mode 100644
index 000000000000..bbd40755eb1b
--- /dev/null
+++ b/kde-apps/kamera/kamera-15.08.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera manager"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libgphoto2:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 1b80c2f5e446..422cf71f8b53 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,3 +1,4 @@
+DIST kdegraphics-thumbnailers-15.08.3.tar.xz 41512 SHA256 675b86578e09bd6a5fcd8ff8887114ce284302e351be71784987d01f261bdab9 SHA512 843171ebdd863c441969e5bef93db6a505a885cdc415512d6475e138912cd57578608ad4f846fe862c543f21db5abfb9580ed8af340a492a532cbc2529e77de0 WHIRLPOOL 924433dcbaeec78821d4b25574b94913e13b865a56f0f962a0b2d6a0117f557738981aa0f3b3e6a8a366f1cbcc3b9a1cc0b6575af6f16f711d30610961146745
 DIST kdegraphics-thumbnailers-15.12.3.tar.xz 41652 SHA256 e03c5ce84260d5b4384d34971a9674cd7b0714ff236b3f2483c8a2d6ae9c35d2 SHA512 f2c42ca2884fa9a919e48ec45fada3e3944a452a1d55c92c520e14492832064e82c15835100e183f1628a02d8a04f951516b6ea05c0ceff7efa2c5397c675061 WHIRLPOOL 02f75730f2f722bc9bda9df5cf0f5ebf8f88422cf2478678bd946a664b428ead5873340fc92d42ccaa4c77dc28aba185d2612fc759da5eb3b1f1b78232345a6c
 DIST kdegraphics-thumbnailers-16.04.1.tar.xz 41676 SHA256 eace13ffa3c21e23bc3c5641a1c9769219f6d97298c74cf642f8b284df0412bb SHA512 a0b29eff38298023c1ab64274ec8dadcbe2256000018148b75088eaf2885892e02a3e3ec17c398f16d02bf2a6cc1373d87c58dabe57028cdcebb3a6d0735cd40 WHIRLPOOL 186356f5d1c7122c544e9d2c9ddcd310198c00fff10c4052a9c944e37791e0d316b35b34ee37faa5ba1b92ba9498bed15a72d0a8f9c2499d243cb7225fec982e
 DIST kdegraphics-thumbnailers-4.14.3.tar.xz 41256 SHA256 132dba8921444479155e263e60995e939a3b7ec35b6950663b7f5594443d0bd2 SHA512 19f8e8fc6e9388e419593a395c57349474bbb2567db33b73ff1c16c9d3e668b82e6121bee0e62f76464ac1431eee4836142717800ec8c49a5813d6eb38e535b9 WHIRLPOOL 2bf4e916fbea8e5df7555d675eaa42680ff06df32e63658f56636dcebd3222435b2c872a769ec1f7d1a9a9ddc23ea881938711df2d8102ba8bd6a189635b8e38
diff --git a/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild
new file mode 100644
index 000000000000..4181b3eb407a
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdegraphics-thumbnailers"
+inherit kde4-base
+
+DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdebase-kioslaves)
+"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
diff --git a/profiles/package.mask b/profiles/package.mask
index b925483441fa..6321b363ba76 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -31,6 +31,12 @@
 #--- END OF EXAMPLES ---
 
 # Michał Górny <mgorny@gentoo.org> (26 Jun 2016)
+# Used to convert ancient layman files, has some ancient hardcoded data.
+# Not really useful anymore, masked for being live since 2009.
+# Removal in 14 days, #587156.
+app-portage/layman-dbtools
+
+# Michał Górny <mgorny@gentoo.org> (26 Jun 2016)
 # Unmaintained, unused, upstream gone. The only revdep (crow-designer)
 # is already last rited for removal, #587142.
 dev-libs/guiloader
@@ -858,7 +864,6 @@ kde-misc/kgtk
 # per QA team policy, all these need to be kept masked by default, if
 # available in the tree.
 =app-misc/sleepyhead-9999
-app-portage/layman-dbtools
 =www-plugins/google-talkplugin-9999
 
 # Tiziano Müller <dev-zero@gentoo.org> (08 Apr 2009)