Remove RDEPEND on bison and flex, bug 487318

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 50 insertions, 39 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index aefea0253f86..3033b0721206 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.155 2013/10/12 12:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.156 2013/10/12 16:20:41 dilfridge Exp $
+
+  12 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-3.2.0.ebuild, kipi-plugins-3.3.0.ebuild,
+  kipi-plugins-3.4.0.ebuild:
+  Remove RDEPEND on bison and flex, bug 487318
 
   12 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   kipi-plugins-3.2.0.ebuild, kipi-plugins-3.3.0.ebuild,
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 11a5c550f8fe..3070049d93c0 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -6,25 +6,25 @@ AUX kipi-plugins-3.4.0-staticar.patch 877 SHA256 43e67c5da27331664c3ab3b97d8a481
 DIST digikam-3.2.0.tar.bz2 58449068 SHA256 bd7204d42c4ef73f22e757ba5daa334073bd02ccc054c31780786d2b1a2a481a SHA512 02a5bf61e63515f673ed4effa2e5c96a37d50d7847683c948156df5b5262c620bde17de1d09bc1baf2ed009d80585c66241dbf02c2bc2020ff12ab1cbcc7a669 WHIRLPOOL d07c93ce44a349da776060826cef76f9702c2c54889af2f4b8bf6461e9b579594c9e3cdd4c64bcf33880134ea23cd859468cc92eaf155ae5a209eeb23675f6e3
 DIST digikam-3.3.0.tar.bz2 67124485 SHA256 3dfe0e78171c8d65b3a8e603345400bf83b90241b7a24a8ae2f7fd3443b7ac11 SHA512 1044540fb7059586a1638a7076df4b740e3166651cdc692541d3023fc44d5719b0354bd9e13dfc18f38215e7849855c3a814dc65ce48a633a780409eef34d5ba WHIRLPOOL 37488c9cf97190d137977eadb47f54de934769af51caed145f446488880b37aebe9814e830275957a4f3a770ad799207594e5daf3240f91b1277847d5986e6a8
 DIST digikam-3.4.0.tar.bz2 67118904 SHA256 e7f28e46cfaecd21ec5f3b883a19e8d540685cbbab0a2b63d5cb12e07dff8095 SHA512 0b0e83a80e35517f03519b1721e45cd6ee4d127f2e30e02cca7b6e47c617815cb6ea5de2c85a848e5467de6cf654aeae1adb28574c78bd5df925b6590caf534c WHIRLPOOL b8fb3e0e63c93970f46b5131ccab662199f306ae2314fd91b807753aaeadc0eacbe47ef32fabad2772ae3858c29efb8464b089b85bea4fd57cdb16533958c257
