public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-12-02 16:15 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-12-02 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     51e1a1112b3bca5bef16f7d23b7f78c1f92c41eb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 16:13:45 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 16:15:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e1a111

www-client/midori: Bump to 7.0

Closes: https://bugs.gentoo.org/670192
Closes: https://bugs.gentoo.org/670270
Closes: https://bugs.gentoo.org/670354
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/Manifest          |  1 +
 www-client/midori/midori-7.0.ebuild | 62 +++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 7e27f724eb4..2ab860caa96 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,2 +1,3 @@
 DIST midori-v6.0.tar.gz 1823209 BLAKE2B dd00bef8da638d993c9918e991fa4f65d79b9f0d736b865895fae94f7f9d7552d671bda38cff933e65b7017cadfb810b7c180e00ba4e6f26abd471affc4cd903 SHA512 2b3e4808b1297a3ef8436b45ac38782e070658a0ecc62bcf8d0b2cf49f256cdad799ccc5d28df11ff595c042e8474fa2e87065d9a89cdb5a936237c44fdfd9e7
+DIST midori-v7.0.tar.gz 1827341 BLAKE2B e008be32851a3ee12744b7b4e686545a2f9cd84fc6f05a647744c512ea5286fdc1db3b1ec40f546208ffbca4ca8a179752f27b85d9060765a7612ac7c260c67f SHA512 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
 DIST midori_0.5.11_all_.tar.bz2 1428791 BLAKE2B c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5 SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d

diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
new file mode 100644
index 00000000000..b3558ed38a0
--- /dev/null
+++ b/www-client/midori/midori-7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.36
+
+inherit cmake-utils eapi7-ver gnome2-utils vala xdg-utils
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3:=[gtk,vala]
+	>=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.48.0:2
+	dev-libs/libpeas[gtk]
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4[vala]
+	>=net-libs/webkit-gtk-2.16.6:4[introspection,opengl]
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/gtk+-3.12.0:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	vala_src_prepare
+	sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2021-12-26 21:03 Arthur Zamarin
  0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2021-12-26 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     46b4e80eeece9c7e2d35a1e4f627a28a3b78b68e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 21:03:26 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 21:03:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b4e80e

www-client/midori: Keyword 9.0 arm64, #829495

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 www-client/midori/midori-9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
index ffc74fa3d240..f51826c5e0f5 100644
--- a/www-client/midori/midori-9.0.ebuild
+++ b/www-client/midori/midori-9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2021-09-28 14:53 Yixun Lan
  0 siblings, 0 replies; 25+ messages in thread
From: Yixun Lan @ 2021-09-28 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c03aca981e4f3ce0b290700f719497055197bba4
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 28 14:37:27 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 14:52:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03aca98

www-client/midori: keyword ~riscv

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 www-client/midori/midori-9.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
index 75a58cf254d..ffc74fa3d24 100644
--- a/www-client/midori/midori-9.0.ebuild
+++ b/www-client/midori/midori-9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
+KEYWORDS="amd64 ~arm ~mips ~riscv x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2019-09-13  5:11 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2019-09-13  5:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6bdd864a5abf368099e1f83af131c7cd45ef7890
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 05:04:26 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 05:10:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdd864a

www-client/midori: Bump to 9.0

Closes: https://bugs.gentoo.org/680514
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/Manifest          |  1 +
 www-client/midori/midori-9.0.ebuild | 64 +++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 0f2f13542e9..a72fbadeaae 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1 +1,2 @@
 DIST midori-v7.0.tar.gz 1827341 BLAKE2B e008be32851a3ee12744b7b4e686545a2f9cd84fc6f05a647744c512ea5286fdc1db3b1ec40f546208ffbca4ca8a179752f27b85d9060765a7612ac7c260c67f SHA512 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
+DIST midori-v9.0.tar.gz 1902467 BLAKE2B 0a6b46bddd0286c56d3f30b429dc46f90177931f8c596912183ed990124b831b5407807e2693e3b5e0d02074386b46e98823b33f6e785963b9507742bac58763 SHA512 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3

diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
new file mode 100644
index 00000000000..436f97ec9ee
--- /dev/null
+++ b/www-client/midori/midori-9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.36
+
+inherit cmake-utils vala xdg-utils
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="https://www.midori-browser.org/"
+SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/libarchive:=
+	>=app-crypt/gcr-3:=[gtk,vala]
+	>=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.46.2:2
+	>=dev-libs/json-glib-0.12
+	dev-libs/libpeas[gtk]
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4[vala]
+	>=net-libs/webkit-gtk-2.16.6:4[introspection]
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/gtk+-3.12.0:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	vala_src_prepare
+	sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2019-04-07 14:43 Mikle Kolyada
  0 siblings, 0 replies; 25+ messages in thread
From: Mikle Kolyada @ 2019-04-07 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ec91eaf067a957482a7d96ef6912fdbc0c6bdc03
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 14:42:13 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 14:42:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec91eaf0

www-client/midori: x86 stable wrt bug #682814

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 www-client/midori/midori-7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
index 23c23fd979b..c5ef2c486c5 100644
--- a/www-client/midori/midori-7.0.ebuild
+++ b/www-client/midori/midori-7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2019-04-07 14:41 Mikle Kolyada
  0 siblings, 0 replies; 25+ messages in thread
From: Mikle Kolyada @ 2019-04-07 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6548da22b8ac7e6834fbe749a89dcdca5c34c2c2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 14:40:32 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 14:40:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6548da22

www-client/midori: amd64 stable wrt bug #682814

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 www-client/midori/midori-7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
index 53dc024ca0a..23c23fd979b 100644
--- a/www-client/midori/midori-7.0.ebuild
+++ b/www-client/midori/midori-7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips ~x86"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2019-02-27  4:25 Aaron Bauman
  0 siblings, 0 replies; 25+ messages in thread
From: Aaron Bauman @ 2019-02-27  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     220dcbb08658728181efc56b54299d1851b25b20
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Feb 25 18:43:20 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 04:21:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220dcbb0

www-client/midori: use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11159
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 www-client/midori/midori-0.5.11-r2.ebuild | 4 ++--
 www-client/midori/midori-0.5.11-r3.ebuild | 4 ++--
 www-client/midori/midori-6.0.ebuild       | 4 ++--
 www-client/midori/midori-7.0.ebuild       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index 7cc8c2fa4e8..ac0b850f894 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ VALA_MAX_API_VERSION=0.34
 inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
+HOMEPAGE="https://www.midori-browser.org/"
 SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
 
 KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"

diff --git a/www-client/midori/midori-0.5.11-r3.ebuild b/www-client/midori/midori-0.5.11-r3.ebuild
index 5fd35eecf3b..7d195ae23f6 100644
--- a/www-client/midori/midori-0.5.11-r3.ebuild
+++ b/www-client/midori/midori-0.5.11-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ VALA_MIN_API_VERSION=0.36
 inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
+HOMEPAGE="https://www.midori-browser.org/"
 SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
 
 KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"

diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
index 437d8436c03..e344c721d0e 100644
--- a/www-client/midori/midori-6.0.ebuild
+++ b/www-client/midori/midori-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eapi7-ver eutils gnome2-utils vala xdg-utils
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
+HOMEPAGE="https://www.midori-browser.org/"
 SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"

diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
index 245ab2581f0..53dc024ca0a 100644
--- a/www-client/midori/midori-7.0.ebuild
+++ b/www-client/midori/midori-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eapi7-ver gnome2-utils vala xdg-utils
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
+HOMEPAGE="https://www.midori-browser.org/"
 SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-12-02 16:32 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-12-02 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ae85dcb8d5e74e43cfd85726fca2dbd15d86235e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  2 16:21:18 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  2 16:32:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae85dcb8

www-client/midori: Remove webkit-gtk[opengl] dep

