Update patch and fix some dependencies

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

4 files changed, 56 insertions, 20 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index b0430bb94475..f28875430cb0 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # 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.137 2013/02/09 19:53:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.138 2013/02/09 21:46:34 dilfridge Exp $
+
+  09 Feb 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-3.0.0.ebuild, +files/kipi-plugins-3.0.0-options.patch:
+  Update patch and fix some dependencies
 
 *kipi-plugins-3.0.0 (09 Feb 2013)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index b2a949d512d5..48a1d8c96114 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA256
 
 AUX kipi-plugins-2.6.0_beta3-options.patch 1091 SHA256 2550af0eb24416a145fbfa5de5493dfb9568f20bf98b86efb108dd2c6fc5cb58 SHA512 0f399cf3de49763f383ad9e4c9d75a79d1dc6a538e81f1a51ccb02e8018c57b8c5b168f91faeaa98a488bdfa98c166b22d269f5e85618e1273f15f9ea3f1e84c WHIRLPOOL b5154f31b18e274e706490acac2e610239c7db94f2cb8ea8b28f8b0101fc65f656a4325b1ba48c6953951ea45b29afaf639a0d8e0204d2a958ba1dce7cbad50a
+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
 EBUILD kipi-plugins-2.9.0.ebuild 3395 SHA256 cef442b63b4e32a745813a41117aec65db41d83e2f7dc69c83060169847bccd3 SHA512 26af530abd07fb044a397aa653450f28cd0dea73eb10e3941ab76f3b78d909b42ec17a5e37f01e56264078067ee84aae7d2f93273a85c0606a267a9419ffb794 WHIRLPOOL 5f3f502854a558d43a705c40029485c6fa87439d5f0641fd10b1261ee83dbe29e1e9fe278feebe4cc4e20fb3d165ecc860705e2f841f2ad39f09d5e2da8fb731
-EBUILD kipi-plugins-3.0.0.ebuild 3343 SHA256 6eb18669ac378cc56360860c6dbbc9a689186d1d63bc0c98b1ca3b6f568e0839 SHA512 c33e87ba7a9badc7227b903b06f59ab563ee588867163f92cc5b4794488993a22f1e20f4367d1431d83d75951bedb2cdef959d768ba1ffb8917a26052057613f WHIRLPOOL 2385b79d1c9fbde6cdc300887d1e4134aae2d42c44ab59e1bd385efba9636207bd2c3cf4de58ae5bb15e792d900e842bd432e735e857477db5017ca9d04fb3f6
-MISC ChangeLog 23032 SHA256 91fa8693cc372201854d866830f9701d420218a1c8466aa34cc8bd354d217570 SHA512 4acae9080d1a22f8368642e0f69d8e4beff58f5232708e075c08dd2b4626d34fda0ed6607203c85842065f7e97855d23812ae5b27d49de8034f9b61db78034b5 WHIRLPOOL fa548f312645b2d1efe1402021759c37aff84e9666791bbf63f87d0e7c63b8685bda4c6f1b5d6a2241bfd900e2396511d117b50ab5875169f4e260f09b332dea
+EBUILD kipi-plugins-3.0.0.ebuild 3366 SHA256 1d4faa987757750d6011d71f86a128ecf588fd346e5f4ef5f0d042bc45d4faf8 SHA512 0df69bed69ebedf673e467316b5b52a1e69c5801cb0519d8135be6c4e8316d0feb2e80d2c47691bc754181361cb29c7ebd56f9a59ed5b8054fb9b05af6d1f9a4 WHIRLPOOL 1c668d8bedd2a621e30b601dc804712afcbc3992d8783ca65a84a28081bae35740ef2720009bdf8f375c36b91f284bfc63eb5f3d4d8f58037c516194662f7dde
+MISC ChangeLog 23201 SHA256 92b3ea34c744c5890658337d347eb4b55c29fda5b0fd5ca23f1890e1491241c2 SHA512 f90b7b1b66c8f1386e6de75c2ec0c9025c0b3e9751497cfeb358514f4f6b37e17770e94dad8fb4d9e34b8420901a8e86c40f339d8b879d352428e889c9dc9549 WHIRLPOOL 81cdd1f995e39cbbb3737cdfb5fbf57574b3801032459e5afbde597f7e70e6fead27e7269ee200b125ce62df965dacaf2694c55de3fca71a102a8114d0aa79bb
 MISC metadata.xml 961 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 SHA512 7e1a93a9317e3a46cf7780bfea20439956419cbbacf241604ca15c573aa57774b4a6959fd6dec2c605f5973b57e03162e7ca9e25e6ee711520df9a423ad0c160 WHIRLPOOL bd78564f762bdab04b3466a86579d8d4c065e1b8eb28399b2bb2b8d59bb518b1d7e4916f2238376cc14eb0b064b7cdcba53ee77a211fc746ae1e0bb8ebf7ea98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFqlOAAoJENwGBM22xffeyVQP/iTD31YDpIv/09mPl3LdzCPg
