Pass --disable-granite to avoid automagic dependency and build failure with dev-libs/granite wrt #412101

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

4 files changed, 22 insertions, 15 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 43bdfe5c801e..a5dfe5228702 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.86 2012/04/15 12:50:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.87 2012/04/15 15:04:40 ssuominen Exp $
+
+  15 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.5.ebuild,
+  midori-9999.ebuild:
+  Pass --disable-granite to avoid automagic dependency and build failure with
+  dev-libs/granite wrt #412101
 
 *midori-0.4.5 (15 Apr 2012)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 25a07e2c1769..8800fc69ec35 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -6,18 +6,18 @@ DIST midori-0.4.4.tar.bz2 939294 RMD160 20dd9f0f9d540543553e2dd7dccca592b8acef4b
 DIST midori-0.4.5.tar.bz2 950950 RMD160 33b7269804d02f27f482a91c85ed804411e392e0 SHA1 173dd0ebe1cb8e3525c1905065db8f8c2d5fee97 SHA256 7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84
 EBUILD midori-0.4.3.ebuild 1777 RMD160 aafd6d3a4e4628ff854eb466fda4354fdffb50ea SHA1 4d39597390f2587d6a7d990a8612fd1212d69863 SHA256 0e36b52d3e0c902c2a7a20dcb3f65fa151cedd2c20ba684e90b5dfd8b423f890
 EBUILD midori-0.4.4.ebuild 1779 RMD160 c269326234aba887c2eb6f0fa435960987f5849b SHA1 d981e2b28edd8090d02b77905457468a3bbbe150 SHA256 33da6363faeedff6cd39226acfc9cf458b9835b919fe645c58a6423810b8fcf4
-EBUILD midori-0.4.5.ebuild 2174 RMD160 3cf2960627434da5ff44ced01baa0b50b3ba21ff SHA1 4426174ed8c8beedd193599a2b92408ce7766081 SHA256 61d560f2cdeaea5e249e7ac030bbb535c584239e520d8796e92e5baa79c6abf2
-EBUILD midori-9999.ebuild 2174 RMD160 2537c132c5a38a1752dfb43c3e15813ef1d01c5f SHA1 b664d3ed18df3f97ecf06c6a242730bd8dce7495 SHA256 9464d13bcceafc7b90688a637279b4982b90dad5436eaad41ee5a4c0f9655470
-MISC ChangeLog 12717 RMD160 4a2e482a8c63552ab0b4affa87a7d28da9688054 SHA1 a4ae6f963d20a4085acf3ca1e9f1789ca8755974 SHA256 e6ccdc759bf808c5b17d6a14344e803c50d16ae65363b6953834f35cfc52f2a9
+EBUILD midori-0.4.5.ebuild 2196 RMD160 29347e5926cd58a8847c87b0468cc3465dd71461 SHA1 d87ec0e5bba47b14e84ff83c99aeeaf354e3c6cc SHA256 2f17702623c737d5bbe424e7e2da2d10b30454b7c3d8a1826cc513d9120683a0
+EBUILD midori-9999.ebuild 2196 RMD160 06762a0eb88ff5cf1c8ee9f94380ea46a8ebbc26 SHA1 f64a2a33e192884798fec11c9e39ab991c5a3354 SHA256 7ca9fd2e8282639b0cfb79f13990075eac1b9d01d416d5887151134c3186236a
+MISC ChangeLog 12924 RMD160 dc97f8495b676080c2c0bdc96e9f60bb988c3c63 SHA1 e6ba68de0afd7a7afa48531cfff6666876c902e2 SHA256 6ad308afbe14c8a4891f86e0de1c2d7233af98a12bc17d621562fe1ac5acaa52
 MISC metadata.xml 386 RMD160 210ac12dc26620ea5e8575827bc2e699410af1d0 SHA1 c29f28b26ebf69c8103064f234ae533df40c2523 SHA256 a124995b5cae84828b57bdcb4b751f297428fdd560b147ada62034b871a4ed90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPisPCAAoJEEdUh39IaPFNRE4IAJDWFIa9N9HXzeB1R5aar0nu
-NnEZ3Jsbs5+UwxzDADTSuohv21T9wW2D6RFTgFMatW1PxWhEWl6F3Sak/UX6g9wL
-7Yct7FkWzpYJ4FXcdQ5GXrSSQ6IChH2wycAzhLJ3RpZMSYAXHmte/MxqQeo9ISDf
-qbEJSIaICsUBLARqFGhZml5xLK+Ftru7p57fYq974GrnNG3XcXlfPZ8ygXnBt8F+
-MWNQuGIXtkWn/KfLTlRHCiyDPLxZdPCSCUr2HroJiq8P/zOst2UnXo6TifeXqZeC
-fGl+/PND0sDTirC2quOCnMYPD2SXkN+Ca+tQTPcYjiQ0MEkISkADh7aF8GCzbS4=
-=EHe7
+iQEcBAEBAgAGBQJPiuNDAAoJEEdUh39IaPFNL5EH/3sg2X9EVsIzDruo/DdYi6vI
+iMTlRL4zn+IYtDHyukuVFyrembdbRAB7+Vhh2poZtssIxhy0KMhcLV6TNu40v2Y7
+lW71wB/pU4EFEThggzMl2Z9Pt125gs9xer3q/2mFWAFtRNbWvHh31fZ6FmoFWf34
+gYSBXGi5D2G/gsHIM9ScMt3QghwZvCChcdgRmUWc2aHzngVsXPZAZN4dzg3OnTYZ
+OE2sfQqAj1csb9GR46xJuxMY4iMAfpnNGaIsFarlWSg+iVHUCa/UM6/e2O/PUAnA
+hnAGz3hB2TVm3LaKQ2Gd4tsqiekefaEqdgF43XhkM4lb+ET1bZnzM2VBaLVF1vM=
+=aQil
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.4.5.ebuild b/www-client/midori/midori-0.4.5.ebuild
index d0a11f049fc2..84afd9d22b84 100644
--- a/www-client/midori/midori-0.4.5.ebuild
+++ b/www-client/midori/midori-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.5.ebuild,v 1.1 2012/04/15 12:50:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.5.ebuild,v 1.2 2012/04/15 15:04:40 ssuominen Exp $
 
 EAPI=4
 
@@ -77,7 +77,8 @@ src_configure() {
 		 $(use_enable libnotify) \
 		--enable-addons \
 		$(use_enable nls) \
-		$(use_enable !deprecated gtk3)
+		$(use_enable !deprecated gtk3) \
+		--disable-granite
 }
 
 pkg_preinst() {
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 54fd1187c308..a76e8091774f 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.40 2012/04/15 12:50:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.41 2012/04/15 15:04:40 ssuominen Exp $
 
 EAPI=4
 
@@ -77,7 +77,8 @@ src_configure() {
 		 $(use_enable libnotify) \
 		--enable-addons \
 		$(use_enable nls) \
-		$(use_enable !deprecated gtk3)
+		$(use_enable !deprecated gtk3) \
+		--disable-granite
 }
 
 pkg_preinst() {