ssuominen 14/04/07 16:59:24 Modified: midori-0.5.5.ebuild ChangeLog Log: Remove GTK+-3.x and WebKit2 support from 0.5.5 since it doesn't build with latest GTK+-3.x anymore, and 0.5.5 is by design a legacy version for people having problems with 0.5.8. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.3 www-client/midori/midori-0.5.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.5.ebuild?r1=1.2&r2=1.3 Index: midori-0.5.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- midori-0.5.5.ebuild 4 Mar 2014 20:22:12 -0000 1.2 +++ midori-0.5.5.ebuild 7 Apr 2014 16:59:24 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.5.ebuild,v 1.2 2014/03/04 20:22:12 vincent Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.5.ebuild,v 1.3 2014/04/07 16:59:24 ssuominen Exp $ EAPI=5 @@ -27,7 +27,7 @@ LICENSE="LGPL-2.1 MIT" SLOT="0" -IUSE="+deprecated doc +unique webkit2 zeitgeist" +IUSE="doc +unique zeitgeist" RDEPEND=">=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 @@ -36,18 +36,9 @@ >=net-libs/libsoup-gnome-2.34:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver - deprecated? ( - >=net-libs/webkit-gtk-1.8.3:2 - >=x11-libs/gtk+-2.24:2 - unique? ( dev-libs/libunique:1 ) - ) - !deprecated? ( - >=app-crypt/gcr-3 - >=net-libs/webkit-gtk-1.10.2:3 - x11-libs/gtk+:3 - unique? ( dev-libs/libunique:3 ) - webkit2? ( >=net-libs/webkit-gtk-2 ) - ) + >=net-libs/webkit-gtk-1.8.3:2 + >=x11-libs/gtk+-2.24:2 + unique? ( dev-libs/libunique:1 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )" DEPEND="${RDEPEND} ${PYTHON_DEPS} @@ -84,28 +75,21 @@ strip-linguas -i po - local myconf - use deprecated || myconf="$(use_enable webkit2)" - waf-utils_src_configure \ --disable-docs \ $(use_enable doc apidocs) \ $(use_enable unique) \ --disable-granite \ - $(use_enable !deprecated gtk3) \ + --disable-gtk3 \ $(use_enable zeitgeist) \ - ${myconf} + --disable-webkit2 } src_install() { waf-utils_src_install local jit_is_enabled - if use deprecated; then - has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes - else - has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes - fi + has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290 } 1.126 www-client/midori/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.126&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.126&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.125&r2=1.126 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- ChangeLog 7 Apr 2014 15:23:37 -0000 1.125 +++ ChangeLog 7 Apr 2014 16:59:24 -0000 1.126 @@ -1,6 +1,11 @@ # ChangeLog for www-client/midori # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.125 2014/04/07 15:23:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.126 2014/04/07 16:59:24 ssuominen Exp $ + + 07 Apr 2014; Samuli Suominen <[email protected]> midori-0.5.5.ebuild: + Remove GTK+-3.x and WebKit2 support from 0.5.5 since it doesn't build with + latest GTK+-3.x anymore, and 0.5.5 is by design a legacy version for people + having problems with 0.5.8. 07 Apr 2014; Samuli Suominen <[email protected]> midori-0.5.8.ebuild: Make USE="granite" which pulls GTK+-3.x dev-libs/granite depend on
