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 7BE12138350 for ; Mon, 27 Jan 2020 21:21:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06006E083D; Mon, 27 Jan 2020 21:21:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 49EDDE083D for ; Mon, 27 Jan 2020 21:21:49 +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 8D09C34E491 for ; Mon, 27 Jan 2020 21:21:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4141F8F for ; Mon, 27 Jan 2020 21:21:45 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1580160072.49c7c98657b29a3ea8865e4280b150c20b40c249.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/, app-doc/devmanual/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/devmanual/devmanual-9999.ebuild app-doc/devmanual/files/devmanual-eclasses.patch app-doc/devmanual/files/devmanual-fallback.patch X-VCS-Directories: app-doc/devmanual/files/ app-doc/devmanual/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 49c7c98657b29a3ea8865e4280b150c20b40c249 X-VCS-Branch: master Date: Mon, 27 Jan 2020 21:21:45 +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: 4055ffd4-52cf-4eb0-bde8-6acac7c3c0d7 X-Archives-Hash: 1e2dc8b14e9163f3ae5cc4eefb7acdfb commit: 49c7c98657b29a3ea8865e4280b150c20b40c249 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jan 27 21:20:53 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jan 27 21:21:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c7c986 app-doc/devmanual: Update the live ebuild. 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 gentoo.org> 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(-) diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild index 8ad5f06a357..0cd5087804b 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 00000000000..88b2322c25b --- /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 789451d13b2..9e86cca39c8 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 @@