From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF82C1382C5 for ; Sun, 18 Apr 2021 03:04:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CEB7E0817; Sun, 18 Apr 2021 03:04:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7D20E0817 for ; Sun, 18 Apr 2021 03:04:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90AE7340D77 for ; Sun, 18 Apr 2021 03:04:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19387648 for ; Sun, 18 Apr 2021 03:04:41 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1618715058.01feec5d5c5d963ce55b8e820fa6b7c4e5a45a6b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/devhelp/files/, dev-util/devhelp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/devhelp/Manifest dev-util/devhelp/devhelp-40.0.ebuild dev-util/devhelp/files/40.0-optional-introspection.patch X-VCS-Directories: dev-util/devhelp/files/ dev-util/devhelp/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 01feec5d5c5d963ce55b8e820fa6b7c4e5a45a6b X-VCS-Branch: master Date: Sun, 18 Apr 2021 03:04:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0aa534a2-80b4-4bdc-b54b-eb0cb0e1f5d6 X-Archives-Hash: 803d7da9397effe32f0ee6ab8e0600de commit: 01feec5d5c5d963ce55b8e820fa6b7c4e5a45a6b Author: Matt Turner gentoo org> AuthorDate: Sat Apr 17 22:55:40 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Apr 18 03:04:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01feec5d dev-util/devhelp: Version bump to 40.0 Signed-off-by: Matt Turner gentoo.org> dev-util/devhelp/Manifest | 1 + dev-util/devhelp/devhelp-40.0.ebuild | 82 ++++++++++++++++++++++ .../files/40.0-optional-introspection.patch | 47 +++++++++++++ 3 files changed, 130 insertions(+) diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest index e6c4ceea771..cb01af4c2f2 100644 --- a/dev-util/devhelp/Manifest +++ b/dev-util/devhelp/Manifest @@ -1 +1,2 @@ DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430 +DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7 diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild new file mode 100644 index 00000000000..8814cb62406 --- /dev/null +++ b/dev-util/devhelp/devhelp-40.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..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} )" + +DEPEND=" + >=dev-libs/glib-2.64:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=net-libs/webkit-gtk-2.24:4[introspection?] + >=gui-libs/amtk-5.0:5 + 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_MULTI_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/gtk-doc-1.25 + app-text/docbook-xml-dtd:4.3 + ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/40.0-optional-introspection.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 + 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/40.0-optional-introspection.patch b/dev-util/devhelp/files/40.0-optional-introspection.patch new file mode 100644 index 00000000000..d4c00d369d6 --- /dev/null +++ b/dev-util/devhelp/files/40.0-optional-introspection.patch @@ -0,0 +1,47 @@ +From 6c982d00f9d6f03f916bb6a572e7f938cd56fa74 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Fri, 22 Mar 2019 19:44:40 +0200 +Subject: [PATCH] build: Add optionality for introspection build + +--- + devhelp/meson.build | 2 ++ + meson_options.txt | 6 ++++++ + 2 files changed, 8 insertions(+) + +diff --git a/devhelp/meson.build b/devhelp/meson.build +index eef055e7..eeaa51eb 100644 +--- a/devhelp/meson.build ++++ b/devhelp/meson.build +@@ -120,6 +120,7 @@ PKG_CONFIG.generate( + requires_private: LIBDEVHELP_PRIVATE_DEPS + ) + ++if get_option('introspection') + GNOME.generate_gir( + libdevhelp_shared_lib, + export_packages: 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL), +@@ -140,3 +141,4 @@ GNOME.generate_gir( + '--quiet', + ], + ) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 17dc85f5..c69a2906 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -10,6 +10,12 @@ option( + description: 'Build the API reference' + ) + ++option( ++ 'introspection', ++ type: 'boolean', value: true, ++ description: 'Build GObject Introspection data' ++) ++ + option( + 'plugin_emacs', + type: 'boolean', value: false, +-- +2.26.3 +