Remove GTK+-3.x and WebKit2 support from 0.5.5 since it doesn't build with latest GTK+-3.x anymore, and 0.5.5 is by design a legacy version for people having problems with 0.5.8.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 23 insertions, 34 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 860e13c0eac7..d002b1533998 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.125 2014/04/07 15:23:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.126 2014/04/07 16:59:24 ssuominen Exp $
+
+  07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> midori-0.5.5.ebuild:
+  Remove GTK+-3.x and WebKit2 support from 0.5.5 since it doesn't build with
+  latest GTK+-3.x anymore, and 0.5.5 is by design a legacy version for people
+  having problems with 0.5.8.
 
   07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> midori-0.5.8.ebuild:
   Make USE="granite" which pulls GTK+-3.x dev-libs/granite depend on
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index ddc6b8b068ca..439eb14d492d 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 DIST midori_0.5.5_all_.tar.bz2 1092309 SHA256 ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62 SHA512 89d1ddb461af460a83744cc761989d430750dcef9565ac98960c1c87e6082ebb35e61c4f21f28891a19119e2733dc8a6440bc51c0bd206c37ac068e434fc0231 WHIRLPOOL 699cf9792b6ce070cdaa29fe06db3c6d75bca23797252028925e1bee5a66704881653c39e2257bfcb861d4c82205605f2d4f38e8b708d559318284af81e1a73a
 DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
-EBUILD midori-0.5.5.ebuild 2855 SHA256 24dea6b9956b93cdcce0466549069dec43ceaa49417e64e2b3228a4a610040e0 SHA512 ebb5c8aad0bab9dc07556cb2d4dcec8980817ef9f479d8ff44869b365d3c3ba98f9d9bcccc21be8ee5e767545a91013621a8853cff19a913b5e48a8e62766fa1 WHIRLPOOL acf03627e0760a2e94f1c9f57fef0b537796bd70b2df5ead8952e4715aca21a0b0392d18ba02395b603c3171c313980ebca4c6c5912bee0b1a68d82f8f34c14d
+EBUILD midori-0.5.5.ebuild 2476 SHA256 227238d6880fc5e52aa675bd7127649243e01a60b9ff6e85fed179df3cdf204e SHA512 372aa493cfe943cac7f72dc199822062daf37fd17668eec326d8810258033713601146baa4a4faa82d88162432d65dd5dd5f97ae21ccaeaeb8b640b9b6c08a5d WHIRLPOOL 2efd8b90cefd6e824f6f9d398cdc1eb77558922e738f3a45b6111523ad70f2203e1c3af03a1bfdb4027b74e496370da4c481734d3e2c36e02776666e60a60c20
 EBUILD midori-0.5.8.ebuild 2990 SHA256 58fc4891c9c860bce536041ec08807a1419715d1c6b7f3477201cd317eebb174 SHA512 247760cbde8b2f9fb901b7f27c77bfd98e121599e6de13af48e963383789777bfb02dfb999dac1512b55c8cdd719f363c4c1cad09b13dc1ca1f9f2e7d92073c2 WHIRLPOOL 93bc2e2256fe491ff047df7be98f468ef3ec418b09bce28e489c624c69988bc8d7d8b5982de5fbf897c92be704212dc91b69649799ef3ec1d13faa0799d3f744
-MISC ChangeLog 18738 SHA256 63316d0a65a0691b6c656f4c898c83ea070e9f2fb238c780202bfb703499d824 SHA512 0e6524f01376540cc7a0990b40cfc9fa13c0620bef77487c8c44a46787f87eecfb7295737673a7c839a481008bfa8ca44d54fc2a911c6153b7ab5dc6345a2b75 WHIRLPOOL a7f204070587c694c12d69fa991467554b34b025adc8c3d5cb84329649146b2ab5e3705400383407e62e41a89ebe0b59c0f3ca69b800c505b4e636c4594d17f5
+MISC ChangeLog 18999 SHA256 242a7443d7f7a2a6226cded8c2a42bfb3c9c3ca9b633c86fec27c7cde9bbf7e5 SHA512 d96927758f6d62154371d747ea8b1812d365aa6f0371aa51a565a34d03f78c741692b14e3b29b4f89179aaafa6d9c7cd2ba0f5e589698303997e6e8bee18c7a9 WHIRLPOOL 8aa421fd0e38a282356ee25f5b3d4882d4bcfa58d9df612d6ed4e20e8ed5205f4d9be0580adc90a4188292213074e5db9208c07ff19f49596d6c0ddd6c78374d
 MISC metadata.xml 698 SHA256 e5159b309d3060133cc0776a8f5e936bf7bb27a8b4d382d122fc68c1d1745a35 SHA512 e8119fd0d98542eea6e654b1a33d9968ac385ab2d0a00b18908ac8d25dc6020251d905f1b8f272805082a78662ce192411394cdeed63ab1dab1bb680c7bae019 WHIRLPOOL 3d9a43fe94fd91851a1908f12fc1ba290603874bb3f9d0a609dd138b91f953fa0b608d82e5d629581df54b09231d05293e5aaad5b7e00d0d2d5a614dc1638b45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQsGYAAoJEEdUh39IaPFNgrQH/3bTw9KeMp/SkqsCAymt6mlE