Remove the opengl USE-dep on webkit-gtk since leio says it is wrong.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/midori-7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/midori/midori-7.0.ebuild b/www-client/midori/midori-7.0.ebuild
index b3558ed38a0..245ab2581f0 100644
--- a/www-client/midori/midori-7.0.ebuild
+++ b/www-client/midori/midori-7.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/libpeas[gtk]
 	dev-libs/libxml2
 	>=net-libs/libsoup-2.38:2.4[vala]
-	>=net-libs/webkit-gtk-2.16.6:4[introspection,opengl]
+	>=net-libs/webkit-gtk-2.16.6:4[introspection]
 	>=x11-libs/libnotify-0.7
 	>=x11-libs/gtk+-3.12.0:3
 "


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-11-04 20:21 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-11-04 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7ae84d1f7ac74c62e3ae96d6bd4ee5767505e0eb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  4 20:18:44 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov  4 20:21:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae84d1f

www-client/midori: Require webkit-gtk[introspection]

Closes: https://bugs.gentoo.org/670208
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/midori-6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
index 2598330b68e..437d8436c03 100644
--- a/www-client/midori/midori-6.0.ebuild
+++ b/www-client/midori/midori-6.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/libpeas[gtk]
 	dev-libs/libxml2
 	>=net-libs/libsoup-2.38:2.4[vala]
-	>=net-libs/webkit-gtk-2.16.6:4[jit=,opengl]
+	>=net-libs/webkit-gtk-2.16.6:4[introspection,jit=,opengl]
 	>=x11-libs/libnotify-0.7
 	>=x11-libs/gtk+-3.12.0:3
 "


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-11-04 13:37 Jeroen Roovers
  0 siblings, 0 replies; 25+ messages in thread
From: Jeroen Roovers @ 2018-11-04 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     81d8bd2ca58a0a80dbb3e5541710006d5c4a082d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  4 13:37:08 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov  4 13:37:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d8bd2c

www-client/midori: Filter LINGUAS

Fixes: https://bugs.gentoo.org/670192
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 www-client/midori/midori-6.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
index b6881a9c743..2598330b68e 100644
--- a/www-client/midori/midori-6.0.ebuild
+++ b/www-client/midori/midori-6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 VALA_MIN_API_VERSION=0.36
 
