x86 stable wrt #353346. punt old. use EAPI3

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

6 files changed, 15 insertions, 119 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/Manifest b/www-client/midori/Manifest
index ca920e8919ca..78f9343406de 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,29 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX midori-0.2.9-libnotify-0.7.patch 688 RMD160 329d7ada064e2825f6cfafe60fa4e19c003c17d1 SHA1 6c23d8ff63f12891eef0dd7cf1b12ba1de749ccb SHA256 603c99b9f0d745e6e80f87cd6b20438b6f11b081755e2061b2cea41b18f1b6b2
 DIST midori-0.2.9.tar.bz2 802627 RMD160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab SHA1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b SHA256 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
 DIST midori-0.3.0.tar.bz2 819092 RMD160 5285df356bae6d7668acfa43737664911ab5e5cc SHA1 8e2711efc45fa72902ef32516b4bbba205d7687c SHA256 56860b2eb2e5f223af0e64d103eef66c4b3574f4ed9a3cfd1ca20844563f0ae7
-EBUILD midori-0.2.9-r1.ebuild 2211 RMD160 f1b50bf0cd84927cca943d864d21cc65f34e516a SHA1 d0ff615d1fd705a173e8f9c1eb4fabe1f9e1564e SHA256 0a1a938ff652c419e43b881c9772d393b55f7234c40397f41e1269ed0487afd2
-EBUILD midori-0.2.9.ebuild 2367 RMD160 6931420a9205f21e432d5c5a33842173533ab227 SHA1 662f647254d0fdae3e2797cd4cabb6d75904cef0 SHA256 f94995cc4586ce41a6c5e5454e7b0e24302a4730d640dddd0d9800a2067bb053
-EBUILD midori-0.3.0.ebuild 2008 RMD160 50500216393a9b46c26a89e7abaccec48742e8ab SHA1 5ee999ac9aac722582681b96aa43c91c1342b132 SHA256 927dab148f96f40486054d62511bcdff0d28e692ec491669da59f762f5c96141
-EBUILD midori-9999.ebuild 2041 RMD160 f98b400feeb55ee43392853087fd34317ae0c72d SHA1 52dc4622814beb23d4c30b709829fe123c44aeaf SHA256 529f3c3af5944abcb3055080a76f610e651e3103a892094f9bbbe1b3e2bbcf7a
-MISC ChangeLog 7950 RMD160 24f47d83dfa7f980cbc33886339b8da4beebe350 SHA1 33bef6adaf55c4df31a38e573d96c07c5e4c7f7f SHA256 c4c1c581c62c734b81fd276542485f6d7ae67bf8c142bfece868f59b4d0b7660
+EBUILD midori-0.2.9-r1.ebuild 2211 RMD160 76bc6b53c54dd3b736ee73f8b55f8b98afe1826d SHA1 812291f10a4e71f8b688ed8571bb55b7889b3103 SHA256 a8e855bdb89fc9c8a9a2a52e028f5913fad58d673fb604dbf2ee7b2e58c54c55
+EBUILD midori-0.3.0.ebuild 2008 RMD160 b4931915159431a1be7ca53ca1d63cadcf1f0c56 SHA1 59c814dc623810801df84e5c8967d79f25fe7652 SHA256 ba4a5cb2feaf1767f9ca1adc0f0d523edbe23c8693ef422a2eeef6ee8110a688
+EBUILD midori-9999.ebuild 2041 RMD160 2c2936fe9083f8d1034a86cfe7e00efb08aa93f8 SHA1 71eda1a1f81ee4e6ceb4490ed2b0ab9ff0fd5059 SHA256 4e8474a65f189d69b8c3eca474b67a141ed419819ade8c9ac0e3d9f0f61ae753
+MISC ChangeLog 8055 RMD160 3d85905ac083e9c490abf6b0ebc9c633d22ca2ba SHA1 320f07664571e5fd619473b8aa44d86858f1f8ab SHA256 ec8d9cf5daa7e436c062d61563cada091745e8b949864dd182c07ee5db18832c
 MISC metadata.xml 421 RMD160 6cfe519ed62f8c3bf6061b0b263e59d7cea5e7b7 SHA1 ab68b240603bd56ea6d93521b50f58f150d9bf73 SHA256 f018e2038f1bcab47a1d1bd0acfb1f8f309481e70dbee9693b7605b9f4cebdfd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNSFKbAAoJEPqDWhW0r/LCah8P/1lV0FDI0c3AWEJg8+2EmFk+
-SBnHLATSrnxC7NkRmL3j59GlMRbUcKnH+YVQqB6vX0Cozp4TrlGtyzhq/bxtHlAo
-FwdF/DOCYJlaz04lQezZYdCW6Wwwa1E358rXYUlTzNOKAOL+0eFBpUyJyCJCY7vF
-/KPLX7Ds1x+/K/L5PXjsenUOOQewbmhU8M4AW/beLD6PHuwqXfnwbnB6kSUcmpVy
-JPt5Pfa0zSFS08UnX/DLqSpTXE0eoboq2CSn6pX6vbMzchJKYU1tm2yZnor4sLa0
-503Agco6mpbXEnjxO98WO8klFolTdvenrHlw9cF3VkLZAWTNUev7l6TCUKGr5NZR
-OsXFYUUQHiuGc4yoL0F2pQTQ+7UU1NPxfNHb9WNzg/fcBGe4QMs4BKQeiErqhNSC
-jKYKZuZPvmOBvr+pLBW2jzeeXkyuH1oRHSjpOAnRlDMtdnLTx3gBPnQJNJU845zJ
-gcn10JVpXY/J6pJYHEE1z0FXE2AXmcfAQmM8TKv0tzbLwI6km7wS3j9qSqPRlNBc
-n/At/WL8one21qtnv6yD+V5NUeUIOCcXPZHCw+zbCUrR5c5STpWj7LkTL972yfyX
-MskEQSCMwswu8GJb0ml/tS9OQV08iUzlFdbFyNAIBcDYKFgrqK1ZuF5C5nnTrnNN
-x8DG/Xb5KYFg9utpImtC
-=SOnN
------END PGP SIGNATURE-----
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+"