x86 stable wrt #353346. punt old. use EAPI3

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

5 files changed, 11 insertions, 94 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 2d02f95486b2..9b56ce0c022b 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.49 2011/02/01 18:37:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.50 2011/02/05 12:46:32 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.9-r1.ebuild:
+  x86 stable wrt #353346
 
   01 Feb 2011; Markos Chandras <hwoarang@gentoo.org> midori-0.2.9-r1.ebuild:
   Stable on amd64 wrt bug #353346
diff --git a/www-client/midori/midori-0.2.9-r1.ebuild b/www-client/midori/midori-0.2.9-r1.ebuild
index 0a85f8df8ae6..c16b6f3b4c5d 100644
--- a/www-client/midori/midori-0.2.9-r1.ebuild
+++ b/www-client/midori/midori-0.2.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.4 2011/02/01 18:37:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild,v 1.5 2011/02/05 12:46:32 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils multilib python xfconf
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
 IUSE="doc gnome +html idn libnotify nls +unique"
 
 RDEPEND="libnotify? ( x11-libs/libnotify )
diff --git a/www-client/midori/midori-0.2.9.ebuild b/www-client/midori/midori-0.2.9.ebuild
deleted file mode 100644
index 3e303259f184..000000000000
--- a/www-client/midori/midori-0.2.9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 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.3 2011/01/30 21:19:32 ssuominen 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-0.7 )
-	>=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:/${PN}/user/midori.html:/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)" \
-		--docdir="/usr/share/doc/${PF}/html" \
-		--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.3.0.ebuild b/www-client/midori/midori-0.3.0.ebuild
index 0a0614849a2d..3481f6ba387e 100644
--- a/www-client/midori/midori-0.3.0.ebuild
+++ b/www-client/midori/midori-0.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.0.ebuild,v 1.2 2011/01/31 21:39:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.3.0.ebuild,v 1.3 2011/02/05 12:46:32 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils multilib python xfconf
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index d2907e0253c7..56464cb046ff 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.25 2011/01/31 21:39:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.26 2011/02/05 12:46:32 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils multilib python xfconf git
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"