Version bump by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDF4F788

3 files changed, 170 insertions, 17 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index f893f9dc9e01..2757b8364a1a 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.181 2015/06/04 19:07:45 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.182 2015/08/08 08:40:43 johu Exp $
+
+*kipi-plugins-4.12.0 (08 Aug 2015)
+
+  08 Aug 2015; Johannes Huber <johu@gentoo.org> +kipi-plugins-4.12.0.ebuild:
+  Version bump by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
   kipi-plugins-4.10.0.ebuild, kipi-plugins-4.4.0.ebuild,
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 47038206bdec..21aa4c2b85ee 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -6,28 +6,31 @@ AUX kipi-plugins-3.4.0-staticar.patch 877 SHA256 43e67c5da27331664c3ab3b97d8a481
 AUX kipi-plugins-4.10.0-jpeg.patch 3549 SHA256 5d0ddb4912f5196e506f794f2f61a606a4543bb804dc66e607910a4f8731b492 SHA512 52aa4e90135fa1e22d0b91ef18688f5451a350404145d3cf88134be2d2c92183994dc26e631c775fcf6e3bec12d209dad8c03c4375811178c64ad86cd4272dc7 WHIRLPOOL 149e949b111ed4daf1d1f1910fb964932e91fe7e1b69f4eba9f32e100ebc2802e6bab25fa44f84bb1506e8d387ffc30ae7e0c74ce5c20f7616e6b8237409b090
 AUX kipi-plugins-4.6.0-options.patch 879 SHA256 ee42da1469c0aae8eb8ddfc9a80db44db9ff99fb467eec1c7fe1aaadb627213d SHA512 95a34cb4077390ac8b827e870fb501b87e27a9e624bd19f30cfee774282b4abe6e7da7d5f7d57ebfc962ea6b88c92ff793e0867ce97c474b34beec347370fddc WHIRLPOOL 0bfb2a446130a50de78507d371436f54a2293fa189072bc157631e70428c6bfea815a3aa38efaf40e38fa65856a8db1292072e9e99ecf2fc6ed94ac0029fa7d1
 DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
+DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
 EBUILD kipi-plugins-4.10.0.ebuild 4062 SHA256 8d243667ff00c5f50b4b7958581b4f4d12d0097391393e3c0c575858a8dd5eb9 SHA512 e041b52abb6f8acb485cc82b7205f11e87c0572bdb7c79cc0ec7dd65350b5cbd49fde7a69aef0a6367a964dfe663c1ebbfb49d332c24d66f310d68d914e1c006 WHIRLPOOL 7aba55dd681e4e8d3be659825f11b4681a25d5e9d6b8d306dfc74c7771e94158e27c347b86632a401eb6abeec1e6daffc21df1789cd0c74efc154622e7ee3064
+EBUILD kipi-plugins-4.12.0.ebuild 4051 SHA256 9cda1779b91d681aa46281f561f534154a6353970a85b35c2c2d82583ccc868f SHA512 d1956e397742e905c14f84e52a081a3ba316a935944c63627466f7a6f56679a6e26b7dc7a654481f7fbe89f2fd373f5c196c778c1bef7929893cffbe42119523 WHIRLPOOL 640fa125d1db17df81efda174eb9875f913ac8b537d5be285d88ee814a5d0b0ff3fed40ad6f3b63459ca17bdb66f97ce84d0125de565937040a3ec0cea2bafe3
 EBUILD kipi-plugins-4.4.0.ebuild 3677 SHA256 c2580bebf3cc164919c5f695c371fd94b9e231b39817a2817e744d91d5912cb4 SHA512 70323c9ad3be8f8bd3b4e23e1343ddb258aa22bbcf8c0a56c81d270fdf1f52e133cd2ec988411ca43eda17d77dc76570a2ae454e94c9381401412763cdb21ccd WHIRLPOOL a0077a44ee739028ec8bdd8a0596f63413bee018b601f2d907757b952233c10048d1b225d23b6df24dd5822014dfe399b19411b92926f16ebd0f83a3c4bedfa2
 EBUILD kipi-plugins-4.7.0.ebuild 4020 SHA256 85aac631fb836cbc62a82e607c8f53a83ed7e2b40c6a830cb990b1c82ab21c92 SHA512 44da049b64ab3cdf2ee942ade266e2157d3615b6da52fead6ff71454e136550a6034183e0e6518a5d861d58a51141f1f630a1a3582319b8a47e5b7f4c88434c1 WHIRLPOOL 1dfc2f723ef2228b03ac7995872b45480da32ad7edb39bc266cffa22c366b80cb7dd9d59830123f22d245f6e90052b5ac5a7319fc2494a9268896f7e359d66d2
