Version bump

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x7887F787

3 files changed, 149 insertions, 5 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index c3288d7f7b22..204247b3dcff 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.139 2013/02/11 23:23:32 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.140 2013/03/29 16:26:40 dilfridge Exp $
+
+*kipi-plugins-3.1.0 (29 Mar 2013)
+
+  29 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kipi-plugins-3.1.0.ebuild:
+  Version bump
 
   11 Feb 2013; Chris Reffett <creffett@gentoo.org> kipi-plugins-3.0.0.ebuild:
   Add USE upnp, which handles the (new?) dependency on herqq.
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 97438186c4e7..405e9ca76f83 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -5,14 +5,26 @@ AUX kipi-plugins-2.6.0_beta3-options.patch 1091 SHA256 2550af0eb24416a145fbfa5de
 AUX kipi-plugins-3.0.0-options.patch 1069 SHA256 064e9b865c21491eec7947cf0e12160866983f982243a4cc715efbf9116b172e SHA512 d58edfe3955e480e34c3ee64313c5ada15a664df7dc2369791f1bd5d7e05bc5f1666681d5b008a580de6cb00ff6c87d13dd1845ed0d7ad70a76e9888edce96cd WHIRLPOOL e59b098d5f8fcb2b487ae1dda07ed0cbc9cfa81095655eb120e985defa2aadb7e2bca6db015f1f1c6ef1645e2c8b1f329cb595c588ffc3f09c977b2cd69d856e
 DIST digikam-2.9.0.tar.bz2 56765772 SHA256 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0 SHA512 ef6b94f3752bd91f3b6da14f509379e3fe7bef166bc617642c531fb0a88b94876f7c59deede3957093070396c4fa9b8c6635ce9a71b7230a2809426a82e721ec WHIRLPOOL 1e5a0d61de5448f11e928f7420eba3a1c548f7a6e65dadc4728ccf304194c9653b97a78da0752d4e92be450759a5fa9fa00c66230d32aa43e581686706023e53
 DIST digikam-3.0.0.tar.bz2 58701849 SHA256 052afa32d36a075afae6d789817c073a2aa6c4037f31c603da4999a4c6579574 SHA512 f544ab2eccacf0864d0f6ad98276228f12a500896867e48048679951fbb05071269e6ff9d660df3fb1ff6dda17d93d1134d79deae38985c756e27c7a77cf6801 WHIRLPOOL 8216c4e40baf3e8996b1cdf6d014e8c9e719d1bb56656a16065d802f6863b1b26071db80232b25904d1cbb721da234b5f0e651745fbe546cf4eb9587f510f8c1
+DIST digikam-3.1.0.tar.bz2 58559707 SHA256 f70fc84f3a680a855642fcc4664710116406bbe4068b0ad4d2cfb4127684c2aa SHA512 dd81049b159f36f80dbd779d2ab4ff11a7b8ec523fe8775af4fd3cd4894ca1eda0608f8838cfb756d96150b7437c0f0f10618303d3f8b4453db92a2590459c8d WHIRLPOOL 741ae9c67e16073dfefe5c1b0d1713ecce0fd9cd6af3bbd298bccf0709bac484ef0c518ab9effe67e2dd79cf1fffc12df962798b91ecd776b7c059e87854a781
 EBUILD kipi-plugins-2.9.0.ebuild 3395 SHA256 cef442b63b4e32a745813a41117aec65db41d83e2f7dc69c83060169847bccd3 SHA512 26af530abd07fb044a397aa653450f28cd0dea73eb10e3941ab76f3b78d909b42ec17a5e37f01e56264078067ee84aae7d2f93273a85c0606a267a9419ffb794 WHIRLPOOL 5f3f502854a558d43a705c40029485c6fa87439d5f0641fd10b1261ee83dbe29e1e9fe278feebe4cc4e20fb3d165ecc860705e2f841f2ad39f09d5e2da8fb731
 EBUILD kipi-plugins-3.0.0.ebuild 3435 SHA256 07c2acbc30553a2245b4ec809517daf11a84045bb01d2be9fa6b6483adab02e8 SHA512 044799522d04d64fe54cc99135a9f6cccc7552b665bc85dcc5c899f1aad95e488c3bf1f8a2267a9d67b0d26a31f719b7e4a00dfcd157cf3a341f20754d050b2a WHIRLPOOL 77ac92a8d0a7e4c8539be78443e8e93166fd9ac1d1dbf4b52040d20a8b099cd919c2e09999d7b43879c92783ba51841171456c70e089624108535df7e6d3c05a
