From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- app-doc/devmanual/Manifest | 8 +-- app-doc/devmanual/devmanual-0_pre20200203.ebuild | 63 ++++++++++++++++++++++++ app-doc/devmanual/devmanual-9999.ebuild | 38 ++++++-------- app-doc/devmanual/files/devmanual-eclasses.patch | 20 ++++++++ app-doc/devmanual/files/devmanual-fallback.patch | 60 ---------------------- app-doc/devmanual/metadata.xml | 4 +- 6 files changed, 106 insertions(+), 87 deletions(-) create mode 100644 app-doc/devmanual/devmanual-0_pre20200203.ebuild create mode 100644 app-doc/devmanual/files/devmanual-eclasses.patch delete mode 100644 app-doc/devmanual/files/devmanual-fallback.patch (limited to 'app-doc/devmanual') diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest index dd8616b410d6..0f112262bfd3 100644 --- a/app-doc/devmanual/Manifest +++ b/app-doc/devmanual/Manifest @@ -1,5 +1,7 @@ -AUX devmanual-fallback.patch 2162 BLAKE2B b71262e6331be68acc6186c195faf7e1fe5fe030358c9aff3384c63f7a71553073e0dfba3425caca19f2fc5f7638c2ece4e3d06ecda29c40c019e55e9a120205 SHA512 6a345a2f61f28c996d3861821529c16bd3f3e9af725e00ec4fe22d214a5227beea13f67366331d64c0cbfb63cb409ce2f3abca05b483f654a28ed8cf21663451 +AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3 DIST devmanual-0_pre20141116.tar.gz 169936 BLAKE2B 9b01004750b9fce226fa6a965292d3ffaff0923f877da611743e39ee19077ea7fe0d21ff138853d3f79e4d4941026c30fcabf63c8903572ed7ba5d50d32c8dd5 SHA512 6af3f9a262bdb2ceb61ab195691dff4a850b22e8d1226e20ae3257c566b6cc913f756c8b90a40e8aa78b1242e78d24c4209a1d9cdb0706ae9b64c653544a028f +DIST devmanual-0_pre20200203.tar.xz 163740 BLAKE2B 39d8173bc524213e7a6e81def4f1631ea0d2503540551982d07ef58f414b8a052e8a3a0d2426b5864e06fb24f1745af4dea57e418fcc5e52c558dc1da9ff4530 SHA512 f3fce9ba557515b89c5a875dc1e4e968eb3097776842026403e41ebe972c2e4e764303c729c5835466faaa2675fa361fe7e0512d7a8222d7d8b1202a9049f98e EBUILD devmanual-0_pre20141116.ebuild 1762 BLAKE2B 83186e74a1172f7cef733e972bda7c3c88c91d094c9b260e004b16d4e60ca366dc257fc7e108388ef4d6c558e02d669ccdc424737fe03d7e4906c40488695522 SHA512 9420d56918fa471001ab39ffe0e99f8beee07d669e486d1691398c29266898cb5a2426c9d864680529d9a4cb9f13b3829c52827fc6f04f6e3dc4f1c0f26c08a6 -EBUILD devmanual-9999.ebuild 1865 BLAKE2B 34c7848ea709f61dd73e0df3a7f0df1eb478de8216c38b6a80366606152441027f1bc39d8b839603fb42ca4709635a1362e8c2689755e382bc89956b1e35343e SHA512 60908b9057d813ff2b996e1b1aa568eb8d27e53c43898119797dcc936bdc18b432b540170848863f60ab70a17e5311aeebaa12b4f61271344b433b5ebf223b2d -MISC metadata.xml 550 BLAKE2B 4dbe114f2a848bbd10db5cd94e02f1965873afe99669fe3e129ffafe17d4bc70ad7e68428783d2288577c3889c05f8eb352d79d6629be824ec103cdb26a80bd3 SHA512 6acfc5436dcd473e987891ed565af102214244b68abc3f809affe0f04de6146fb3b29246d4e6175a007f5c683480a51aabd155ba5577894e4bd700e26a5c3cae +EBUILD devmanual-0_pre20200203.ebuild 1568 BLAKE2B 39ccd01eee00a829cb5ec9ed86f4b26ed64633c8f16ddb03deaf8adbb4ebf0e8734d3892031215f4acfc00e951bfef1e7b4ebb5e8e8467695a59e8d22caa00ac SHA512 aeb630dc70ff4593ca04e12353a8e813536891abb8a8b590e59a80972529de15bf36969c2ade7106a338cddb212dc04eab6a8b1f79352ff44e67e7606e917766 +EBUILD devmanual-9999.ebuild 1593 BLAKE2B b3e9af4451eae139bb0da29b651d07ac955f73497ed7c22fb6c9ba1528d2add506969b1188e484303a14421c53ddb5afcf4e7e2cc056faf82ea80d7ce5950ca8 SHA512 3205886614331a76e3d88f6e03f6afe849d966c0cc28cd3f19e42988b03a3f18d950f271d558e1678acddba1a9cba6ecaf83d86a763b2f056922504e7476b7af +MISC metadata.xml 556 BLAKE2B 48629cbf7feab0623f0ffbe1c7f36163a5d72f591bd90cfb23ccef3058699639365d3184e4decac51a1b6b39ce0647350f6aaf2244e9044a17482f93f5181282 SHA512 e409f579c8c7c65a55cfd2c64e7ec307f58318af102b5717a8208c96775bbca488dde34d61b04963e9a3c86b793ba5b7b9b04edd763e46db391cc63d24bab102 diff --git a/app-doc/devmanual/devmanual-0_pre20200203.ebuild b/app-doc/devmanual/devmanual-0_pre20200203.ebuild new file mode 100644 index 000000000000..05f7076fc8ec --- /dev/null +++ b/app-doc/devmanual/devmanual-0_pre20200203.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 + +DESCRIPTION="The Gentoo Development Guide" +HOMEPAGE="https://devmanual.gentoo.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git" +else + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/${PN}" + KEYWORDS="~amd64 ~arm ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x64-macos" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" +IUSE="+offline" + +BDEPEND="dev-libs/libxml2 + dev-libs/libxslt + gnome-base/librsvg + media-fonts/open-sans" + +PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch ) + +src_compile() { + emake build OFFLINE=$(usex offline 1 0) + use offline || emake documents.js +} + +src_install() { + # clean out XML/XSL before installing + find . \( \ + -iname '*.xml' -o \ + -iname '*.dtd' -o \ + -iname '*.xsl' -o \ + -iname '*.svg' \) -delete || die + rm -r bin xsl .git* LICENSE Makefile README.md || die + + local HTML_DOCS=( . ) + einstalldocs + + local DOC_CONTENTS="In order to browse the Gentoo Development Guide in + offline mode, point your browser to the following url: + file://${EPREFIX}/usr/share/doc/${PF}/html/index.html" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + if ! has_version app-doc/eclass-manpages; then + elog "The offline version of the devmanual does not include the" + elog "documentation for the eclasses. If you need it, then emerge" + elog "the following package:" + elog + elog "app-doc/eclass-manpages" + fi +} diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild index 8ad5f06a357e..1957ff9c99ef 100644 --- a/app-doc/devmanual/devmanual-9999.ebuild +++ b/app-doc/devmanual/devmanual-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,49 +12,42 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git" else - SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz" + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/${PN}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos" fi -LICENSE="CC-BY-SA-3.0" +LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="+fallback" +IUSE="+offline" -BDEPEND="dev-libs/libxslt - media-gfx/imagemagick[truetype,svg,png]" +BDEPEND="dev-libs/libxml2 + dev-libs/libxslt + gnome-base/librsvg + media-fonts/open-sans" -src_prepare() { - default - use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch -} +PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch ) src_compile() { - # Imagemagick uses inkscape (if present) to delegate - # svg conversions. - # Inkscape uses g_get_user_config_dir () which in turn - # uses XDG_CONFIG_HOME to get the config directory for this - # user. See bug 463380 - export XDG_CONFIG_HOME="${T}/inkscape_home" - emake + emake build OFFLINE=$(usex offline 1 0) + use offline || emake documents.js } src_install() { # clean out XML/XSL before installing find . \( \ -iname '*.xml' -o \ + -iname '*.dtd' -o \ -iname '*.xsl' -o \ -iname '*.svg' \) -delete || die - rm -r README.md xsl LICENSE Makefile || die + rm -r bin xsl .git* LICENSE Makefile README.md || die local HTML_DOCS=( . ) einstalldocs - einfo "Creating symlink from ${PF} to ${PN} for preserving bookmarks" - dosym ${PF} /usr/share/doc/${PN} - local DOC_CONTENTS="In order to browse the Gentoo Development Guide in offline mode, point your browser to the following url: - ${EPREFIX}/usr/share/doc/devmanual/html/index.html" + file://${EPREFIX}/usr/share/doc/${PF}/html/index.html" readme.gentoo_create_doc } @@ -66,6 +59,5 @@ pkg_postinst() { elog "the following package:" elog elog "app-doc/eclass-manpages" - elog fi } diff --git a/app-doc/devmanual/files/devmanual-eclasses.patch b/app-doc/devmanual/files/devmanual-eclasses.patch new file mode 100644 index 000000000000..88b2322c25b6 --- /dev/null +++ b/app-doc/devmanual/files/devmanual-eclasses.patch @@ -0,0 +1,20 @@ +The offline version doesn't generate eclass manpages. +Add a dummy file, otherwise internal links would be broken. + +--- /dev/null ++++ b/eclass-reference/text.xml +@@ -0,0 +1,14 @@ ++ ++ ++ ++Eclass Reference ++ ++ ++ ++The offline version of the devmanual does not include the documentation for the ++eclasses. If you need it, emerge app-doc/eclass-manpages. ++ ++ ++ ++ ++ diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch deleted file mode 100644 index 789451d13b2b..000000000000 --- a/app-doc/devmanual/files/devmanual-fallback.patch +++ /dev/null @@ -1,60 +0,0 @@ -Fix assets for offline browsing. -https://bugs.gentoo.org/617724 - ---- a/devbook.xsl -+++ b/devbook.xsl -@@ -439,11 +439,9 @@ - ../ - - -- -+ - - -- -- - - - -@@ -476,9 +474,6 @@ - - -@@ -566,8 +561,6 @@ - - - -- -- - - - ---- /dev/null -+++ b/fallback.css -@@ -0,0 +1,20 @@ -+body { -+ margin: 40px auto; -+ max-width: 650px; -+ line-height: 1.6; -+ font-size: 18px; -+ color: #454545; -+ padding: 0 10px; -+} -+ -+h1,h2,h3,h4,h5,h6 { -+ line-height: 1.2; -+} -+ -+.divider, -+.footerlinks, -+.navbar-toggle, -+.site-title, -+.tyrian-navbar { -+ display: none; -+} diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml index 6179f6436327..9248012735bc 100644 --- a/app-doc/devmanual/metadata.xml +++ b/app-doc/devmanual/metadata.xml @@ -13,6 +13,8 @@ - Use alternative minimal stylesheet instead of tyrian theme. + + Use alternative minimal stylesheet instead of Tyrian theme. + -- cgit v1.2.3