-MISC ChangeLog 29680 SHA256 a906818c74d987e347de925229f65ebf7f2884b32c641ac4a19511d811229c3c SHA512 5b2c29ddf9de9cc1d33bdda9895dece8524af617acac97be4e82bca2e41b4cac46121723116cb79e31e70e0cba2b4d8b300bf89c2c603652dadd85e42d63624f WHIRLPOOL 755ccf1edeaf3ae35be72330889f7f1d53b68b08f7a22c865ef0bd3748ad5d81bf74cab82d232f488305911cc22185865eb0de571c714ae3d238bfc174a9f0fa
+MISC ChangeLog 29861 SHA256 15d20f56e757af4d0419bfb09ba09075b88e5d2c7244dcff5400ea6cd61ea70e SHA512 873b50f90c7989dfef9c1b80530c62c1a791cb0e27dbbec18a690630da39166ed310cc9bff64f54ffbc6fe39067161f24f6e60d526aef0e8399b1c318fc9a396 WHIRLPOOL dd993bd52ae244f5986ed56a475182e3e023a37979c221708ac5238747172821d1065db6e9d0d86e77aacc1d588ab25c232b588e3724d88d24637d12ff01a60f
 MISC metadata.xml 978 SHA256 f1df3fb3204ef561b5d97017015dcc5e88f232518a16029c515345a8268cb8ed SHA512 e217ecdaea2dc2b89cc4c221277c01c053bb04302041da05b98392b82c84461f06b0f71242dccd0ae0d30ddc4875ef1965aa25405b957c06a2003e18857127b3 WHIRLPOOL 387912c880772d1b36a707540420b1a69023769722ceca63e4a14bc3ceb53589c9e050f26a76f9b51547ed9bb372d8f96926afe2f8b1632c3cd630deed966cf2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJiBAEBCABMBQJVcKIBRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7N8JD/93HofbAIS2uvsppNdzPaMKgc/yIavgZnBRWYFzYOfJ6kN4AFYUTVus1Ott