-EBUILD kipi-plugins-3.2.0.ebuild 3673 SHA256 90e7b8d0132de4c395978aee6e695975e93f62d3e08bb425fd47337b121e6c3d SHA512 7704eef475f26d14699c4c515e7cf0bc4096f0c0b91f65def24660b875a244c19e5cf91ea335a99bbe3aec7017159f1844ff2235ae4941d12ded9105f27f5029 WHIRLPOOL b9d9a5fc8782316cd9e1bd0581e386b6ba1f23f1f18d497010e00194a6a0fad751e8897eb1c95115c0af2071f03adf8bc286f8209f4722ab2ac7b6f3005985d3
-EBUILD kipi-plugins-3.3.0.ebuild 3675 SHA256 78ca2b1b01febea62638ecfdfb7417377296e0c25955daa769dead9f5a0a5990 SHA512 4a242fa10af24e2e72eb3a0bd52d8c4848cbcf5e344a019b637ffa296d83f398a9044b54a78b42132bc4e5f7dd032af3ffdf1a630f74cf575aa0f317b7306595 WHIRLPOOL f97ea118b9553af6e1bf419e563b4002c0a112f63f3853e3ea0e512ca1d0abfcd949cd6a13ccf408f7e7f7cc149684f7f06a46354bf2cd67ea6af8162a15ac46
-EBUILD kipi-plugins-3.4.0.ebuild 3675 SHA256 640c4a8d4aad6eb3c315cc5cca8ccc8a24d6ff87176dabedb40b943ab14bff0e SHA512 a1e9522b87da7d3e332caf14d080731794a8601b95b9bd2766ca891f2a40d3459212f1d5fbbed31676aa071086e95f4ef3ec67276ba891774d2f89ea3553c01d WHIRLPOOL da6f0cb78f10083db7f7fbe6012ee2f2f2d9b0851049efab9cc4ac2b538e4a0f9842a97c8ca0e9db1cf29d524f0b03f3303da29f4679d781774f6fb9de0f438b
-MISC ChangeLog 25623 SHA256 72090e9de126c555f4eb1c7bc8d16287804dde7220384aa8e27c931cde9c7d3e SHA512 e0dc5eeea8f889214dc8c9e135ad3cd1b181c239b34ccae15c88f6759ddbfd4f71f97256eec1b26089d666ee80ebc7a25bc9e4ec9ea58cf0b131a6e3cf412550 WHIRLPOOL 6342b027f65e3ee78c8af67b8abd5c5068410644a7fa99a5ab27ba6aabc510926909c03ab74fdd48a5b493a691e27c71a7717b91bfc708ff38b1baea9b6f8925
+EBUILD kipi-plugins-3.2.0.ebuild 3711 SHA256 caa582c52405a8209b06eace717ca23205501b55c9e3909946aaead0258e9d03 SHA512 f79421902bf40eb30c4fc209cb45bc1c72a6198291149e6009a021952ed6611565938097e93271f145e72ce3c42dbcf57d048257da5ac89cb5ce8d4f0139b842 WHIRLPOOL acb044e1985bd33374fe6e42d0c7ba0aadac4faab2836caec2b9e5fe24c36ce4c92dff3a738cc15a1e4f978fb9456e4a77f6b1a381df9cdc62e88e9f163543f1
+EBUILD kipi-plugins-3.3.0.ebuild 3713 SHA256 76180ccbfa1e2440e4055b5b392d805cc8be30322630c7e773c2ecdb778d86fc SHA512 6f92b60d2eeba91581b219ac27e345f4792b88d5c3d5eb815dcdc563d706120999f1020fdf1bea30f1a779cc1bf2bdcc55bd67585e549ee2c5d48ec99329313b WHIRLPOOL a4ef0cd92958e27d54acd53e5688c291bcedaac1caec83acce465a7c1b05cd7cbf654413c5f83c9944f4d65219bced180397bfeabbaec0736d41c4827578a88c
+EBUILD kipi-plugins-3.4.0.ebuild 3713 SHA256 3b75d89f6e19923da9d0568b729d603fb60edf59cc1c163f92a3ebed1523c808 SHA512 f8efdaee354ecfca07d90603d7abca87b5931b524c01e71817b758a412f81f79cc76d8c842c25dd2e1d42696c03dc19847e21aad73dbb35e9ae7ff10f04b6c2d WHIRLPOOL fc7c18986e05b3c1ae5f89223b87e1b8d3e464290cb8f8238f451bb31266c520bb8977d5f7c7c921bc67f980bd7118dc59a143c76612a93dc1312efc13f3e38b
+MISC ChangeLog 25813 SHA256 1828f58e95478b94824d1537caa7ef5f4a544f662fd341a88c73a51183d79556 SHA512 03002fbc68512d91700ed1864589bdac8ad32b1636d9f1ef21e11d98abe71ba4a29e857e16efa6532b43e9470a5ce9d4d07486319ba21f98de04b941e820d1ff WHIRLPOOL 841eb402e1c38c4228a86d409b6f46dbd9d8ebf3f1a3f620ab7dc9598e86f847f4c9daa01df60ef843a630fbd2305599e1d78f771acacb36761a7400da7ec350
 MISC metadata.xml 1026 SHA256 41d70f6a9f530a86c7091d047ddf0c5def042515235d22e2f86b9dd7aa1feaad SHA512 04429cb1cdea99211d8f5a911e9bb81fa5b13945f77f7ae6c29b526c9c7802ffb515e1ec606ec1dbc371dee9b2f8ab20a83c1a72da6f00e46de0cdc91cca2e07 WHIRLPOOL e196fb7e53afbff308d92349d87a33c7e14fb988df2e1aaaccd242a3f5c16e063253497812c0b7147ce3f28da6f164cdefc3152d687bf7ef747e2ee8bd184316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSWUdmAAoJEJS/30SErRQvF90P/i8L7bi+xxt5zB2t7YEkOLnV
