Version bump

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

3 files changed, 137 insertions, 15 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 7725ae04b708..3c45dde8e746 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.101 2011/09/09 19:51:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.102 2011/10/03 19:40:58 dilfridge Exp $
+
+*kipi-plugins-2.2.0 (03 Oct 2011)
+
+  03 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kipi-plugins-2.2.0.ebuild:
+  Version bump
 
 *kipi-plugins-2.1.0 (09 Sep 2011)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index f45c51c397f9..e14d2583ffe4 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -6,27 +6,29 @@ AUX kipi-plugins-1.9.0-tests.patch 1153 RMD160 40fdf55531219fbeebf7ed8ac60981e05
 AUX kipi-plugins-2.0.0-tests.patch 933 RMD160 bcd1974a98a0471f381cde6ea91b2e980df63b74 SHA1 a77124e7c2b66616546b218ae9bc5e0bc0644ee0 SHA256 b8640df52463422dd53f0a4ac411eac67f15e8652157f820171ae85acd3ccb9f
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
 DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
+DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be
 EBUILD kipi-plugins-2.0.0.ebuild 2992 RMD160 2644a07d862e2588e9c928533e3e7723e6e7c4c8 SHA1 70dc979aaad53e95d4ce8fbee0d551b7a748125b SHA256 50eeb605f896a92ee2767080633d75ee8d2ab73f0b294389a40bba91d18f851d
 EBUILD kipi-plugins-2.1.0.ebuild 3277 RMD160 4faa70e12bd4b809c9670373404ebbc28de7e7a5 SHA1 ba4ecc4cd11bc72496de0a5a4dd8055bee717391 SHA256 ad736449139ee22dfe7ddcd544376872e0468d7b31d55dbb75b24ffb6e0a0887
-MISC ChangeLog 17198 RMD160 be0a58545da5c6b4c965f794ed104bfc44763731 SHA1 20bef2ce52db2662f9da72bbaf1ca674e0b80b3f SHA256 9361e852d186c0f4e57fd7eb2382e1151619a2e19cac1b36138bf71fd226574c
+EBUILD kipi-plugins-2.2.0.ebuild 3277 RMD160 c93520ab0ecb1d52c2e323c4dc951164e9c35cdc SHA1 0327594edda47570fe5a11b1ca151295d5a8e430 SHA256 2d31ae171018a57b2ea8b5433f8af43c6add7d7d1138e8273f282e181f6e8cdc
+MISC ChangeLog 17336 RMD160 b8ead5622f0a4697ccbf6bb63c82b75ac5e02840 SHA1 72ffdc725fdd7bca2adc7f5ec4cea1b89dbf005d SHA256 6ad4f0f0860134540f286bf6423b11b8db52fff4fb55733a40b3f714163317b7
 MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SHA1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOam5zAAoJENwGBM22xffeVk0QAIV+21aJKBTz9nvEs6D04ZMB
-tIj3PA3W9KItvvC7XEZAlI8KYiTipPnVJtT6w7EnLb7CYmk04R+CiNGa/oGmredx
-Cxu/HqbVqV+zTo1oqy75VtJOjw25QonuKOrxUhUHk1GChm5CjUtmPhNjA7BSVWJ4
-T3PZSu0rNbJBG4nNcJMz2cuP7TkpvXQQXfhQQu1hM4xg9uQKJOe7X91j9/1AsVHK
-GhFVbjzOlmccbn1JZJKdh0a3jxH9S9i35d6h4lZO4LQzt3LAOBKn5Kh5ohWWQwZr
-Am34egSjp99etSPWvvEquI43PiZ0WRLSD0iKIw+YLjmhtdk3opMm9QMTdwgknvaB
-s1IejnLOoiPhnpNPFP4UJpJZ1CbpOfMtS/mEwPg3RQH8izC9IfBWj1Jw8aAMAaPa
-PlbUYDB/OGjxb5w/wQeNRi5+/ZwwoWkbNtNrMoF5q0rvskiukq3SRq6rxmFJTwmr
-ns7HlIlJcQVw7r9shbrGx4/eh533RC2CCzlss9rwMAzgVGvNKIfZeWpMCe01Chse
-rHKMw6cWjpXsUIpaz2t637omA9a7mKIaaH6n9kSkNawO1+QadqZp3iVe2ATzMUvF
-NQRl0G+6PpfQaZtigzDnstj+k2+PNl+At+uXMVDqp52Gzn262or30Sipilv8u19+
-dQXHRnMDu8FyEekymImq
-=SVQL
+iQIcBAEBCgAGBQJOig/VAAoJENwGBM22xffeQjcQAJ8hNKsjEEsQ8Nfhr0dfxeyN
+sehxZCfx5p9fJC0vAkTKKQDYo4lRHaqLOAt8yZ0yHI1Y/OiOP7w3eSFOyZ7iwoDe
+2uxPux7PWgg915Khx+X4NOER4gjbdsZuMdWZKZ8WaS/TxODgEYPBhs408K/tnZ7V
+7dWa2G/7i+/GmiIU41jsP3IRDj3LK21URZguhEDHXY4P2cbtAytu+NeK1jg5IIKf
+j7jyCnzqXgcw1YIzXviZKtjdiOOysRebPxM4Z7GKmfH4BLI51vmH0nWy0JtVRlyG
+4luHQWNgrzp77QrFl7uw22gejPFfYkBoAxpw/dAcbkqB8v6AKJUJkplVt70mvcM7
+ZSPjA5T5NTxhkxZfCxNqSwTz8fnSiaYpMXE8cg8lUA/V7Sv2mfOdFdCnzWB83ss2
+kiEK3+qrC29vA1JZBt6AdImKPL7pHk8e8g2PNmiqeEgMTN+kQak/XEHcfeltBe85
+xOVxcabjZKOpBlVvF8oSeXHHJDNW8ds+W/C0GeMNj75qFTPw1A3MetK96aY402P8
+jXvlYFY+d+8Ez9g8W4QSteTZByEhlLhIzRw3ymshH0py2EXotCciMbA+nZMYLj67
+wWPevAu+cqCeZQf1nZM1gK3D2QVwyyoMLGdYGHBfXkR7txqGC1kLH3WRfXddo3k1
+VPfFStQAz3XRTWAs3Vmc
+=pJXz
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild
new file mode 100644
index 000000000000..3a9ffed03eb2
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild,v 1.1 2011/10/03 19:40:58 dilfridge Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="optional"
+
+KDE_MINIMAL="4.7"
+
+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"
+
+inherit flag-o-matic kde4-base
+
+MY_P="digikam-${PV/_/-}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync handbook +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner 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-${PV} )
+	mediawiki?	( >=media-libs/libmediawiki-${PV} )
+	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
+			)
+	redeyes?	( >=media-libs/opencv-2.2.0-r10 )
+	scanner? 	(
+			  $(add_kdebase_dep libksane)
+			  media-gfx/sane-backends
+			)
+	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}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
+	"${FILESDIR}/${PN}-2.0.0-tests.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 mediawiki Mediawiki)
+		$(cmake-utils_use_with gpssync KGeoMap)
+		$(cmake-utils_use_with redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner Sane)
+		$(cmake-utils_use_enable expoblending)
+	)
+
+	kde4-base_src_configure
+}