-inherit cmake-utils eapi7-ver gnome2-utils vala xdg-utils
+inherit cmake-utils eapi7-ver eutils gnome2-utils vala xdg-utils
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
@@ -44,6 +44,7 @@ src_prepare() {
 }
 
 src_configure() {
+	strip-linguas -i po/
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DVALA_EXECUTABLE="${VALAC}"


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-11-03 11:48 Sven Wegener
  0 siblings, 0 replies; 25+ messages in thread
From: Sven Wegener @ 2018-11-03 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     fe8f23448972db0c44017b6d8db2bbd1f9da46a4
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  3 11:44:23 2018 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 11:47:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe8f2344

www-client/midori: Require gcr with vala support

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 www-client/midori/midori-6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
index 2b563941f71..b6881a9c743 100644
--- a/www-client/midori/midori-6.0.ebuild
+++ b/www-client/midori/midori-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="+jit"
 
 RDEPEND="
-	>=app-crypt/gcr-3:=[gtk]
+	>=app-crypt/gcr-3:=[gtk,vala]
 	>=dev-db/sqlite-3.6.19:3
 	>=dev-libs/glib-2.48.0:2
 	dev-libs/libpeas[gtk]


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-11-02 20:01 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-11-02 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     f0b49827f398336b63f690bc6629fa1596308e41
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 19:53:51 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 20:01:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b49827

www-client/midori: Bump to v6.0

Major update of Midori which apparently has been reanimated and may even
work!

Closes: https://bugs.gentoo.org/670160
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/Manifest          |  1 +
 www-client/midori/midori-6.0.ebuild | 63 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index bada5af9676..7e27f724eb4 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1 +1,2 @@
+DIST midori-v6.0.tar.gz 1823209 BLAKE2B dd00bef8da638d993c9918e991fa4f65d79b9f0d736b865895fae94f7f9d7552d671bda38cff933e65b7017cadfb810b7c180e00ba4e6f26abd471affc4cd903 SHA512 2b3e4808b1297a3ef8436b45ac38782e070658a0ecc62bcf8d0b2cf49f256cdad799ccc5d28df11ff595c042e8474fa2e87065d9a89cdb5a936237c44fdfd9e7
 DIST midori_0.5.11_all_.tar.bz2 1428791 BLAKE2B c19872b3271360877b2affa0ab86d93884895037a72cb9182a44a597bf930394153fea5a744c1cf225f2c4bd8f3c691c5622d0b4abdb33c202c4aa1da48b5ee5 SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d

diff --git a/www-client/midori/midori-6.0.ebuild b/www-client/midori/midori-6.0.ebuild
new file mode 100644
index 00000000000..2b563941f71
--- /dev/null
+++ b/www-client/midori/midori-6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.36
+
+inherit cmake-utils eapi7-ver gnome2-utils vala xdg-utils
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+SRC_URI="https://github.com/midori-browser/core/releases/download/v$(ver_cut 1)/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+jit"
+
+RDEPEND="
+	>=app-crypt/gcr-3:=[gtk]
+	>=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.48.0:2
+	dev-libs/libpeas[gtk]
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4[vala]
+	>=net-libs/webkit-gtk-2.16.6:4[jit=,opengl]
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/gtk+-3.12.0:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S=${WORKDIR}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	vala_src_prepare
+	sed -i -e 's:libsoup-gnome:libsoup:' CMakeLists.txt || die
+	sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-10-24 12:58 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-10-24 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     fdab0909a134b86ad76ab497b0e4e7d13e4fa2a8
Author:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Sun Oct 21 02:13:59 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 12:58:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdab0909

www-client/midori: Fix net-libs/webkit-gtk dep to [opengl]

Closes: https://github.com/gentoo/gentoo/pull/10191
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-client/midori/midori-0.5.11-r2.ebuild | 2 +-
 www-client/midori/midori-0.5.11-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index 6b7ef90da64..7cc8c2fa4e8 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.38:2.4
 	>=x11-libs/libnotify-0.7
 	>=x11-libs/gtk+-3.10.0:3
-	>=net-libs/webkit-gtk-2.3.91:4[jit=]
+	>=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
 	granite? ( >=dev-libs/granite-0.2 )
 	xscreensaver? (
 		x11-libs/libX11

diff --git a/www-client/midori/midori-0.5.11-r3.ebuild b/www-client/midori/midori-0.5.11-r3.ebuild
index f7bfd147bf8..5fd35eecf3b 100644
--- a/www-client/midori/midori-0.5.11-r3.ebuild
+++ b/www-client/midori/midori-0.5.11-r3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.38:2.4
 	>=x11-libs/libnotify-0.7
 	>=x11-libs/gtk+-3.10.0:3
-	>=net-libs/webkit-gtk-2.3.91:4[jit=]
+	>=net-libs/webkit-gtk-2.3.91:4[jit=,opengl]
 	granite? ( >=dev-libs/granite-0.2 )
 	xscreensaver? (
 		x11-libs/libX11


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-05-14  9:18 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-05-14  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     f9f71ed8b5f3a52309c0e8b4cc5531cb6937b1fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 08:53:04 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:18:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f71ed8

www-client/midori: Run tests in virtualx env

Closes: https://bugs.gentoo.org/561608

 www-client/midori/midori-0.5.11-r2.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index c48d7175b6c..ae182d45fa4 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)'
 
 VALA_MAX_API_VERSION=0.34
 
-inherit gnome2 pax-utils python-any-r1 cmake-utils vala
+inherit gnome2 pax-utils python-any-r1 cmake-utils vala virtualx
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.midori-browser.org/"
@@ -74,6 +74,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	virtx cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-05-14  9:18 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-05-14  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5deada5cf4a80695c51e8ee8d5c8223fdb7a054c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 07:57:51 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:18:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5deada5c

www-client/midori: Fix disabling zeitgeist

Reported-by: <bogdan.pylypenko107 <AT> gmail.com>

 www-client/midori/midori-0.5.11-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index 84149ddb07e..eb390a4bfd2 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -60,6 +60,7 @@ src_configure() {
 		-DUSE_APIDOCS="$(usex doc)"
 		-DUSE_GRANITE="$(usex granite)"
 		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
+		-DUSE_ZEITGEIST=OFF
 		-DVALA_EXECUTABLE="${VALAC}"
 		-DUSE_GTK3=ON
 		-DHALF_BRO_INCOM_WEBKIT2=ON


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-05-14  9:18 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-05-14  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     1c19550450727c5b161eaa011e8cd8e5489ec757
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 08:36:07 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:18:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c195504

www-client/midori: Limit to vala <= 0.34

Bug: https://bugs.gentoo.org/628108

 www-client/midori/midori-0.5.11-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index eb390a4bfd2..a7c13b3633c 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -6,6 +6,8 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
+VALA_MAX_API_VERSION=0.34
+
 inherit gnome2 pax-utils python-any-r1 cmake-utils vala
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-05-14  9:18 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-05-14  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     813e102c44852e85a05eaeb6f6a984e5f2cd48f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 09:09:03 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:18:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=813e102c

www-client/midori: Stop using gnome2.eclass

 www-client/midori/midori-0.5.11-r2.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index ae182d45fa4..6b7ef90da64 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)'
 
 VALA_MAX_API_VERSION=0.34
 
-inherit gnome2 pax-utils python-any-r1 cmake-utils vala virtualx
+inherit cmake-utils gnome2-utils pax-utils python-any-r1 vala virtualx xdg-utils
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.midori-browser.org/"
@@ -51,7 +51,6 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-libsoup.patch #587448
 
 	cmake-utils_src_prepare
-	gnome2_src_prepare
 	vala_src_prepare
 	sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
 }
@@ -78,6 +77,12 @@ src_test() {
 	virtx cmake-utils_src_test
 }
 
-src_install() {
-	cmake-utils_src_install
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-05-14  9:18 Michał Górny
  0 siblings, 0 replies; 25+ messages in thread
From: Michał Górny @ 2018-05-14  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     688a83132f747c94a60aed3f56a00f69f092fdc2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 08:46:37 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:18:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688a8313

www-client/midori: Fix respecting USE=xscreensaver

 www-client/midori/midori-0.5.11-r2.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index a7c13b3633c..c48d7175b6c 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -27,10 +27,12 @@ RDEPEND="
 	dev-libs/libxml2
 	>=net-libs/libsoup-2.38:2.4
 	>=x11-libs/libnotify-0.7
-	xscreensaver? ( x11-libs/libXScrnSaver )
 	>=x11-libs/gtk+-3.10.0:3
 	>=net-libs/webkit-gtk-2.3.91:4[jit=]
 	granite? ( >=dev-libs/granite-0.2 )
+	xscreensaver? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -61,12 +63,13 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DUSE_APIDOCS="$(usex doc)"
 		-DUSE_GRANITE="$(usex granite)"
-		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
 		-DUSE_ZEITGEIST=OFF
 		-DVALA_EXECUTABLE="${VALAC}"
 		-DUSE_GTK3=ON
 		-DHALF_BRO_INCOM_WEBKIT2=ON
-		)
+	)
+
+	use xscreensaver || mycmakeargs+=( -DXSS=XSS-NOTFOUND )
 
 	cmake-utils_src_configure
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2018-04-30 17:35 Mikle Kolyada
  0 siblings, 0 replies; 25+ messages in thread
