Remove midori-0.5.5 because it depends on old and no longer maintained (by upstream) vala-0.20. Bug #536594.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 7 insertions, 139 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index fce9bded43c8..e26a4c590362 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.130 2015/01/03 15:06:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.131 2015/04/21 14:09:22 calchan Exp $
+
+  21 Apr 2015; Denis Dupeyron <calchan@gentoo.org> -midori-0.5.5.ebuild:
+  Remove midori-0.5.5 because it depends on old and no longer maintained (by
+  upstream) vala-0.20. Bug #536594.
 
   03 Jan 2015; Michał Górny <mgorny@gentoo.org> midori-0.5.5.ebuild,
   midori-0.5.8-r1.ebuild, midori-0.5.8.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 58feb4c49cf3..0d3c479a9087 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,30 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
-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 2496 SHA256 ab374d5cb8208169c12ba8056fd1b706c15976a69a0ec045fa52a7d46db54918 SHA512 2bc368ec34708b746ab98a4342db0193ffbdbd9483f93e192f8fa4d0282e90eddeca1b11c6bbe3bc71a8447a1cda6a147914573b89a2a213f432e32ebbc69167 WHIRLPOOL 5300bdd5eafcff7726c299c0e6bdae0c278a8f363952b8bfab260ba1066b697d380fff1b478f2f9172d942db08d846c4f861b7f518b0623ff7a059e5c8e738ea
 EBUILD midori-0.5.8-r1.ebuild 3128 SHA256 c710d72a770368e6b512addf6eed9a007b4cf81340ea8754277b50fe50947bc1 SHA512 722ae5db6e5a64a0692c563e41bfd6493fbc5213980ebd77f5ab5eb5913db3b16de132bfbd19b832357fdaa46d9683ee0d95caedfd125fb7cf8c9c8f3b2ba4ef WHIRLPOOL fd789ea563dfdbe10e7cea53c59d342fdbb7fc4b1558262269ef1eed0402a3d28cce57c6c20767f1c5d95904984018c8f74a8baa881e0a350cc3b3742c62286f
 EBUILD midori-0.5.8.ebuild 3020 SHA256 7e972b98a27faa0a32107c3434d5196e90d7974f25c07e9dc0c107cb8710b164 SHA512 6596d556ae98d634b91ef6f3717943021d5ab5e0a52594ef74604756dacd73cdd34bfa8a057863fbe5f456d6bae2898cc2b8a3b493c66b8f39cdf7d37938bcff WHIRLPOOL 6c163c9da554cbadc151fc8e276a74d9b45c9970610b66fef9f3f3a501dae92e549a3546ad09fee4bddef4ff7db7d80ad70b13097d1a1f3b0c45370ea2041591
-MISC ChangeLog 19636 SHA256 e0277f48b7368dd8ad772a721ca08311cc4c49e1fdfefa9afb1fea1bfa513620 SHA512 7461ea1dda9ffc0bc781c3f21b866d6f9414631d7ccccbb6f43f0209ce742261eb586ef1f0e2354ecb9aa12e7abb76d412667da212ab471f2ca4f196ee65da77 WHIRLPOOL 2fe85c5cc46ec906a762f527fd267997fb77a1d7fac06a87c6216c96e628902e3c42f5a25d3d8c65fea0db3b7ae939aeba1e2a688891c0c737fc8102a0611b5c
-MISC metadata.xml 698 SHA256 e5159b309d3060133cc0776a8f5e936bf7bb27a8b4d382d122fc68c1d1745a35 SHA512 e8119fd0d98542eea6e654b1a33d9968ac385ab2d0a00b18908ac8d25dc6020251d905f1b8f272805082a78662ce192411394cdeed63ab1dab1bb680c7bae019 WHIRLPOOL 3d9a43fe94fd91851a1908f12fc1ba290603874bb3f9d0a609dd138b91f953fa0b608d82e5d629581df54b09231d05293e5aaad5b7e00d0d2d5a614dc1638b45
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUqAVmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgNcQANAKJHA1Nu9eTaPqPEMl6Y6V
-KAqCIwriy+Db25eDy1VlgCF/wLq07djVljcMsQJdYCorztO86PLN9bRZbOyMRPS5
-MhKPw1VaBbQgMfOpRbA3KIT/C/Fs0Ng5AYHeYDs+ve4uqlFVA9+wfU+bDW16P677
-MNnEaFj2ZzAHFsbBKt4nUbcwy1U6fHfbTxv/sNjEtUn5W4XEmnIz6hWcz87G7Ev5
-TqetWo+twYzvKmZqF/eQE4x6NmnEN+vDNfC57btOO94UoMaO3IFTdIkaQtGCMOKB
-HZTtwiySJmUFx4LXU9Ia1Rl1cQiZaLazstyBxBoKZWgCXADYTYgtCL+RIgHRDBBA
-nrV0kFNEXogbsn3rTPIWwfBwFbEGdekSRWvQwl/tUuq06jN7ZvCaT7L4Dl2dht0y
-2pZXIS6sGkGd4L5897vy2miXk1qJKQ8C+6mHGpu0cDz8kamyIt0wxT7lNX+5EGSb
-lin7MGF/lesW3KsyT8kVxf91/P7RxxjJVeO4DPxaFEfDFthtFPfkcx3zlANF8q5q
-pR38IztOtLuMPmOnzLQmEZiP1Of1EG68RMKsfNcIf4pWtf+JsQgDUs+7SWnriFA1
-4nkczoRFVbL3oGJBYVlkW59ziVf0QLH0Z56Alt9k1jtXGwKuW0m9t9o6evFT2Dpu
-ll0iMEheBKs4dUDoPlTl
-=oAbx
------END PGP SIGNATURE-----
+MISC ChangeLog 19824 SHA256 09840b1785f368d4efe7446442f7868e54f3cf81504bb4421632950cd60c2ebd SHA512 6bdade924dfefe0558c766de716bad8297d0f94424c521b206c9c5020c458813351819b7181032344ff153e6b5835021e8b12926557f90a2688668c8df35cb71 WHIRLPOOL f9f81a09d657a30436d69b726f196f8fa3a4bb8fc4ff3164b41cb1c758016c0aad7d9bfb35ccbeeef5065b6e7171e16c7caecccf7b86a60af82731643ec34996
+MISC metadata.xml 600 SHA256 d95e833c1eacf1d25e590e113e9c8e5070c708287992ec89b61aac7f03f16928 SHA512 17acff07ae7ee5fbfac9a8cb30202e7d497a1eae395eb83460352ad896f41eb47c010c45c452c8147f15cf9f04b1364f2eb2260f20547a21dee45d26a801666a WHIRLPOOL d223d4177a0885bd14079a55c439542acc102cddc6e36a14b68bb36d334e4ad33f44a1df28e74c3f1482ebe228acb7ca64c51838e02e1c2f28eecf5287aa92ce
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index a1f6f2460548..ead2b544d648 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -5,7 +5,6 @@
   <use>
     <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
     <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
-    <flag name='unique'>Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
     <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
     <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
diff --git a/www-client/midori/midori-0.5.5.ebuild b/www-client/midori/midori-0.5.5.ebuild
deleted file mode 100644
index ad7a47b36351..000000000000
--- a/www-client/midori/midori-0.5.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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.5 2015/01/03 15:06:12 mgorny Exp $
-
-EAPI=5
-
-MY_VALA_VERSION=0.20
-VALA_MIN_API_VERSION=${MY_VALA_VERSION}
-VALA_MAX_API_VERSION=${MY_VALA_VERSION}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
-	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
-fi
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 waf-utils vala ${_live_inherits}
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="doc +unique zeitgeist"
-
-RDEPEND=">=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.32.3
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.34:2.4
-	>=net-libs/libsoup-gnome-2.34:2.4
-	>=x11-libs/libnotify-0.7
-	x11-libs/libXScrnSaver
-	>=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}
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING README TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	# Force disabled because we don't have this custom renamed in Portage
-	sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	export VALAC_VERSION=${MY_VALA_VERSION}
-
-	strip-linguas -i po
-
-	waf-utils_src_configure \
-		--disable-docs \
-		$(use_enable doc apidocs) \
-		$(use_enable unique) \
-		--disable-granite \
-		--disable-gtk3 \
-		$(use_enable zeitgeist) \
-		--disable-webkit2
-}
-
-src_install() {
-	waf-utils_src_install
-
-	local jit_is_enabled
-	has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
-	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}