Remove USE="vala" because it's not ready to be stabilized yet. Stabilize for amd64/x86 wrt #344667.

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

3 files changed, 10 insertions, 93 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 9a688c05d88d..95262bebb48a 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.44 2010/11/08 02:45:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.45 2010/12/18 18:02:17 ssuominen Exp $
+
+  18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.9.ebuild:
+  Remove USE="vala" because it's not ready to be stabilized yet. Stabilize for
+  amd64/x86 wrt #344667.
 
   08 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> midori-9999.ebuild:
   Remove docdir sed from src_prepare because it was fixed upstream.
diff --git a/www-client/midori/midori-0.2.8.ebuild b/www-client/midori/midori-0.2.8.ebuild
deleted file mode 100644
index e7b8c5f217a1..000000000000
--- a/www-client/midori/midori-0.2.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.8.ebuild,v 1.6 2010/11/04 17:14:15 fauli Exp $
-
-EAPI=2
-inherit pax-utils eutils multilib python xfconf
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE="doc gnome +html idn libnotify nls +unique"
-
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	>=net-libs/libsoup-2.25.2
-	>=net-libs/webkit-gtk-1.1.1
-	>=dev-db/sqlite-3.0
-	dev-libs/libxml2
-	>=x11-libs/gtk+-2.10:2
-	gnome? ( net-libs/libsoup-gnome )
-	idn? ( net-dns/libidn )
-	unique? ( dev-libs/libunique )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-util/intltool
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	html? ( dev-python/docutils )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# moving docs to version-specific directory
-	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
-	sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c || die
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable html userdocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable unique) \
-		--disable-vala \
-		configure || die
-}
-
-src_compile() {
-	# This is from dev-libs/boost, keep it synced
-	jobs=$( echo " ${MAKEOPTS} " | \
-		sed -e 's/ --jobs[= ]/ -j /g' \
-		-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-		-e 's/ -j\>/ -j1/g' | \
-		( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi;
-		jobs="${j#-j}"; done; echo ${jobs} ) )
-	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi;
-
-	./waf build ${NUMJOBS} || die
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die
-	dodoc AUTHORS ChangeLog INSTALL TODO || die
-
-	pax-mark -m "${D}"/usr/bin/midori #338561
-}
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	ewarn "Midori tends to crash due to bugs in WebKit."
-	ewarn "Report bugs at http://www.twotoasts.de/bugs"
-}
diff --git a/www-client/midori/midori-0.2.9.ebuild b/www-client/midori/midori-0.2.9.ebuild
index ff571564bdc4..e37e53839894 100644
--- a/www-client/midori/midori-0.2.9.ebuild
+++ b/www-client/midori/midori-0.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9.ebuild,v 1.1 2010/11/01 19:41:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9.ebuild,v 1.2 2010/12/18 18:02:17 ssuominen Exp $
 
 EAPI=2
 inherit pax-utils eutils multilib python xfconf
@@ -11,8 +11,8 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="doc gnome +html idn libnotify nls +unique vala"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
+IUSE="doc gnome +html idn libnotify nls +unique"
 
 RDEPEND="libnotify? ( x11-libs/libnotify )
 	>=net-libs/libsoup-2.25.2
@@ -22,8 +22,7 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 	>=x11-libs/gtk+-2.10:2
 	gnome? ( net-libs/libsoup-gnome )
 	idn? ( net-dns/libidn )
-	unique? ( dev-libs/libunique )
-	vala? ( dev-lang/vala:0 )"
+	unique? ( dev-libs/libunique )"
 DEPEND="${RDEPEND}
 	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
 	dev-util/intltool
@@ -56,7 +55,7 @@ src_configure() {
 		$(use_enable libnotify) \
 		$(use_enable nls) \
 		$(use_enable unique) \
-		$(use_enable vala) \
+		--disable-vala \
 		configure || die
 }