From: Mikle Kolyada @ 2018-04-30 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e86aea9aeb7bea3d95dd2522bf8e6808543a39c1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 17:34:54 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 17:35:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86aea9a

www-client/midori: Drop optional zeitgeist support

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-client/midori/metadata.xml            | 1 -
 www-client/midori/midori-0.5.11-r2.ebuild | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index de077023012..eedc283b9c4 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <use>
     <flag name="granite">Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
-    <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
   </use>
 </pkgmetadata>

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index ae79ce8aacf..84149ddb07e 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~mips x86 ~x86-fbsd"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-IUSE="doc granite xscreensaver +jit zeitgeist"
+IUSE="doc granite xscreensaver +jit"
 
 RDEPEND="
 	>=app-crypt/gcr-3:=[gtk]
@@ -29,7 +29,6 @@ RDEPEND="
 	>=x11-libs/gtk+-3.10.0:3
 	>=net-libs/webkit-gtk-2.3.91:4[jit=]
 	granite? ( >=dev-libs/granite-0.2 )
-	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -60,7 +59,6 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DUSE_APIDOCS="$(usex doc)"
 		-DUSE_GRANITE="$(usex granite)"
-		-DUSE_ZEITGEIST="$(usex zeitgeist)"
 		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
 		-DVALA_EXECUTABLE="${VALAC}"
 		-DUSE_GTK3=ON


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2017-12-25 10:43 David Seifert
  0 siblings, 0 replies; 25+ messages in thread