-LsJYwH1WQScefDZJes3SPpfmKLj2cAYG9RBOqtQq0bvyV+HMxmatDiTcv42KdkJB
-2fTH1YNLs9f/aHswWEXt9OSJC6fDQFn82LaZ9hcQMBH6dpXRt8K1aAf1AoPRwXM5
-wzuuUJHUyHF85oLp48Ae6ILccMFSQM/0nong2/mI9mxc14fdZmHfnbrZUL9yB59P
-CWz8f2ViZtsp4xJZRPO2Ti3YFxZ21c6e9hb3mj4lV0UASJeBKFuT7tjsgWQv9IJt
-uJXbxGfnY6zAQESCiUBvG3Wdb62rKEK7hVdUjEqiZVgtcBRt8qU34JK70uf07NM=
-=ceBD
+iQEcBAEBCAAGBQJTQtgKAAoJEEdUh39IaPFN63gH/ig2q7EnuqYgCZuVjVS3tNtR
+/5kTe7g9p5Cl71nNfrJZ59VaiRdwRH2jQWlyGzfDcqK1+BMnR3bSWXcACcdUC9td
+kDyNJZlXzGCqF0/to9KbIdmGsjvczrhSZIma4TixTnrKvFE/DPby/uR8UnLNdNo4
+nfhmfRsK4V0yE4Bx/UZk11FswuFstMNDMezOMIVlueJAdvPzqQaOxuorUb+VNTl0
+vIMC39qED7gdSgPB1NWxqYTl1TQeDWtHtMvwyNRWqjN980+HYOcEekDPdPBK+eq9
+VmCJb2aQMmEoBE5uiuwFCqsCrmWIftEuHi0mCU7uZCoNDyrZByw2CzkP4JZk+Oo=
+=KwHm
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.5.5.ebuild b/www-client/midori/midori-0.5.5.ebuild
index 682d23cc6d08..d06153485246 100644
--- a/www-client/midori/midori-0.5.5.ebuild
+++ b/www-client/midori/midori-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.5.ebuild,v 1.2 2014/03/04 20:22:12 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.5.ebuild,v 1.3 2014/04/07 16:59:24 ssuominen Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.midori-browser.org/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-IUSE="+deprecated doc +unique webkit2 zeitgeist"
+IUSE="doc +unique zeitgeist"
 
 RDEPEND=">=dev-db/sqlite-3.6.19:3
 	>=dev-libs/glib-2.32.3
@@ -36,18 +36,9 @@ RDEPEND=">=dev-db/sqlite-3.6.19:3
 	>=net-libs/libsoup-gnome-2.34:2.4
 	>=x11-libs/libnotify-0.7
 	x11-libs/libXScrnSaver
-	deprecated? (
-		>=net-libs/webkit-gtk-1.8.3:2
-		>=x11-libs/gtk+-2.24:2
-		unique? ( dev-libs/libunique:1 )
-		)
-	!deprecated? (
-		>=app-crypt/gcr-3
-		>=net-libs/webkit-gtk-1.10.2:3
-		x11-libs/gtk+:3
-		unique? ( dev-libs/libunique:3 )
-		webkit2? ( >=net-libs/webkit-gtk-2 )
-		)
+	>=net-libs/webkit-gtk-1.8.3:2
+	>=x11-libs/gtk+-2.24:2
+	unique? ( dev-libs/libunique:1 )
 	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -84,28 +75,21 @@ src_configure() {
 
 	strip-linguas -i po
 
-	local myconf
-	use deprecated || myconf="$(use_enable webkit2)"
-
 	waf-utils_src_configure \
 		--disable-docs \
 		$(use_enable doc apidocs) \
 		$(use_enable unique) \
 		--disable-granite \
-		$(use_enable !deprecated gtk3) \
+		--disable-gtk3 \
 		$(use_enable zeitgeist) \
-		${myconf}
+		--disable-webkit2
 }
 
 src_install() {
 	waf-utils_src_install
 
 	local jit_is_enabled
-	if use deprecated; then
-		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
-	else
-		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
-	fi
+	has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
 	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
 }