-z0fQmBqqfy/z114CKSxUePZMqg3YTXAgrX+DF7m1eJtf3YzDjhprSy5+HYIG41FG
-5UGkfjydhcbbJL584UfDVVQfAyOlxZH4k17y5QxShRYmeIejL368/+nniVeLJZir
-ZZGkXwxeBl6eOCinBWv+vKzQq9qlfPe1e+VkTYhH+whoXutX/i3Grc3P06OwKY5p
-YU4+oVqdZRRqyfAjOrVdHjUM+7xtNoDGlts5UZHSsx8IZOk/nflHEtWn5YJ0Bemp
-Je2nuUoIQaqMa1C7u33DJxTTTqtxR3axIjIzsCfvIV8Mo2ZpIX1lboE8TYvG3bF+
-FXjJi/kzZ5hta8aW5paDavYEwtfK4jUH42TDS8qcTYInr7dET+9WgNVmqquObZry
-kyz4wbA/Ueb9MVcMXncjDyEwPrPDCtzKfAYgPcd2yq0rwpE6COytIecSe5UMLLu7
-lpJdLPV/v9v2iNAjcZGJllSWjkjlsNwpY1vL1ULeuIkxpNrOUy3TDnTbjYMP2SL8
-3DTziBHhdo1/v6hqsrAk8ZIYoWl22gHII9fj/1TV2tRw5Qsd+2Puyv5Y/s+LA2Jj
-LtCLtFL/0RVNmcKXiqJJ+CI/gdfCrjp/j10i31FWOMBDNG2a/cBmEJmxjI62PcJy
-55/yUt0AKp6pWlpOSWdk
-=9Iuz
+iQIcBAEBCAAGBQJRFsPLAAoJENwGBM22xffeuA4P+wRLFrnIM5nUL54Hm8gXN19K
+rzJftEFh7vFLtDhr+3lPwzGnDzNADiwRLO7LRzoFUw7qVB5Zr/wk5ziKOoI2mZSg
+ujgW8V8yYJJpdvd52IFDBthSfUbWBzkDgVaIcx7txiF+uIlI733Mp3Ec0d/mvlZI
+CheGHrC3nSVy+wwUIY5Oen/fPLHs6NvRL97gGGJ9WltQVKztW/Ol5FKDl+pDYH31
+CGsHcFjUAsyksF2lKYtQwlyIRYeIrrIYKpsDXuMaA3gl07QTNRswdHfmdGWVFKGn
+LnMl/qljXqg3yd23Sj5Gc1CDaKqlLcDL4od+FOxpdM/phZ5XjStc8rgy5CAUAXKo
+L4EflNYZtwnHQdKjsyHv27YkJvsTFrHRkn7wrd+pIAn6H9P0eSnZuRVhPv7OcI6R
+HvgAPfwWvBnqlQ7vo8LhTz9FoFu0WBYZ018Chzg2nxOMLyMLdQQBIziKTHhMbKxc
+/mTeL2Ok9ItXFDMpa0dpZI3hE+H9L6MhatIHGjsAtkBNgDbKOi0srv/Lb9hjH3Kc
+PSsHdsZPcV/6I+MWN5qRywSutChMOw4sr1Y8kjdKBYfkiP24ClME8tO97hVrQUXg
+bs2XofSDIjN8VdzuI+CeROEAy2AAcbUujDEL95GFwqalTSK3jL/XojDNki4iz0U9
+3wcrG8L+O3Aor9bVSn9U
+=TDEb
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-3.0.0-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-3.0.0-options.patch
new file mode 100644
index 000000000000..50e0db071b8e
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-3.0.0-options.patch
@@ -0,0 +1,28 @@
+diff -ruN digikam-3.0.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt
+--- digikam-3.0.0.orig/extra/kipi-plugins/CMakeLists.txt	2013-02-07 00:52:03.000000000 +0100
++++ digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt	2013-02-09 22:33:55.284100771 +0100
+@@ -424,7 +424,11 @@
+     ADD_SUBDIRECTORY(picasawebexport)
+     ADD_SUBDIRECTORY(smug)
+     ADD_SUBDIRECTORY(printimages)
+-    ADD_SUBDIRECTORY(expoblending)
++
++    IF(ENABLE_expoblending)
++        ADD_SUBDIRECTORY(expoblending)
++    ENDIF(ENABLE_expoblending)
++
+     ADD_SUBDIRECTORY(kopete)
+     ADD_SUBDIRECTORY(batchprocessimages)
+     ADD_SUBDIRECTORY(rajceexport)
+@@ -492,9 +496,9 @@
+         ADD_SUBDIRECTORY(mediawiki)
+     ENDIF(MEDIAWIKI_FOUND)
+ 
+-    IF(FLEX_FOUND AND BISON_FOUND)
++    IF(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
+         ADD_SUBDIRECTORY(panorama)
+-    ENDIF(FLEX_FOUND AND BISON_FOUND)
++    ENDIF(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
+ 
+     IF(ImageMagick_FOUND AND QTGSTREAMER_FOUND)
+         ADD_SUBDIRECTORY(videoslideshow)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
index 5b5ff756d7e1..540ef1e8aebf 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild
@@ -1,8 +1,8 @@
 # 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.0.0.ebuild,v 1.1 2013/02/09 19:53:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.0.0.ebuild,v 1.2 2013/02/09 21:46:34 dilfridge Exp $
 
-EAPI=4
+EAPI=5
 
 OPENGL_REQUIRED="optional"
 
@@ -49,7 +49,10 @@ DEPEND="
 			  x11-libs/gtk+:2
 			)
 	mediawiki?	( >=net-libs/libmediawiki-3.0.0 )
-	panorama?	( dev-libs/boost )
+	panorama?	(
+			  sys-devel/bison
+			  sys-devel/flex
+			)
 	redeyes?	( media-libs/opencv )
 	scanner? 	(
 			  $(add_kdebase_dep libksane)
@@ -74,7 +77,7 @@ RESTRICT=test
 # bug 420203
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0_beta3-options.patch"
+	"${FILESDIR}/${PN}-3.0.0-options.patch"
 )
 
 src_prepare() {