From: David Seifert @ 2017-12-25 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     11c1e70504f3f8e5c68cf4f534f119c03d7eebbc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 10:41:55 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 10:43:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c1e705

www-client/midori: [QA] Run cmake-utils_src_prepare

Closes: https://bugs.gentoo.org/639082
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-client/midori/midori-0.5.11-r2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www-client/midori/midori-0.5.11-r2.ebuild b/www-client/midori/midori-0.5.11-r2.ebuild
index d4463b9c66e..ae79ce8aacf 100644
--- a/www-client/midori/midori-0.5.11-r2.ebuild
+++ b/www-client/midori/midori-0.5.11-r2.ebuild
@@ -46,6 +46,8 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-libsoup.patch #587448
+
+	cmake-utils_src_prepare
 	gnome2_src_prepare
 	vala_src_prepare
 	sed -i -e '/^install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2016-04-13 19:39 Austin English
  0 siblings, 0 replies; 25+ messages in thread
From: Austin English @ 2016-04-13 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     539c159990bfa4f59b90d70c1f41faa5b19925c0
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 19:38:02 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 19:38:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539c1599

www-client/midori: -DUSE_ requires uppercase variable names

Gentoo-Bug: 579706
Reported-By: José Romildo Malaquias <jrmalaq <AT> gmail.com>
Suggested-By: Bernard Cafarell <voyageur <AT> gentoo.org>

Package-Manager: portage-2.2.26

 www-client/midori/midori-0.5.11-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/midori/midori-0.5.11-r1.ebuild b/www-client/midori/midori-0.5.11-r1.ebuild
index 95d9bda..d311ad3 100644
--- a/www-client/midori/midori-0.5.11-r1.ebuild
+++ b/www-client/midori/midori-0.5.11-r1.ebuild
@@ -88,8 +88,8 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DUSE_APIDOCS="$(usex doc)"
 		-DUSE_GIR="$(usex introspection)"
-		-DUSE_granite="$(usex granite)"
-		-DUSE_zeitgeist="$(usex zeitgeist)"
+		-DUSE_GRANITE="$(usex granite)"
+		-DUSE_ZEITGEIST="$(usex zeitgeist)"
 		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
 		-DVALA_EXECUTABLE="${VALAC}"
 		)


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2016-04-12  7:52 Austin English
  0 siblings, 0 replies; 25+ messages in thread
From: Austin English @ 2016-04-12  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4d2431df0b0f811740d63f9f3b03caa7bab6bbc1
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 07:46:24 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 07:51:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2431df

www-client/midori: update to EAPI 6

Package-Manager: portage-2.2.26

 www-client/midori/midori-0.5.11-r1.ebuild | 136 ++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

