commit: 64241edfae45112cca312ee192d39c1853ecf05b Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Fri Mar 22 21:30:54 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Fri Mar 22 21:36:46 2019 +0000 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 <leio <AT> 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 00000000000..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 00000000000..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 <[email protected]> +Date: Fri, 22 Mar 2019 19:47:49 +0200 +Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation + +--- + meson.build | 4 +++- + meson_options.txt | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a0def09c..2d1d3e0a 100644 +--- a/meson.build ++++ b/meson.build +@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c') + ##### end CFLAGS + + subdir('data') +-subdir('plugins/gedit-plugin') ++if get_option('gedit_plugin') ++ subdir('plugins/gedit-plugin') ++endif + subdir('po') + subdir('help') + subdir('devhelp') +diff --git a/meson_options.txt b/meson_options.txt +index 2eaa7ff9..8fdb5a89 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ + option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode') ++option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin') + option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference') + option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data') +-- +2.17.0 + diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch new file mode 100644 index 00000000000..b5afa8a2b87 --- /dev/null +++ b/dev-util/devhelp/files/3.30.1-optional-introspection.patch @@ -0,0 +1,38 @@ +From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Fri, 22 Mar 2019 19:44:40 +0200 +Subject: [PATCH 1/2] build: Add optionality for introspection build + +--- + devhelp/meson.build | 2 ++ + meson_options.txt | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/devhelp/meson.build b/devhelp/meson.build +index ea217895..f88fcb07 100644 +--- a/devhelp/meson.build ++++ b/devhelp/meson.build +@@ -123,6 +123,7 @@ PKG_CONFIG.generate( + requires : LIBDEVHELP_DEPS_STR + ) + ++if get_option('introspection') + GNOME.generate_gir( + libdevhelp, + export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL), +@@ -139,3 +140,4 @@ GNOME.generate_gir( + include_directories : ROOT_INCLUDE_DIR, + install : true + ) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index a10fc603..2eaa7ff9 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,2 +1,3 @@ + option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode') + option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference') ++option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data') +-- +2.17.0 +
