summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-31 15:03:48 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-31 15:03:48 +0000
commit3667dcf157b409a6d68dab465b383d4a35dd0941 (patch)
tree4876a704b8604d13ec9baf4c66da9e85e32eef55 /www-client/midori
parentMarking acl-2.2.49 ppc64 for bug 308049 (diff)
downloadgentoo-2-3667dcf157b409a6d68dab465b383d4a35dd0941.tar.gz
gentoo-2-3667dcf157b409a6d68dab465b383d4a35dd0941.tar.bz2
gentoo-2-3667dcf157b409a6d68dab465b383d4a35dd0941.zip
Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/ChangeLog6
-rw-r--r--www-client/midori/midori-0.2.2.ebuild71
-rw-r--r--www-client/midori/midori-0.2.4.ebuild13
-rw-r--r--www-client/midori/midori-9999.ebuild15
4 files changed, 24 insertions, 81 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 3ab79d999cb5..5918aedfd41e 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.27 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.28 2010/03/31 15:03:48 ssuominen Exp $
+
+ 31 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.4.ebuild,
+ midori-9999.ebuild:
+ Use Python 2.x instead of Python 3.x for ./waf wrt #302555.
10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.4.ebuild,
midori-9999.ebuild:
diff --git a/www-client/midori/midori-0.2.2.ebuild b/www-client/midori/midori-0.2.2.ebuild
deleted file mode 100644
index 71698b620390..000000000000
--- a/www-client/midori/midori-0.2.2.ebuild
+++ /dev/null
@@ -1,71 +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.2.ebuild,v 1.3 2010/01/20 17:56:04 darkside Exp $
-
-EAPI=2
-inherit xfconf multilib
-
-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 +sqlite +unique"
-
-RDEPEND="libnotify? ( x11-libs/libnotify )
- >=net-libs/libsoup-2.25.2
- >=net-libs/webkit-gtk-1.1.1
- dev-libs/libxml2
- >=x11-libs/gtk+-2.10:2
- gnome? ( net-libs/libsoup[gnome] )
- idn? ( net-dns/libidn )
- sqlite? ( >=dev-db/sqlite-3.0 )
- unique? ( dev-libs/libunique )"
-
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-util/intltool
- dev-util/pkgconfig
- doc? ( dev-util/gtk-doc )
- html? ( dev-python/docutils )
- nls? ( sys-devel/gettext )"
-
-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() {
- 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 nls) \
- $(use_enable sqlite) \
- $(use_enable unique) \
- configure || die "configure failed"
-}
-
-src_compile() {
- NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
- ./waf build ${NUMJOBS} || die "build failed"
-}
-
-src_install() {
- DESTDIR=${D} ./waf install || die "install failed"
- dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
-}
-
-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.4.ebuild b/www-client/midori/midori-0.2.4.ebuild
index d443c84fcd91..0dc409bd465a 100644
--- a/www-client/midori/midori-0.2.4.ebuild
+++ b/www-client/midori/midori-0.2.4.ebuild
@@ -1,9 +1,12 @@
# 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.4.ebuild,v 1.2 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.4.ebuild,v 1.3 2010/03/31 15:03:48 ssuominen Exp $
EAPI=2
-inherit eutils xfconf multilib
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils multilib python xfconf
DESCRIPTION="A lightweight web browser based on WebKitGTK+"
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -23,15 +26,17 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
idn? ( net-dns/libidn )
sqlite? ( >=dev-db/sqlite-3.0 )
unique? ( dev-libs/libunique )"
-
DEPEND="${RDEPEND}
- dev-lang/python
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
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 296f7cf580c1..80752e267669 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,9 +1,12 @@
# 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-9999.ebuild,v 1.14 2010/03/10 15:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.15 2010/03/31 15:03:48 ssuominen Exp $
-EAPI="2"
-inherit eutils xfconf multilib git
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils multilib python xfconf git
DESCRIPTION="A lightweight web browser"
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -25,14 +28,16 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
idn? ( net-dns/libidn )
sqlite? ( >=dev-db/sqlite-3.0 )
unique? ( dev-libs/libunique )"
-
DEPEND="${RDEPEND}
- dev-lang/python
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