[gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/, dev-util/devhelp/files/

2021-10-03 Thread Mart Raudsepp
commit: 23c5e2ab1154b82697e9701162c193f0b5fb27e1
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Oct  3 21:36:39 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct  3 21:41:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c5e2ab

dev-util/devhelp: bump to 41.2

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/devhelp/Manifest  |  1 +
 dev-util/devhelp/devhelp-41.2.ebuild   | 83 ++
 .../files/41.2-optional-introspection.patch| 47 
 dev-util/devhelp/files/41.2-webkitgtk40.patch  | 38 ++
 4 files changed, 169 insertions(+)

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index b3f2105aa47..189093efe28 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,2 +1,3 @@
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 
05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf
 SHA512 
b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
 DIST devhelp-40.1.tar.xz 318172 BLAKE2B 
83f71b66538b700790961e3dd3c7c7a75199f499a1fb32eb01e62fd5d11e72ae4e860bcfab2615bd4d417d5c57b89dad7eb2f1de4930e39e544d42b57a193b97
 SHA512 
4c541db9adce4064f401c1d0a9f3233e2dbab17206358dfcce360286f69698248d08172fb236a692b125d8cd3a5bb76b6377b01b52c3d096fa4528400acd
+DIST devhelp-41.2.tar.xz 1455736 BLAKE2B 
c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa
 SHA512 
99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98

diff --git a/dev-util/devhelp/devhelp-41.2.ebuild 
b/dev-util/devhelp/devhelp-41.2.ebuild
new file mode 100644
index 000..4657f906fe7
--- /dev/null
+++ b/dev-util/devhelp/devhelp-41.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp";
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="+gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
+
+DEPEND="
+   >=dev-libs/glib-2.64:2
+   >=x11-libs/gtk+-3.22:3[introspection?]
+   >=net-libs/webkit-gtk-2.26:4[introspection?]
+   gnome-base/gsettings-desktop-schemas
+   introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+   gedit? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   
app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   ')
+   )
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/libxml2:2
+   dev-util/glib-utils
+   dev-util/itstool
+   gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PV}-optional-introspection.patch
+   "${FILESDIR}"/${PV}-webkitgtk40.patch
+)
+
+pkg_setup() {
+   use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dflatpak_build=false
+   $(meson_use gtk-doc gtk_doc)
+   $(meson_use introspection)
+   -Dplugin_emacs=true
+   $(meson_use gedit plugin_gedit)
+   -Dplugin_vim=true
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   if use gtk-doc; then
+   mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+   mv "${ED}"/usr/share/doc/devhelp-3 
"${ED}"/usr/share/gtk-doc/html/ || die
+   fi
+   use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}

diff --git a/dev-util/devhelp/files/41.2-optional-introspection.patch 
b/dev-util/devhelp/files/41.2-optional-introspection.patch
new file mode 100644
index 000..7fb4e719cbf
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-optional-introspection.patch
@@ -0,0 +1,47 @@
+From 0e2e1de8015abc77ead34e25d9822a183b1f214d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Sun, 3 Oct 2021 23:51:25 +0300
+Subject: [PATCH] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt   | 6 ++
+ 2 files 

[gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/, dev-util/devhelp/files/

2019-03-22 Thread Mart Raudsepp
commit: 64241edfae45112cca312ee192d39c1853ecf05b
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Mar 22 21:30:54 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Mar 22 21:36:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64241edf

dev-util/devhelp: bump to 3.30.1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/devhelp/Manifest  |  1 +
 dev-util/devhelp/devhelp-3.30.1.ebuild | 79 ++
 dev-util/devhelp/files/3.30.1-optional-gedit.patch | 37 ++
 .../files/3.30.1-optional-introspection.patch  | 38 +++
 4 files changed, 155 insertions(+)

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 0f972a5e897..9fe40058760 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,3 +1,4 @@
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B 
b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39
 SHA512 
56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 DIST devhelp-3.26.1.tar.xz 613508 BLAKE2B 
a84d6bb55a81f0beda0603f343022b997e263934fc48ccc95503e156a0ee0984e1c945af785971c45f197865147c63be354ace72582d3575692dd5eed7e1e724
 SHA512 
76beec8846703004202229853a7a208b31bf56e2f10c102a3bb6e88fb9e54aded027e6ab9620706629dcb02cf5973f1d4fe88d217a7b3b8cb0efc948b02ca660
 DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B 
d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02
 SHA512 
a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
+DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 
8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1
 SHA512 
f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc

diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild 
b/dev-util/devhelp/devhelp-3.30.1.ebuild
new file mode 100644
index 000..53a1870cb3a
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp";
+
+LICENSE="GPL-3+"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64"
+IUSE="gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+   >=dev-libs/glib-2.56:2
+   >=x11-libs/gtk+-3.22:3[introspection?]
+   >=net-libs/webkit-gtk-2.20:4[introspection?]
+   >=gui-libs/amtk-5.0:5
+   gnome-base/gsettings-desktop-schemas
+   introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${COMMON_DEPEND}
+   gedit? (
+   ${PYTHON_DEPS}
+   app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+   ${PYTHON_DEPS}
+   dev-libs/libxml2:2
+   dev-util/glib-utils
+   dev-util/itstool
+   gtk-doc? (
+   >=dev-util/gtk-doc-1.25
+   app-text/docbook-xml-dtd:4.3 )
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PV}-optional-introspection.patch
+   "${FILESDIR}"/${PV}-optional-gedit.patch
+)
+
+pkg_setup() {
+   use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+   local emesonargs=(
+   -Dflatpak_build=false
+   $(meson_use gedit gedit_plugin)
+   $(meson_use gtk-doc gtk_doc)
+   $(meson_use introspection)
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}

diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch 
b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
new file mode 100644
index 000..09e4405a50e
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
@@ -0,0 +1,37 @@
+From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Fri, 22 Mar 2019 19:47:49 +0200
+Subject: [PATCH 2/2] build: Add optiona