-vGP+tg7betGW5zUDSOp+fsLxpyux736zPHX5qtDM5sOVXtqTyWBdXBO31Jkxh5eq
-xfjspnlIjTTgb5H4IOEvpB1Rnzt5nP5WAWOwpet9Ta0h4laYYmbzH7GBEXX+X5we
-hfOo8R4WuzeUsjS31bM7OjsXKhrKbOQe5dkm0JZBN8d1EQm+7l1vvYB4cpATziBU
-QkpY8mBCeO9cgRI94OGD4QiFlJTbrWxzDtSmHIRzSrYkZVV1h69jgXlyswZWw/jk
-0m8Fcd9HZ37dI9Jj2se7IQwjONVkgmuSfWcVN/s7DGck7aAxeSvn00GxbBj14Smp
-XaLo3mQchKAjDS51eU7bVFu2H8s8gRCy+ZZblhImLT5FgyuMvUHeyNNelwN8TbYe
-2ZeCWCJS4d0OQ6k4me61QnqJudPzzG1lYRm+Wqeeyze7Gf+/0pNW8vILHfbJE52U
-YsJuiaZwkYDtrgGDTsNnj/6iXi0gzU6h0Q8nmKGLktHiunF4RMsT1rEEApIoVRMy
-2z8RFcZTVo3hanOSqqxI47QJyWMUuV6DRFPkE45YKzL8ql7Obm/jG5st6e0FzXiA
-LDlCIYn1ZNP65EzUpPX0v3tb+PBndju1lHDJXJee8y0tcHG3foRj63m1tUTvuV1s
-YhadMcSO3xpbU6FXJsIo
-=pibD
+iQIcBAEBCAAGBQJSWXcmAAoJEJS/30SErRQvceUP/0qcpFRm+mbHcYtUkXukUe18
+bQJXW/2eiOwiBtsebpBUKycMhR1P+Kw0S+vkh3fu4Kz1WeBhaDG8kylBulTq+lch
+jMttnzGKEi8djJtYTZNnGE71uxto4SpL1gM7OMPAJZbGNz74Wl4lNg8aBNeb/YCe
+DgUC2H6vRUS99Mw/lUxUbnbX7FkTgigQs6A5gULQM64viPiSQakdy+6zsocPDJxt
+OKSD3izLkc9JrENN5NtE7rYmO6XAd0nEhqKI1xh7SttAMJ+ligbd/D9XBL6zdqV8
+yfWDdaEs8Xyb41OnAu8JXDXP/4MEnioVwqMEayAyVbUt04dT9ryiA5S0PREIB6hh
+OW+RQrhXYB7vkeIjpKpyq4J1hKnzgSVXQbXGNCxhVR2umH/kg/RJSMspB43mmGYN
+S2J3yDxzkobq2iL5Bk7SKluGMwRKKfEzIzGKGWNaK1aadx33dXv7V0/O0/H4lNMu
+lKSJXs91Q2Xg0y8RV0VMsJxJmG0T/C0RmoLbHTaSiY3u0JY3mCqJJBjEl9fjdbBt
+MUaYOirkw5HmH6LkiKm4hTFhpwbvNolH2ke70g4PDiFCFkYDpUuJ2d4pmHxXYQQE
+ScRSC1kdD8jEf0YVeVOeAUORYNe/DHRzcFLyTnDzZjOLHF9JZvFBtzAteerCQ535
+y6LrerSaDZkPip8RuNEq
+=XK4v
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild
index a0a4d80a3f6d..1a6b0b6330d1 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0.ebuild,v 1.5 2013/10/12 12:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild,v 1.6 2013/10/12 16:20:41 dilfridge Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte"
 
-DEPEND="
+COMMONDEPEND="
 	$(add_kdebase_dep libkipi)
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
@@ -49,10 +49,6 @@ DEPEND="
 			  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)
@@ -65,7 +61,13 @@ DEPEND="
 			)
 	vkontakte?	( net-libs/libkvkontakte )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMONDEPEND}
+	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] ) )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild
index 62b99f407537..6436fcf91309 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.2 2013/10/12 12:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild,v 1.3 2013/10/12 16:20:41 dilfridge Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte"
 
-DEPEND="
+COMMONDEPEND="
 	$(add_kdebase_dep libkipi)
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
@@ -49,10 +49,6 @@ DEPEND="
 			  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)
@@ -65,7 +61,13 @@ DEPEND="
 			)
 	vkontakte?	( net-libs/libkvkontakte )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMONDEPEND}
+	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] ) )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild
index 7f3b1f45eeb6..d53b70918793 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.2 2013/10/12 12:56:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild,v 1.3 2013/10/12 16:20:41 dilfridge Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte"
 
-DEPEND="
+COMMONDEPEND="
 	$(add_kdebase_dep libkipi)
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
@@ -49,10 +49,6 @@ DEPEND="
 			  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)
@@ -65,7 +61,13 @@ DEPEND="
 			)
 	vkontakte?	( net-libs/libkvkontakte )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMONDEPEND}
+	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] ) )