-MISC ChangeLog 23341 SHA256 79b794ae607c7144ebe8177ecfc04cdd104370ff08cd1a8f841e18afb3c95382 SHA512 78db9d7937e633f0b297431773cc40b6a3007a17f475f3849c8703a7111fc916c1e42f8bf131c434873ce76085cac689d3248d52d452bdafde16097f6cd75bbd WHIRLPOOL 449d1468257faf2629e8c546b72ae208d0176a1766252fd75cf06352b3aebd97e76ea7b1f7d88c9affe4db70936b83c60945ffa5db0e6c0aa0c5bd0caaffa5e8
+EBUILD kipi-plugins-3.1.0.ebuild 3436 SHA256 337c5e17b08841f03f9cf6a5b39a137ea535c518922ae8f282caf6bfa84a18f7 SHA512 717976f2ac892f734ba2b2958c45d18d7ee308b69e26d394a65ab64de3fa11a2b64b7f1525b66a9d5a2d590f060b689ed4442db0109abebd8e8c618fd710f554 WHIRLPOOL e32175a51d9b473ba7e4e8ad78b48399e581a29f47269231cac356d69f99d4365ef9da5ada8e4750d0fb26cf4edb9fa9d2ce896a394e7d15f0869548267c4ae8
+MISC ChangeLog 23480 SHA256 48bf3a47d24760c5f86179236077d48c749c22fb11c3776d88978f5bd42966e7 SHA512 945d6b6c98d85109161e5b0be379624f1ce7efa0966b22978239543543a6a889a6eba74a010b9e9fa974c42cc01d2945cf8e5d1dc181725bb4954f2c4bde67ec WHIRLPOOL f62aee9a15c9c70c6e3909e35465f2e8f6ce4fdb7375c716a5d81be1fd29b38c6841a15e9a0a57d51a66be35d42b9c46b15bb186a9f278478e538a36d4a438ce
 MISC metadata.xml 961 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 SHA512 7e1a93a9317e3a46cf7780bfea20439956419cbbacf241604ca15c573aa57774b4a6959fd6dec2c605f5973b57e03162e7ca9e25e6ee711520df9a423ad0c160 WHIRLPOOL bd78564f762bdab04b3466a86579d8d4c065e1b8eb28399b2bb2b8d59bb518b1d7e4916f2238376cc14eb0b064b7cdcba53ee77a211fc746ae1e0bb8ebf7ea98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEZfXoACgkQ23laikJhg1TkXQCcCOAoptTqD9+y9R0IQPgG4J1H
-5N0An3kUqB7npVu0N6Ons/Tgo7rY0yor
-=C+Mv
+iQIcBAEBCAAGBQJRVcFeAAoJEEb+UGWnxTyHAikQAIFbaM96ui1F9PLcgS467WfB
+Jt7cNNlMEsOv3TX5YJ1LBtjfBJTYK5fPXA9XP8X59A9+IZRWlh5iPTlSU5mPGGEF
+cMgB2cfYqkmoFO+cVkV0Md8oC+MJ1NUIoW6723UUtFKwb2kZA4Y7ovqahHL0oLam
+bl2PrFanH6St+O6E7pL6fhYRZZye8645k3MiVxow/eZvnX53qOAn5gG/xMjqC9qB
+xc+UkICYTik82MtNVul25MMICKckG0jYMW5Cai5UAarmhe0xzYa4UjFGjPZ+eJW+
+9fXJLsqmdBhjHeurtbOdjt4KD/9Xe4nCJjJIS0gdLS8PEVkBdUWM1az4htHO3cSa
+ZL9ZZmHNxIECipfsR8s+aj0c7idPf0DSGzIYuPKdWt3hUKUBEkymQI4S0/8oWJuU
+9JlWrGUGgNMe1JtJqfxtS9UiUVGXTQ73xgW6aAHfqWbjbXx5Ldqm6vVHT/MVcmtA
+6VaT30RcYRcHlu9I8F6dJnLHotbvbuh/PubQi8FlpqKSOWg1ODHAPFkrnUG/mKKi
+RSbEDmv4kFfqjQxoEZvW5n+dJXeehFwxLtrMA+3cvkXFCQEAFGqjZ4+dMmrAfxpG
+rb3yw4Cx2kjY6Euzu0cOf3o76HHKTFdWbfTknrOtPI2B1bcXVuj4DbguIh+dQMqJ
+53FVOnneICttuAFE3C3W
+=hwIA
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild
new file mode 100644
index 000000000000..07d363c2f325
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.1.0.ebuild,v 1.1 2013/03/29 16:26:40 dilfridge Exp $
+
+EAPI=5
+
+OPENGL_REQUIRED="optional"
+
+KDE_MINIMAL="4.10"
+
+KDE_LINGUAS="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 ss sv ta te tg th tr tt uk uz ven vi wa xh
+zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+
+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 mjpeg panorama redeyes scanner upnp vkontakte"
+
+DEPEND="
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	dev-libs/expat
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	gpssync?	( media-libs/libkgeomap )
+	media-libs/libpng
+	media-libs/tiff
+	virtual/jpeg
+	calendar?	( $(add_kdebase_dep kdepimlibs) )
+	crypt?		( app-crypt/qca:2 )
+	ipod?		(
+			  media-libs/libgpod
+			  x11-libs/gtk+:2
+			)
+	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
+	panorama?	(
+			  sys-devel/bison
+			  sys-devel/flex
+			)
+	redeyes?	( media-libs/opencv )
+	scanner? 	(
+			  $(add_kdebase_dep libksane)
+			  media-gfx/sane-backends
+			)
+	upnp? ( media-libs/herqq )
+	vkontakte?	( net-libs/libkvkontakte )
+"
+RDEPEND="${DEPEND}
+	cdr? 		( app-cdr/k3b )
+	expoblending? 	( media-gfx/hugin )
+	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	mjpeg? 		( media-video/mjpegtools )
+	panorama?	(
+			  media-gfx/enblend
+			  >=media-gfx/hugin-2011.0.0
+			)
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+RESTRICT=test
+# bug 420203
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-options.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
+
+	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_with 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_enable expoblending)
+		$(cmake-utils_use_enable panorama)
+	)
+
+	kde4-base_src_configure
+}