ssuominen    14/03/29 13:22:14

  Modified:             metadata.xml ChangeLog
  Added:                midori-0.5.7.ebuild
  Log:
  Version bump wrt #492214 and add USE="granite" wrt #490040. Thanks to "A. 
Person" for reporting both bugs.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
4868F14D)

Revision  Changes    Path
1.16                 www-client/midori/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.16&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?rev=1.16&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/metadata.xml?r1=1.15&r2=1.16

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/metadata.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- metadata.xml        12 Mar 2013 10:23:53 -0000      1.15
+++ metadata.xml        29 Mar 2014 13:22:13 -0000      1.16
@@ -4,6 +4,7 @@
   <herd>xfce</herd>
   <use>
     <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of 
external plugins like adobe-flash</flag>
+    <flag name='granite'>Enable support for the elementary library 
<pkg>dev-libs/granite</pkg></flag>
     <flag name='unique'>Enable single instance support using 
<pkg>dev-libs/libunique</pkg></flag>
     <flag name='zeitgeist'>Add support for Zeitgeist event tracking 
system</flag>
     <flag name='webkit2'>Enable WebKit2 API that splits web content rendering 
and application UI into separate processes</flag>



1.120                www-client/midori/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.120&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.120&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.119&r2=1.120

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog   4 Mar 2014 20:22:12 -0000       1.119
+++ ChangeLog   29 Mar 2014 13:22:13 -0000      1.120
@@ -1,6 +1,13 @@
 # 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.119 
2014/03/04 20:22:12 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.120 
2014/03/29 13:22:13 ssuominen Exp $
+
+*midori-0.5.7 (29 Mar 2014)
+
+  29 Mar 2014; Samuli Suominen <[email protected]>
+  +files/midori-0.5.7-underlinking.patch, +midori-0.5.7.ebuild, metadata.xml:
+  Version bump wrt #492214 and add USE="granite" wrt #490040. Thanks to "A.
+  Person" for reporting both bugs.
 
   04 Mar 2014; Vicente Olivert Riera <[email protected]> midori-0.5.5.ebuild:
   Add ~mips keyword.



1.1                  www-client/midori/midori-0.5.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.7.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.5.7.ebuild?rev=1.1&content-type=text/plain

Index: midori-0.5.7.ebuild
===================================================================
# 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.7.ebuild,v 1.1 
2014/03/29 13:22:13 ssuominen Exp $

EAPI=5

VALA_MIN_API_VERSION=0.16

PYTHON_COMPAT=( python2_7 )

unset _live_inherits

if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
        _live_inherits=git-2
else
        KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
        
SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2";
fi

inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala 
${_live_inherits}

DESCRIPTION="A lightweight web browser based on WebKitGTK+"
HOMEPAGE="http://www.midori-browser.org/";

LICENSE="LGPL-2.1 MIT"
SLOT="0"
IUSE="deprecated doc granite +jit +webkit2 zeitgeist"

RDEPEND=">=dev-db/sqlite-3.6.19:3
        >=dev-libs/glib-2.32.3
        dev-libs/libxml2
        >=net-libs/libsoup-2.38:2.4
        >=net-libs/libsoup-gnome-2.38:2.4
        >=x11-libs/libnotify-0.7
        x11-libs/libXScrnSaver
        deprecated? (
                >=net-libs/webkit-gtk-1.8.1:2[jit=]
                >=x11-libs/gtk+-2.24:2
                )
        !deprecated? (
                >=app-crypt/gcr-3
                x11-libs/gtk+:3
                webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
                !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
                )
        granite? ( >=dev-libs/granite-0.2 )
        zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        $(vala_depend)
        dev-util/intltool
        gnome-base/librsvg
        sys-devel/gettext
        doc? ( dev-util/gtk-doc )"
REQUIRED_USE="webkit2? ( !deprecated )"

pkg_setup() {
        python-any-r1_pkg_setup
}

src_unpack() {
        if [[ ${PV} == *9999* ]]; then
                git-2_src_unpack
        else
                default
        fi
}

src_prepare() {
        vala_src_prepare
        sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt 
|| die
        epatch "${FILESDIR}"/${P}-underlinking.patch
}

src_configure() {
        strip-linguas -i po

        local mycmakeargs=(
                -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
                $(cmake-utils_use_use doc APIDOCS)
                $(cmake-utils_use_use granite)
                $(cmake-utils_use_use zeitgeist)
                -DVALA_EXECUTABLE="${VALAC}"
                )

        if use deprecated; then
                mycmakeargs+=(
                        -DUSE_GTK3=OFF
                        -DHALF_BRO_INCOM_WEBKIT2=OFF
                        )
        else
                mycmakeargs+=(
                        -DUSE_GTK3=ON
                        $(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
                        )
        fi

        cmake-utils_src_configure
}

src_install() {
        cmake-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
        [[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} 
#480290
}

pkg_preinst() {
        gnome2_icon_savelist
}

pkg_postinst() {
        fdo-mime_desktop_database_update
        fdo-mime_mime_database_update
        gnome2_icon_cache_update
}

pkg_postrm() {
        fdo-mime_desktop_database_update
        fdo-mime_mime_database_update
        gnome2_icon_cache_update
}




Reply via email to