Version bump wrt #492214 and add USE="granite" wrt #490040. Thanks to "A. Person" for reporting both bugs.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 173 insertions, 6 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 6b02d9632131..859a3b2d4b42 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -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 <ssuominen@gentoo.org>
+  +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 <vincent@gentoo.org> midori-0.5.5.ebuild:
   Add ~mips keyword.
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 75cefbd1b318..c1b8b2293066 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,14 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX midori-0.5.7-underlinking.patch 837 SHA256 11065119b35ce81d9d66aaf99ba5481dc81d94f5e897d36670390a6a53038d0b SHA512 e789531ac9d8d9f200daed2a9f914932d909e5d575f7ca55f2c1d8762f2b631d600d992caa933999a6e0c3d6d1782ce5bda431cfc5e58338a9ce8100188ecdfe WHIRLPOOL 3f05e6cd8d5aaee885c2d32c864e5b58a1e79e54e13f6691cc228b554844d33a4469102eabf1880c67f470467d689da098abdd464c1d34d70dfbe6031f87a669
 DIST midori_0.5.5_all_.tar.bz2 1092309 SHA256 ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62 SHA512 89d1ddb461af460a83744cc761989d430750dcef9565ac98960c1c87e6082ebb35e61c4f21f28891a19119e2733dc8a6440bc51c0bd206c37ac068e434fc0231 WHIRLPOOL 699cf9792b6ce070cdaa29fe06db3c6d75bca23797252028925e1bee5a66704881653c39e2257bfcb861d4c82205605f2d4f38e8b708d559318284af81e1a73a
+DIST midori_0.5.7_all_.tar.bz2 1191260 SHA256 2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d SHA512 493ace56d144d8b554e1dcd9d93f3ab97167b42f12190418a59b49ae7354a60be89c2611eaee728832f8acec417fe8759f00a0a6a1b210a4896557012e79286a WHIRLPOOL d28b5893f05c482218f569ee1996b74f77b3401ada9e6e77c674fc9b1c486af3ca9d1c38583e80ddf126d90b6b7b223c21f1e2ca1e78e20c756f3762430aaa08
 EBUILD midori-0.5.5.ebuild 2855 SHA256 24dea6b9956b93cdcce0466549069dec43ceaa49417e64e2b3228a4a610040e0 SHA512 ebb5c8aad0bab9dc07556cb2d4dcec8980817ef9f479d8ff44869b365d3c3ba98f9d9bcccc21be8ee5e767545a91013621a8853cff19a913b5e48a8e62766fa1 WHIRLPOOL acf03627e0760a2e94f1c9f57fef0b537796bd70b2df5ead8952e4715aca21a0b0392d18ba02395b603c3171c313980ebca4c6c5912bee0b1a68d82f8f34c14d
