From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-util/gtk-doc/Manifest | 9 +- .../files/1.32-deprecation-parse-fixes.patch | 180 --------------------- dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild | 101 ------------ dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild | 104 ------------ dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild | 107 ------------ dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild | 2 +- dev-util/gtk-doc/gtk-doc-1.33.2.ebuild | 110 +++++++++++++ 7 files changed, 114 insertions(+), 499 deletions(-) delete mode 100644 dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch delete mode 100644 dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild delete mode 100644 dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild delete mode 100644 dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild create mode 100644 dev-util/gtk-doc/gtk-doc-1.33.2.ebuild (limited to 'dev-util/gtk-doc') diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index 1c0fe3f2ec0a..8f75ea679495 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1,10 +1,7 @@ -AUX 1.32-deprecation-parse-fixes.patch 7181 BLAKE2B e7415a1d8f9aad544581c8fc5d5b2e5c50dc3cb7830bee1c2ec6777006841488fa8b0c56b5b1fd92dad811ddb9a5b207a29d677114b0ba4e381a4b05c4a26dc8 SHA512 4c68a0d355e9fbbc6f36b5877da3f510e6b5fe184488117b7545a5b30a3b3730d05aa191fa414f341235d4e6199fb220d3b95169b5e8c7d495cdbc8d469f07c5 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6 -DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90 -EBUILD gtk-doc-1.32-r1.ebuild 2325 BLAKE2B ac9e1061f3fcec7cfc6cc90746e4444259dad4e705817a459e9735a2691f7e4d80701d9a688f3b9ad773429e0248491661a526e798318025022f75a997824cd6 SHA512 f9a4eaafff2b0edf6f6d0b13a5b82db0d19a36cf3d1ed2b1872787bb5ee1369f0a75300f59db8dfab7b54a0a15cecfd16215c221ffc0039985476ec20cd362ce -EBUILD gtk-doc-1.32-r2.ebuild 2549 BLAKE2B e1fe420648742f9c9300522fe262d105411fe29d7bcc67d8ab17ef7be7e7553ca0e52a5c079c392c9f7f6833970426993df091c1b0a3ff46528d7b5eeec57b87 SHA512 38f4b9bdf9f9274a00d9fddedd827c66f4709a63441b097a306faf95d6b8e0a9b7efceb237e31f9a60821426a9d54fcb4d131763793ce5580fe70d8360f77cfa -EBUILD gtk-doc-1.33.1-r3.ebuild 2568 BLAKE2B b91e838e58259c1198963e66337b2cbe8d2b1261c2d9e1c8b384733aa4b9d6f4b57887cb00c9e999f40573b9ef6f1b358551e2d588794a9f16d035eb9c4196b0 SHA512 1391ab5c8dc72747aef6ab0db001e44306eff25fd129b32163c2165b8703b7c55bd8b025568b7d7a8a550132c51d25b7c4b96024b3a087a734f7274b8ef15046 -EBUILD gtk-doc-1.33.1-r4.ebuild 2613 BLAKE2B df1691bfda2943f3c77b1b0fe3be2389b94c3cd1e28379bd21fcea7ad8bc347ebe8958ad6b87c30c3e6e6eb50547917f3d457d282de5be216a6c8ff1e4146148 SHA512 9f777c2080990fade14361d5e26b06b52e231eccd938b26cf73d50764de995e1c5a3e0b2dca684709f5f83bd32ee9a96cbbf80ef9519d2aabc90ba15e16ca623 +DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab +EBUILD gtk-doc-1.33.1-r4.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570 +EBUILD gtk-doc-1.33.2.ebuild 2622 BLAKE2B 74fafa8a699b836473dec1dee25e1e4e59b4c6bf1b0b2e6589dd0b7e8fe79565a07658a3130442f7e5cf4b2870b0ee654fd62215e89e25f419b2529fe9f53980 SHA512 36dbfd5fc7b0728b0dda700c3694b28e6addfad8e7f3172b0dd7a85f26c119e4c5759059d2f70d0aa3f37d0d94bf75a2b87489ff7d5863598c8cffddba1168d4 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a diff --git a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch deleted file mode 100644 index 59f878cceac4..000000000000 --- a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 2667d8cd95a2a29c35c1bb8f4629c22fd0aa98e9 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens -Date: Thu, 2 Jan 2020 21:56:10 -0500 -Subject: [PATCH 1/3] Skip G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS lines - -For some reason, glib has to put empty line before and after each of -these lines otherwise the symbol following it is undeclared. ---- - gtkdoc/scan.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index d04d4d4..7de08ad 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -561,6 +561,11 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - logging.info('Found start of comment: %s', line.strip()) - continue - -+ # Skip begin/end deprecation macros. -+ m = re.search(r'^\s*G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS', line) -+ if m: -+ continue -+ - logging.info('no decl: %s', line.strip()) - - cm = [m.match(line) for m in CLINE_MATCHER] --- -2.20.1 - - -From 9e58548688c9768cf41c59ccef531d438ffb2504 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens -Date: Fri, 3 Jan 2020 06:47:47 -0500 -Subject: [PATCH 2/3] typedef can be followed by decorator - ---- - gtkdoc/scan.py | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 7de08ad..5a5da92 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -96,19 +96,8 @@ CLINE_MATCHER = [ - (struct|union)\s* - \w*\s*{""", re.VERBOSE), - # 12-14: OTHER TYPEDEFS -- re.compile( -- r"""^\s*typedef\s+ -- (?:struct|union)\s+\w+[\s\*]+ -- (\w+) # 1: name -- \s*;""", re.VERBOSE), -- re.compile( -- r"""^\s* -- (?:G_GNUC_EXTENSION\s+)? -- typedef\s+ -- (.+[\s\*]) # 1: e.g. 'unsigned int' -- (\w+) # 2: name -- (?:\s*\[[^\]]+\])* -- \s*;""", re.VERBOSE), -+ None, # in InitScanner() -+ None, # in InitScanner() - re.compile(r'^\s*typedef\s+'), - # 15: VARIABLES (extern'ed variables) - None, # in InitScanner() -@@ -267,6 +256,21 @@ def InitScanner(options): - %s # 3: optional decorator - \s*;""" % optional_decorators_regex, re.VERBOSE) - # OTHER TYPEDEFS -+ CLINE_MATCHER[12] = re.compile( -+ r"""^\s*typedef\s+ -+ (?:struct|union)\s+\w+[\s\*]+ -+ (\w+) # 1: name -+ %s # 2: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) -+ CLINE_MATCHER[13] = re.compile( -+ r"""^\s* -+ (?:G_GNUC_EXTENSION\s+)? -+ typedef\s+ -+ (.+?[\s\*]) # 1: e.g. 'unsigned int' -+ (\w+) # 2: name -+ (?:\s*\[[^\]]+\])* -+ %s # 3: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) - CLINE_MATCHER[15] = re.compile( - r"""^\s* - (?:extern|[A-Za-z_]+VAR%s)\s+ --- -2.20.1 - - -From 5bfe23f0257e1b4c6c9a4e3a2dbb180455f753f2 Mon Sep 17 00:00:00 2001 -From: Jason Crain -Date: Mon, 6 Jan 2020 19:05:42 -0700 -Subject: [PATCH 3/3] scan: support deprecated struct members - -gcc allows deprecating members of structs. For example: - -struct data { - int x G_GNUC_DEPRECATED_FOR(replacement); -}; - -However, this currently causes the entire struct to be marked as -deprecated and confuses mkdb because it doesn't understand the -G_GNUC_DEPRECATED_FOR symbol. - -Fix this by having the whole struct only be marked as deprecated if the -'_DEPRECATED' is after the closing bracket of the struct, similar to how -it already does for enums, and having scan automatically remove all -G_GNUC_* decorators from struct members, similar to how it already does -for functions. ---- - gtkdoc/scan.py | 12 ++++++++++-- - tests/scan.py | 17 +++++++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 5a5da92..6c6534a 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -538,7 +538,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - # section (#endif /* XXX_DEPRECATED */ - if deprecated_conditional_nest == 0 and '_DEPRECATED' in line: - m = re.search(r'^\s*#\s*(if*|define|endif)', line) -- if not (m or in_declaration == 'enum'): -+ if not (m or in_declaration == 'enum' or in_declaration == 'struct'): - logging.info('Found deprecation annotation (decl: "%s"): "%s"', - in_declaration, line.strip()) - deprecated_conditional_nest += 0.1 -@@ -953,9 +953,17 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - title = '%s' % objectname - - logging.info('Store struct: "%s"', symbol) -+ # Structs could contain deprecated members and that doesn't -+ # mean the whole struct is deprecated, so they are ignored when -+ # setting deprecated_conditional_nest above. Here we can check -+ # if the _DEPRECATED is between '}' and ';' which would mean -+ # the struct as a whole is deprecated. -+ if re.search(r'\n\s*\}.*_DEPRECATED.*;\s*$', decl): -+ deprecated = '\n' - if AddSymbolToList(slist, symbol): - structsym = in_declaration.upper() -- stripped_decl = re.sub('(%s)' % optional_decorators_regex, '', decl) -+ regex = r'(?:\s+(?:G_GNUC_\w+(?:\(\w*\))?%s))' % ignore_decorators -+ stripped_decl = re.sub(regex, '', decl) - decl_list.append('<%s>\n%s\n%s%s\n' % - (structsym, symbol, deprecated, stripped_decl, structsym)) - if symbol in forward_decls: -diff --git a/tests/scan.py b/tests/scan.py -index ad63541..6d608b6 100755 ---- a/tests/scan.py -+++ b/tests/scan.py -@@ -552,6 +552,23 @@ class ScanHeaderContentStructs(ScanHeaderContentTestCase): - slist, doc_comments = self.scanHeaderContent([header]) - self.assertDecl('data', expected, slist) - -+ def test_HandleDeprecatedMemberDecorator(self): -+ """Struct with deprecated members.""" -+ header = textwrap.dedent("""\ -+ struct data { -+ int x1 G_GNUC_DEPRECATED; -+ int x2 G_GNUC_DEPRECATED_FOR(replacement); -+ };""") -+ expected = textwrap.dedent("""\ -+ struct data { -+ int x1; -+ int x2; -+ };""") -+ scan.InitScanner(self.options) -+ slist, doc_comments = self.scanHeaderContent( -+ header.splitlines(keepends=True)) -+ self.assertDecl('data', expected, slist) -+ - - class ScanHeaderContentUnions(ScanHeaderContentTestCase): - """Test parsing of union declarations.""" --- -2.20.1 - diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild deleted file mode 100644 index 360fe3b62e3e..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_7 ) - -inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://www.gtk.org/gtk-doc/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="debug doc emacs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.6:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - ~dev-util/gtk-doc-am-${PV} - dev-util/itstool - virtual/pkgconfig -" - -# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex) -RESTRICT="test" - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - # Remove global Emacs keybindings, bug #184588 - eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - $(use_enable debug) -} - -src_compile() { - gnome2_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - gnome2_src_install - - python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - - if use doc; then - docinto doc - dodoc doc/* - docinto examples - dodoc examples/* - fi - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild deleted file mode 100644 index 104510578e78..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://www.gtk.org/gtk-doc/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="debug doc emacs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.6:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - ~dev-util/gtk-doc-am-${PV} - dev-util/itstool - virtual/pkgconfig -" - -# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex) -RESTRICT="test" - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - # Remove global Emacs keybindings, bug #184588 - eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch - # Fix dev-libs/glib[gtk-doc] doc generation tests by fixing stuff surrounding deprecations - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1488 - eapply "${FILESDIR}"/${PV}-deprecation-parse-fixes.patch - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - $(use_enable debug) -} - -src_compile() { - gnome2_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - gnome2_src_install - - python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - - if use doc; then - docinto doc - dodoc doc/* - docinto examples - dodoc examples/* - fi - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild deleted file mode 100644 index a10fd7586619..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="doc emacs test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.38:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/parameterized[${PYTHON_USEDEP}] - ') - ) -" -BDEPEND=" - ~dev-util/gtk-doc-am-${PV} - virtual/pkgconfig -" - -PATCHES=( - # Remove global Emacs keybindings, bug #184588 - "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch -) - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Requires the unpackaged Python "anytree" module - sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use test tests) - $(meson_use doc yelp_manual) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - meson_src_install - - # The meson build system configures the shebangs to the temporary python - # used during the build. We need to fix it. - sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die - python_fix_shebang "${ED}"/usr/bin - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - rmdir "${ED}"/usr/share/aclocal || die - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild index c47d56cb5e2c..18c12d44b238 100644 --- a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild +++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc" LICENSE="GPL-2 FDL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" IUSE="emacs test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild new file mode 100644 index 000000000000..df6e92cd3086 --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 + +DESCRIPTION="GTK+ Documentation Generator" +HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc" + +LICENSE="GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" + +IUSE="emacs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.38:2 + dev-libs/libxslt + >=dev-libs/libxml2-2.3.6:2 + ~app-text/docbook-xml-dtd-4.3 + app-text/docbook-xsl-stylesheets + ~app-text/docbook-sgml-dtd-3.0 + >=app-text/docbook-dsssl-stylesheets-1.40 + emacs? ( >=app-editors/emacs-23.1:* ) + $(python_gen_cond_dep ' + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + ') +" +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + ~dev-util/gtk-doc-am-${PV} + dev-util/itstool + virtual/pkgconfig +" + +PATCHES=( + # Remove global Emacs keybindings, bug #184588 + "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch +) + +pkg_setup() { + DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. + You may set your own key bindings for \"gtk-doc-insert\" and + \"gtk-doc-insert-section\" in your ~/.emacs file." + SITEFILE=61${PN}-gentoo.el + python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Requires the unpackaged Python "anytree" module + sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die +} + +src_configure() { + local emesonargs=( + -Dautotools_support=true + -Dcmake_support=true + -Dyelp_manual=true + $(meson_use test tests) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + use emacs && elisp-compile tools/gtk-doc.el +} + +src_install() { + meson_src_install + + # The meson build system configures the shebangs to the temporary python + # used during the build. We need to fix it. + sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die + python_fix_shebang "${ED}"/usr/bin + + # Don't install this file, it's in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + rmdir "${ED}"/usr/share/aclocal || die + + if use emacs; then + elisp-install ${PN} tools/gtk-doc.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + readme.gentoo_print_elog + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3