diff --git a/www-client/midori/midori-0.5.11-r1.ebuild b/www-client/midori/midori-0.5.11-r1.ebuild
new file mode 100644
index 0000000..13daedd
--- /dev/null
+++ b/www-client/midori/midori-0.5.11-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+VALA_MIN_API_VERSION="0.30"
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~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 introspection +jit +webkit2 zeitgeist"
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=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
+	deprecated? (
+		>=net-libs/webkit-gtk-1.8.1:2[jit=]
+		>=x11-libs/gtk+-2.24:2
+		)
+	!deprecated? (
+		>=x11-libs/gtk+-3.10.0:3
+		webkit2? ( >=net-libs/webkit-gtk-2.3.91:4[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	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="
+	granite? ( !deprecated )
+	introspection? ( deprecated )
+	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
+	eapply_user
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DUSE_APIDOCS="$(usex doc)"
+		-DUSE_GIR="$(usex introspection)"
+		-DUSE_granite="$(usex granite)"
+		-DUSE_zeitgeist="$(usex zeitgeist)"
+		-DVALA_EXECUTABLE="${VALAC}"
+		)
+
+	if use deprecated; then
+		mycmakeargs+=(
+			-DUSE_GTK3=OFF
+			-DHALF_BRO_INCOM_WEBKIT2=OFF
+			)
+	else
+		mycmakeargs+=(
+			-DUSE_GTK3=ON
+			-DHALF_BRO_INCOM_WEBKIT2="$(usex 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
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2016-04-12  7:52 Austin English
  0 siblings, 0 replies; 25+ messages in thread
From: Austin English @ 2016-04-12  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7be44127d13f4d5af2186f750ff3d49da23be8cc
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 07:49:58 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 07:51:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be44127

www-client/midori: add xscreensaver to IUSE

Proposed-By: cl91tp <cl91tp <AT> gmail.com>
Gentoo-Bug: 579132

Package-Manager: portage-2.2.26

 www-client/midori/midori-0.5.11-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www-client/midori/midori-0.5.11-r1.ebuild b/www-client/midori/midori-0.5.11-r1.ebuild
index 13daedd..95d9bda 100644
--- a/www-client/midori/midori-0.5.11-r1.ebuild
+++ b/www-client/midori/midori-0.5.11-r1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.midori-browser.org/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
-IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+IUSE="deprecated doc granite introspection xscreensaver +jit +webkit2 zeitgeist"
 
 RDEPEND="
 	>=app-crypt/gcr-3[gtk]
@@ -35,6 +35,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.38:2.4
 	>=net-libs/libsoup-gnome-2.38:2.4
 	>=x11-libs/libnotify-0.7
+	xscreensaver? ( x11-libs/libXScrnSaver )
 	deprecated? (
 		>=net-libs/webkit-gtk-1.8.1:2[jit=]
 		>=x11-libs/gtk+-2.24:2
@@ -89,6 +90,7 @@ src_configure() {
 		-DUSE_GIR="$(usex introspection)"
 		-DUSE_granite="$(usex granite)"
 		-DUSE_zeitgeist="$(usex zeitgeist)"
+		-DUSE_XSCREENSAVER="$(usex xscreensaver)"
 		-DVALA_EXECUTABLE="${VALAC}"
 		)
 


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2015-09-25  9:51 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2015-09-25  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     cb9767c5059d7d6348ea0fdf62241be99e9862e5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 09:50:15 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 09:51:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9767c5

www-client/midori: Removed old.

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 www-client/midori/Manifest               |   2 -
 www-client/midori/midori-0.5.8-r1.ebuild | 136 -------------------------------
 www-client/midori/midori-0.5.8.ebuild    | 134 ------------------------------
 3 files changed, 272 deletions(-)

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 471e030..02df760 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,4 +1,2 @@
-DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
 DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
 DIST midori_0.5.11_all_.tar.bz2 1428791 SHA256 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d WHIRLPOOL 6825d1b28e269f9fb158458cd4a3ddbdb09ab241ced32c4ccc5df0c1f9a921a275baf0dcdac24aa84c58f7a3371ef74941bcd06a8303c95dd3ffb48d99de6bba
-DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07

diff --git a/www-client/midori/midori-0.5.8-r1.ebuild b/www-client/midori/midori-0.5.8-r1.ebuild
deleted file mode 100644
index aed8649..0000000
--- a/www-client/midori/midori-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.16
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
-	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
-		https://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
-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 introspection +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 )
-	introspection? ( dev-libs/gobject-introspection )
-	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="granite? ( !deprecated )
-	introspection? ( deprecated )
-	webkit2? ( !deprecated )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-save_as.patch #498898
-	vala_src_prepare
-	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
-}
-
-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 introspection GIR)
-		$(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
-}

diff --git a/www-client/midori/midori-0.5.8.ebuild b/www-client/midori/midori-0.5.8.ebuild
deleted file mode 100644
index 9148128..0000000
--- a/www-client/midori/midori-0.5.8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.16
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="~amd64 ~arm ~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 introspection +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 )
-	introspection? ( dev-libs/gobject-introspection )
-	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="granite? ( !deprecated )
-	introspection? ( deprecated )
-	webkit2? ( !deprecated )"
-
-S=${WORKDIR}
-
-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
-}
-
-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 introspection GIR)
-		$(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
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/midori/
@ 2015-09-25  9:51 Lars Wendler
  0 siblings, 0 replies; 25+ messages in thread
From: Lars Wendler @ 2015-09-25  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0eb7c1b0010877ebda53179c3dd4920422c2dc72
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 09:47:47 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 09:51:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb7c1b0

www-client/midori: Bump to version 0.5.11 (bug #560824).

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 www-client/midori/Manifest             |   1 +
 www-client/midori/midori-0.5.11.ebuild | 135 +++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index a78e4e5..471e030 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,4 @@
 DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
 DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
+DIST midori_0.5.11_all_.tar.bz2 1428791 SHA256 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d SHA512 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d WHIRLPOOL 6825d1b28e269f9fb158458cd4a3ddbdb09ab241ced32c4ccc5df0c1f9a921a275baf0dcdac24aa84c58f7a3371ef74941bcd06a8303c95dd3ffb48d99de6bba
 DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07

diff --git a/www-client/midori/midori-0.5.11.ebuild b/www-client/midori/midori-0.5.11.ebuild
new file mode 100644
index 0000000..cc9f88d
--- /dev/null
+++ b/www-client/midori/midori-0.5.11.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~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 introspection +jit +webkit2 zeitgeist"
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=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? (
+		>=x11-libs/gtk+-3.10.0:3
+		webkit2? ( >=net-libs/webkit-gtk-2.3.91:4[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	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="
+	granite? ( !deprecated )
+	introspection? ( deprecated )
+	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
+}
+
+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 introspection GIR)
+		$(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
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2021-12-26 21:03 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-02 16:15 [gentoo-commits] repo/gentoo:master commit in: www-client/midori/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2021-12-26 21:03 Arthur Zamarin
2021-09-28 14:53 Yixun Lan
2019-09-13  5:11 Michał Górny
2019-04-07 14:43 Mikle Kolyada
2019-04-07 14:41 Mikle Kolyada
2019-02-27  4:25 Aaron Bauman
2018-12-02 16:32 Michał Górny
2018-11-04 20:21 Michał Górny
2018-11-04 13:37 Jeroen Roovers
2018-11-03 11:48 Sven Wegener
2018-11-02 20:01 Michał Górny
2018-10-24 12:58 Michał Górny
2018-05-14  9:18 Michał Górny
2018-05-14  9:18 Michał Górny
2018-05-14  9:18 Michał Górny
2018-05-14  9:18 Michał Górny
2018-05-14  9:18 Michał Górny
2018-04-30 17:35 Mikle Kolyada
2017-12-25 10:43 David Seifert
2016-04-13 19:39 Austin English
2016-04-12  7:52 Austin English
2016-04-12  7:52 Austin English
2015-09-25  9:51 Lars Wendler
2015-09-25  9:51 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox