Version bump

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 150 insertions, 24 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 6778ff90d3a1..d84e140c638b 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.117 2012/06/07 19:28:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.118 2012/07/09 20:45:31 dilfridge Exp $
+
+*kipi-plugins-2.7.0 (09 Jul 2012)
+
+  09 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kipi-plugins-2.7.0.ebuild:
+  Version bump
 
 *kipi-plugins-2.6.0 (07 Jun 2012)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 8363138371ce..e863158bfe9c 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
-AUX kipi-plugins-2.2.0-panorama.patch 637 RMD160 af10aa9d372525b726f6127c5708c94ec0d8d2c6 SHA1 04ffe616b1bd516009b8ff46bf138fc3f3a620eb SHA256 d83477c7b1c67342863aeb1b03ec6f8b7fa4a7b1ca0194d1d42e4ebaf920edee
-AUX kipi-plugins-2.6.0_beta3-options.patch 1091 RMD160 17da79d58a00afe62953f9f137d05b494da5ce4e SHA1 7e8777edfd7e46070513b8a87c94f54649795f5d SHA256 2550af0eb24416a145fbfa5de5493dfb9568f20bf98b86efb108dd2c6fc5cb58
-DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
-DIST digikam-2.6.0.tar.bz2 55362029 RMD160 69671481ab6699738892c6c91857b62d5cfe5abb SHA1 a7a9e4e342f118b603a11539c98a01c9970254df SHA256 411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df
-EBUILD kipi-plugins-2.5.0.ebuild 3231 RMD160 d1ad5e20a5e335654f01f95320327b1726c76c99 SHA1 7bb60beffd0e4450c1cf4674fb659936999e8b0e SHA256 2f6a91efaa9575ea9d99c99cc12918b8056be8d5794f95df82b53a42f9871f34
-EBUILD kipi-plugins-2.6.0.ebuild 3316 RMD160 7d70be3a23e2a1c54d65941bcec397a2d94b7294 SHA1 9bfca0c609032f78f128351f26beb93827e590d1 SHA256 c32e60a7efac0d3a3bf987ea211972b413f924c854cd33dbba29f571d6d5a872
-MISC ChangeLog 19767 RMD160 14e1cfc9d92793e14d1e15d831c0c573e099919d SHA1 6a48333d0932e3e5a1540968f8aec2d2437f53fa SHA256 e38e4103a155347fbae1529072846f0ae79caf6835baeb2dec02767a28b28198
-MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SHA1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0
+AUX kipi-plugins-1.7.0-expoblending.patch 570 SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0 SHA512 9e522ea0f193c5153ea34989f0b875f053bd7be61c2179dd2457cc53e3436d861a50f63efafcfb635cf13c25894229a3a17e357aad8e535fb54c42ef1c0f4acb WHIRLPOOL 0ddc054ee05e6bc3931ccaad3d86138406997aabd92576567339b88d51b661b50a29a9e0bc1ce30c0d2def210273b4afb9385c9bca3f2f46a6c2e582c4ecb6a4
+AUX kipi-plugins-2.2.0-panorama.patch 637 SHA256 d83477c7b1c67342863aeb1b03ec6f8b7fa4a7b1ca0194d1d42e4ebaf920edee SHA512 8e47abc23a15365f376b1a3b28925ee4cc669ceb13a5c1f99f00ff05e22fff9de31fec390b95cb6e4f8b21e2a0a52b6bb193c3447c45b47491841b258e6d82f2 WHIRLPOOL 762b5624b720a2c9ec4edd5082910bccb62e3ebcd4054144c6676a7509603d0d6d1f72ba47ffaf2b4d93e228cec92c6100c561d19b63764572e59ae9d11de688
+AUX kipi-plugins-2.6.0_beta3-options.patch 1091 SHA256 2550af0eb24416a145fbfa5de5493dfb9568f20bf98b86efb108dd2c6fc5cb58 SHA512 0f399cf3de49763f383ad9e4c9d75a79d1dc6a538e81f1a51ccb02e8018c57b8c5b168f91faeaa98a488bdfa98c166b22d269f5e85618e1273f15f9ea3f1e84c WHIRLPOOL b5154f31b18e274e706490acac2e610239c7db94f2cb8ea8b28f8b0101fc65f656a4325b1ba48c6953951ea45b29afaf639a0d8e0204d2a958ba1dce7cbad50a
+DIST digikam-2.5.0.tar.bz2 54976375 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
+DIST digikam-2.6.0.tar.bz2 55362029 SHA256 411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df SHA512 7984e8b463a5393a4606a4f6d752c7d006cc62ada6947467c034ec5e7fdd5de12826e0f33bfb07b80bb7c83d03a29273eec618a0e7c0f5588416b94fe1d2768a WHIRLPOOL 9e8812e4de7a4670c0d5c6b3286a510530325a797e9782793bafaef14cc7f09c8ddf7a3836b2bbf61fa82c50d92a418d1d4cf4c4554f841b7ea47bc4567c01bc
+DIST digikam-2.7.0.tar.bz2 55696444 SHA256 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab SHA512 34d33ef8b7dd0664f92bbb5f67720397f537ac46da7ad1b6c4ae854691925fe9004b27820e4ded0c6a45126429a452fdfe7f4114e381d975afbbee6d514536a9 WHIRLPOOL e8171b7b18d841382aa66588937308e3fe31cf7eb8f03ab79a89deabf92082e025532a416e112fd5d51113f2a656405a78631aace022eb8b17040044986eb68d
+EBUILD kipi-plugins-2.5.0.ebuild 3231 SHA256 2f6a91efaa9575ea9d99c99cc12918b8056be8d5794f95df82b53a42f9871f34 SHA512 175219cda8ee197acb0871e90f88461af174a8fbbfcf3252b9c0d13f460566805713f352de9c5d453c41d6e102fafe55ae4e73967649cb5390d36cd691d3f4cd WHIRLPOOL 1d9de1e091c8388e094970d5737ee7f67737d928c52ed7319d153c53adc1ce65aea238d64830508add6293dce456f5e25e166c8ccbee992f919da15facb9e268
+EBUILD kipi-plugins-2.6.0.ebuild 3316 SHA256 c32e60a7efac0d3a3bf987ea211972b413f924c854cd33dbba29f571d6d5a872 SHA512 195cdb230d5a8dcaaeb1a4d9045eae2dc0c6e3ec58e6451a72f4857dd6a9bc7e67d00838a94a3a50b1dfc0d00af0e9a3577df4540fc3ea0b8d4f179b2e46b591 WHIRLPOOL bb5b140f6207a0821869cd634f70b4a2e781ed58147a1488ffcd0182199a660c58df9c5500ee474b6d5c65bfc6aeaa7088155ff6e9e88f0d971ff9db3714a04d
+EBUILD kipi-plugins-2.7.0.ebuild 3316 SHA256 6ea55ab1a162999c07e186c3d23d07a8f0ea5915f52517d370bd47d89f2fe453 SHA512 2fc5b21409337e632b2768a028faf44a7b7e321092be30b280673bcd979dd4954f72e4eaa7f03fb0daef256c9d71a2201f5e9b2bee22377bd72217802a18f330 WHIRLPOOL 66f5d93ef197780d9b6b59af586b56f92f1a270c1ed512012c6433604408b4a5398c072e6f0d8f2f2cc0496de3e6318f86f833ec5b6cd59046270163ad539b60
+MISC ChangeLog 19905 SHA256 d2ea4160719d79c1cd40205addb19801542862e9a70c4f15a81e9976c46489fb SHA512 e91ab8760f5d5bd427f6b812fb6d01c3f190dab4d3ed94581d4f6fd991d208170af75b55932ece22f4fdfa860b3234595e108e47e1737dbe9815852172cc5f16 WHIRLPOOL 7572c9606f7859a1af69a426891c07e37915046f2e5ac5ab184a3501a9f14b98291d0be60ad140e9c841fb63d3ae40367d03cb656c26a30f003bd1dccf3689f0
+MISC metadata.xml 961 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 SHA512 7e1a93a9317e3a46cf7780bfea20439956419cbbacf241604ca15c573aa57774b4a6959fd6dec2c605f5973b57e03162e7ca9e25e6ee711520df9a423ad0c160 WHIRLPOOL bd78564f762bdab04b3466a86579d8d4c065e1b8eb28399b2bb2b8d59bb518b1d7e4916f2238376cc14eb0b064b7cdcba53ee77a211fc746ae1e0bb8ebf7ea98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP0QEwAAoJENwGBM22xffejkoQAIbGPKanfh67lxkzp7VvrAZc
-9BnLUWk9mfWFj2nf6ZZ++slZKymYfaj9OiXhsn4FcjAWOkxDgyx1Gk9sDogOsX4T
-RuXXk5yM+OWUKJgWnFiObjrd2hsIFumJYSJdWVeMXUy0UEq86TFv7VcyAhZFADI+
-DsCWULxAUEoeMr2iIgU44oPoHni/L/06BUlNgVJiMRAuvRWdVKNBZVcB9IE9Wver
-5L13Y9GEvkeQSaMusuhopGbR0hQHmFOLXbuU6e15Nf0JuXkv5aJ6WzZ5yv8QU/zg
-EjRfqE74552UqD01puqQ8WxiMrgd8tNLTcB3IuzCPDpos4F6RBLz8juuDzL+R3RT
-t1jOSBWHgrT6NYjkAxab0e0ANSjHgBDZd/xIO0x7NLJZddzu+Y/HEvdVsklAvvtw
-iKybGG8QwcmJvwayu8q03GZVF7XT5xgVD99LiGrohoRywgmb2koeADCu6jtCabqR
-f5B/ddkVQ5JNMx/t9035CgbsBD/W+GWmx6VzgRw8RDE2FFQYlZYyRjXTnm+5oXnb
-6DvJ9/8PoinJuBLCnyB9sIP+xe7yw14xz6qoTaf5xBxHagJ2ceVbPTKxC/kGwW2p
-8yzfyCcBpNif+vrW1mHv0uvbV2mDZFbwcU1ep6Dm2YwJAR7NJs7wOSm3+CJKvTuv
-zyUeG9yTH+DfVPnIxB4R
-=MS3f
+iQIcBAEBCgAGBQJP+0M/AAoJENwGBM22xffeZUMP/1qIBO/CnXUp6TxGlE0e4dGH
+nySLIqGlh+gVu1RpxxUoFWfDHcKY7DW+t6+dbXpu/xFsPWElBUAWeK1TU4XBi1Gk
+UuyYWmWQ8PT7gevHLwqBxgum8Wf+kv34bzQ5aP/S9wYa8CI359uDbVhKcd3h5P3J
+/4pO/ugVNipTDiXbh9ijv7KbOudZvxjpqXTOh136ZMJcAsPGbiGVOQaHM0VqO/bW
+ZSqZqVesXKMY3GLzfOhAq6MACFr6FsWb9b5z+9mrbZid+UNdEZnXVKiyIlrliPKq
+n8c/JD/88V/56Epdu1OYkTqAloHa3P+o5ETP23wy59UWGLCFexFEVxx6gvGhGvLo
+rmKARofEaMaQwB8C5WSYeIPXNkWf6Xlls2KrObz8YOh4tkhljTWAfR7DoeKH7UjO
+BN69RQSXI98ae8cT85tGvLw5GDG6KC5eg712w0n+ArfTYbH+4WcCW3BtDuoZ0p2P
+vk9KsPLV2T+3JD7sqe96N5kQc2tX6L+3MvPBE9IeVeNWU0+8ZPMlhASbczDZfT+r
+c9Z7LxGTFkJB1d/pIQSTVHct+QrDsLYe/yARMXhqxfPP1o2NDoA9MWM/yIiRcaot
+ZeMg3AS9S9JjcUvzUJSM43tSfwqdw66wvMOH/4P67sC00bfXmdggwzqTS+kCKueO
+SZJfGxMudfZ7K3cfm/YI
+=vMjF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.7.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.7.0.ebuild
new file mode 100644
index 000000000000..6b2a81d7d122
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.7.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 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.7.0.ebuild,v 1.1 2012/07/09 20:45:31 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"
+
+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://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 +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 )
+	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?	( >=media-libs/libmediawiki-2.6.0 )
+			)
+	panorama?	( dev-libs/boost )
+	redeyes?	( media-libs/opencv )
+	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}-2.6.0_beta3-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 Sane)
+		$(cmake-utils_use_enable expoblending)
+		$(cmake-utils_use_enable panorama)
+	)
+
+	kde4-base_src_configure
+}