From 49c7c98657b29a3ea8865e4280b150c20b40c249 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 27 Jan 2020 22:20:53 +0100 Subject: app-doc/devmanual: Update the live ebuild. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This accounts for several changes in the devmanual repository. Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Ulrich Müller --- app-doc/devmanual/devmanual-9999.ebuild | 24 ++++----- app-doc/devmanual/files/devmanual-eclasses.patch | 20 +++++++ app-doc/devmanual/files/devmanual-fallback.patch | 69 +++++++++++++++++++++--- 3 files changed, 94 insertions(+), 19 deletions(-) create mode 100644 app-doc/devmanual/files/devmanual-eclasses.patch diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild index 8ad5f06a357e..0cd5087804b2 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 @@ -16,12 +16,16 @@ else 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" -BDEPEND="dev-libs/libxslt - media-gfx/imagemagick[truetype,svg,png]" +BDEPEND="dev-libs/libxml2 + dev-libs/libxslt + gnome-base/librsvg + media-fonts/open-sans" + +PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch ) src_prepare() { default @@ -29,22 +33,18 @@ src_prepare() { } 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 + use fallback || 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 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 index 789451d13b2b..9e86cca39c8e 100644 --- a/app-doc/devmanual/files/devmanual-fallback.patch +++ b/app-doc/devmanual/files/devmanual-fallback.patch @@ -3,20 +3,18 @@ https://bugs.gentoo.org/617724 --- a/devbook.xsl +++ b/devbook.xsl -@@ -439,11 +439,9 @@ - ../ - +@@ -451,9 +451,7 @@ -- -+ - - +- ++ -@@ -476,9 +474,6 @@ +@@ -486,9 +484,6 @@ -@@ -566,8 +561,6 @@ +@@ -530,45 +525,7 @@ + + + +- + +- +
+
+
+@@ -613,19 +570,7 @@
- - +- +- +- +- +- +- ../ +- +- +- +- + --- /dev/null +++ b/fallback.css @@ -0,0 +1,20 @@ -- cgit v1.2.3-65-gdbad