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

(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 113 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/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
-}