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

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

4 files changed, 12 insertions, 97 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/Manifest b/www-client/midori/Manifest
index bcf59c15bcae..a76ef28145bc 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,7 +1,5 @@
-DIST midori-0.2.8.tar.bz2 790455 RMD160 918c2da8c1c6dbf1dd9eb8c01f8570a8497b32e6 SHA1 0c74ef13a2e104a17307f82d41d45b642f794ae7 SHA256 1f91829a036f28c55c15538545ede2c195685a01075dc01c88741996cf098be1
 DIST midori-0.2.9.tar.bz2 802627 RMD160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab SHA1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b SHA256 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
-EBUILD midori-0.2.8.ebuild 2390 RMD160 f0075f2e9544988e47c6b1a6a50ff5cde179be25 SHA1 ca8a4c79e2cede053635467362ef40684d20f509 SHA256 3f3c235b3cb563d515859c3b754c162bc47f320f79733149c2bdf6e6a7f177ca
-EBUILD midori-0.2.9.ebuild 2400 RMD160 f2c2291d90740ebcf740ff1ea36ad3b93293149e SHA1 34aee0d7a35ee9b97f036b6741c84372dcabcc4a SHA256 8dca277f9189e08eb10d6b67ff31a1f091d52acede6f9028c43295973a3b5b26
+EBUILD midori-0.2.9.ebuild 2362 RMD160 d5feb65f7afe6dd96ef18bb2a1323e2308ebbdab SHA1 959a2cb7790d836619ae92881b352e122ef7a24e SHA256 f19af53e5ee3cef03f7c39427a3589e5e8fc498fb95abe155aba3f1eb565ab4c
 EBUILD midori-9999.ebuild 2243 RMD160 309b40d2eacf1123b655353ba8b38866d248ecbf SHA1 175aed4d18f259a15a0bb71d75d6357688ee9104 SHA256 db02232374c1e522ca6e9ac706672b7743e08c3840a9b33f897356961f9d9541
-MISC ChangeLog 7182 RMD160 9aa467568bae74f516a2d54aee51e7e7058b44ad SHA1 c4e9111d3e0b21c51644244c8a24820f6b550b03 SHA256 a95d8c1ff4cd9b374dd39d2bd0b01b2af3ac460b6859a65273ca74068400739b
+MISC ChangeLog 7362 RMD160 d95d9cb2ca4e689a95cb50745ee9701ccc974ca9 SHA1 444a7a203f4f1ab373837a6d0a43b63b3c67d7a7 SHA256 6cd374c1d04a63dad3f024cfca1aff34cf35e5e3cba3bd90090c3249829c69fb
 MISC metadata.xml 421 RMD160 6cfe519ed62f8c3bf6061b0b263e59d7cea5e7b7 SHA1 ab68b240603bd56ea6d93521b50f58f150d9bf73 SHA256 f018e2038f1bcab47a1d1bd0acfb1f8f309481e70dbee9693b7605b9f4cebdfd
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
 }