-MISC ChangeLog 17624 SHA256 e54528b240f1fceef7e74ade76ca8d75f83ce455e2b9e22bea8e63d85edd1224 SHA512 3d1a0fb4ccea2b986cc88dbf3017a33098d659ca619ab8c5779e5f16d66e0a35e375bd47da7d7b44b8d8ecee62d13b6182c36f1bd36bc3caa0add4efe2194db3 WHIRLPOOL 02093babadd671258b81c20b609c3b597413109428de6d93a4ab994bf0ec576ac0f565f287a5a71f68f73dda654e2fddb6fd00b5c5961e0edd2911e249112f54
-MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
+EBUILD midori-0.5.7.ebuild 2858 SHA256 d4c03ce1dfc2824bd5d1efa6db52995c2d5e8238052a0bcc21df5a3b93588e84 SHA512 04497520aac0ca8082ae98613a2c5f87192db7146bae6f6bcadd33e974b8d10b606290a0f2e4d9b1272b2903b0095d9ddbfcba62a995ee91e0885e3c704691d6 WHIRLPOOL 1e15ed4ac6ba5010b69f20b43513b930b0b98e6c3b5cb947cfdb7bc72d7f05a29472212376aada5de05b6a7af4e1f91aba90894605a9e3a60a44fb4b6076fc00
+MISC ChangeLog 17899 SHA256 d9a2900a3d847e562fd4b98e6496eeb85fe38a4eb6b61e846ec9ee207d015e80 SHA512 b99b9033d7c70267a76ca0d7e591f28fdd672d56e6cd6f665469fe760977498a4f1e227989ed37899cb14f837edd258d06d463ea757f0b453fb5469852c8fa7e WHIRLPOOL d7ec95150e65dee7a653e8b724f28ac6f953b2def4e6874da16b20dddb11b2ad794c360761643037f8e7e71655f0f512f085d0243ba6c9e3923a64de0fe94215
+MISC metadata.xml 698 SHA256 e5159b309d3060133cc0776a8f5e936bf7bb27a8b4d382d122fc68c1d1745a35 SHA512 e8119fd0d98542eea6e654b1a33d9968ac385ab2d0a00b18908ac8d25dc6020251d905f1b8f272805082a78662ce192411394cdeed63ab1dab1bb680c7bae019 WHIRLPOOL 3d9a43fe94fd91851a1908f12fc1ba290603874bb3f9d0a609dd138b91f953fa0b608d82e5d629581df54b09231d05293e5aaad5b7e00d0d2d5a614dc1638b45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMWNfoACgkQWunnsum7y6j2EgCgmVbxJQNw0H+Wv53yT6MQ/cO6
-HVcAoIii4c3guJ9Srg+nlWCh4ioZnLkg
-=Jzux
+iQEcBAEBCAAGBQJTNsfSAAoJEEdUh39IaPFNt0oIAJxth4PSTi0U53bLjSjfJh+Z
+yUretmBW6mBT5tDq/CW9J46nsXYJ+g2iMkMewsL+XUdjnJiYtCcYh9XmxuH+9r0n
+h93l8NwnX+ukZ3DaWZHag25nSirwZe0Bg1c1Z8uz7nKaBLO9/TSuQCAw41x6Oq0H
+ZUOpr//YANGIpKOPtPu+wzrZ4avD6q0UIhVEWUp6Mm7167hdvGfES0kHggunpzSm
+8K/aqF1mU7UZdscri8GspVK5cRS2vXKfsKz5Ryqg1SBgo1hPXTTtUnVa5rh9GZhc
+fTTB0mGCw7ZzC5lEMb8/Z0bN1EtPTyZRZ5E/o4vCM9O0Stq45LOHvdNFMkFc/T4=
+=Iciq
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/files/midori-0.5.7-underlinking.patch b/www-client/midori/files/midori-0.5.7-underlinking.patch
new file mode 100644
index 000000000000..b4e77a50a455
--- /dev/null
+++ b/www-client/midori/files/midori-0.5.7-underlinking.patch
@@ -0,0 +1,23 @@
+midori/sokoke.c is using XGetWindowProperty() and XFree(), therefore link against -lX11 to prevent
+underlinking failures like "error: undefined reference to 'XGetWindowProperty'" and
+"error: undefined reference to 'XFree'"
+
+$ ld -v 
+GNU gold (GNU Binutils 2.24) 1.11
+    ^^^^
+
+$ emerge --info |grep LDFLAGS
+LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+                 ^^^^^^^^^^^^^^^
+
+--- midori-0.5.7.orig/CMakeLists.txt	2014-01-15 22:43:34.000000000 +0200
++++ midori-0.5.7/CMakeLists.txt	2014-03-29 13:06:16.714114071 +0200
+@@ -77,7 +77,7 @@
+     find_library (XSS Xss /usr/lib/X11R6/lib)
+     if (SCRNSAVER AND XSS)
+         add_definitions("-DHAVE_X11_EXTENSIONS_SCRNSAVER_H")
+-        set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS}")
++        set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11}")
+     endif ()
+ endif ()
+ 
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index d836e153bfa5..a1f6f2460548 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -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>
diff --git a/www-client/midori/midori-0.5.7.ebuild b/www-client/midori/midori-0.5.7.ebuild
new file mode 100644
index 000000000000..28882cbbddfd
--- /dev/null
+++ b/www-client/midori/midori-0.5.7.ebuild
@@ -0,0 +1,129 @@
+# 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
+}