-or60NIrDt3BVzKadKIDMpjG5C7PKmEFYqhTnIZaVpB94EKmV5jCHT3iljovC0J7S
-bf5NT2ihpEKHAS27M7yh68hldjxY60Rnt2Gxfn7hRTtiACy4NX8zE6cCv/eHchgf
-sHe32sVhiPnsrCkWy4R1TYHBhdOm8k/IeYdXAJLkFh8ATxsZJqyaxfkGoY9NgVWE
-7sRi1fTbSsa4K5xUIgtiTYu9rSOGD7DnEtxFv4vy3R0/QukN0SYDasHZy/NBoUNL
-YTfNOA5H4cZszzCmDx7l1GLLPLcWNh93PzKwiEQrBI88WDihrPvg5qTD1eAZaexS
-n+mIhdW33ay1k6ert82MBQIn2yTAYMBlnqF5Llzji+/dBfwxRt1iOQy1knIv0QqV
-HDbia5MGAsIRrd6wjl1/F61QyRaMAFyvDsLJQbd/xKPV3thN0cqAMmRQrhVTaG5c
-jQhKOBrlJjhsN3poIIk6WQ8amFFbUuOI8oIoHn6ZK6ell2I1zqCCD95QEYtShxyF
-LHrukRHqZcdOgLzYumipSJeCHtuib+W0itmACqYWkaCHTBx9UMXMnJLhmxAvc8j3
-07fyZtHRex2tLoYcnltErwhIJjA2HOALR3fpspA6Pkw4vDgqJw==
-=nfis
+iQJ8BAEBCABmBQJVxcEWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vDG8QAM8mBaq2/UPGGm2fxsK9Cos7
+zxtA2wUbF4VhSb8+3M2GcOylTaeu1qCAserV7t3OC1vo4drIdhGxuglKUr4eYK73
+gPHMDTvy3YT5vB1nmQEET3n7OmY2cTss7PvIaCIxFGe/Jimsp0PcW14Zdqv9O56S
+8ycBLyDrAJUkc9fmU4qqd4VGCp36JkYoFazxrpgGYQYifan2EM7W3WNYOVvUcIPy
+HrTCS/0MPRuWgt4SIo35FCLa1f0Lw1hHh/kSatJhdGLG5wlRGemIEA6sYnDNS1at
+2QtPz+0Hk5antYVFT6bxGOdKYORCLocOvaMe4Nhu08FbRqNzxV5dA47P7m02WoM3
+mJo1R9QNo4xMBOm9xeZhvDW8XTyH0ughb7eGaqv9R+UUkWX44v4Gi50cBAqqpKuG
+OnYByffYH09D7lgxL6DfD77Qwcf3E2ZFDdy7+hqP9Yh89tSWuQbwI0Sg2ZZ9+ahv
+7qv3RPbuaXL/mSi9WDWVpbQQkSVhCb1bLpPWsNd5vvMCTY6pcoQ+nkTfwWye1nM2
+hQa9dithbF8XSYmknu5YoqkqmjkJFfJFoDNH/ea2KUpJ/Bz1F9OUvuDa1VwMKyvz
+FIlxyjC8OWBPoc+tCIz0Te/QDcoDQ1Sf7ptXawcWfHmWH6485/iUMJ2HY78xeQUA
+QclE9AVk/aporqmdZhF1
+=O2Ry
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
new file mode 100644
index 000000000000..38135eff4def
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild,v 1.1 2015/08/08 08:40:43 johu Exp $
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
+#
+
+EAPI=5
+
+OPENGL_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
+fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
+mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr
+sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW
+zu"
+inherit flag-o-matic kde4-base
+
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
+
+COMMONDEPEND="
+	kde-apps/libkipi:4
+	kde-apps/libkdcraw:4=
+	kde-apps/libkexiv2:4=
+	dev-libs/expat
+	dev-libs/kqoauth
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	dev-qt/qtxmlpatterns:4
+	gpssync? ( || ( >=kde-apps/libkgeomap-14.12.0:4 >=media-libs/libkgeomap-4.12.0 ) )
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg:0
+	calendar? ( $(add_kdebase_dep kdepimlibs) )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
+	ipod? (
+		media-libs/libgpod
+		x11-libs/gtk+:2
+	)
+	mediawiki? ( >=net-libs/libmediawiki-3.0.0:4 )
+	opengl? (
+		media-libs/phonon[qt4]
+		x11-libs/libXrandr
+	)
+	redeyes? ( >=media-libs/opencv-2.4.9 )
+	scanner? (
+		$(add_kdeapps_dep libksane)
+		media-gfx/sane-backends
+	)
+	upnp? ( media-libs/herqq )
+	videoslideshow?	(
+		>=media-libs/qt-gstreamer-0.9.0[qt4(+)]
+		|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	)
+	vkontakte? ( >=net-libs/libkvkontakte-4.12.0:4 )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	cdr? ( app-cdr/k3b )
+	expoblending? ( media-gfx/hugin )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	panorama? (
+		media-gfx/enblend
+		>=media-gfx/hugin-2011.0.0
+	)
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+RESTRICT=test
+# bug 420203
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.0-options.patch"
+	"${FILESDIR}/${PN}-4.10.0-jpeg.patch"
+)
+
+src_prepare() {
+	# prepare the handbook
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
+	if use handbook; then
+		echo "add_subdirectory( doc )" >> CMakeLists.txt
+	fi
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt
+
+	if ! use redeyes ; then
+		sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Remove flags -floop-block -floop-interchange
+	# -floop-strip-mine due to bug #305443.
+	filter-flags -floop-block
+	filter-flags -floop-interchange
+	filter-flags -floop-strip-mine
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with ipod GLIB2)
+		$(cmake-utils_use_with ipod GObject)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with ipod Gpod)
+		$(cmake-utils_use_with calendar KdepimLibs)
+		$(cmake-utils_use_with gpssync KGeoMap)
+		$(cmake-utils_use_with mediawiki Mediawiki)
+		$(cmake-utils_use_find_package redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner KSane)
+		$(cmake-utils_use_with upnp Hupnp)
+		$(cmake-utils_use_with vkontakte LibKVkontakte)
+		$(cmake-utils_use_with videoslideshow QtGStreamer)
+		$(cmake-utils_use_enable expoblending)
+		$(cmake-utils_use_enable panorama)
+	)
+
+	kde4-base_src_configure
+}