[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/, app-doc/devmanual/

2024-11-29 Thread Ulrich Müller
commit: 21dfe2d866e05a9923cc5e6f6f4e10c555bab4c2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Nov 29 13:23:57 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Nov 29 13:26:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21dfe2d8

app-doc/devmanual: drop 0_pre20231106, 0_pre20241031

Signed-off-by: Ulrich Müller  gentoo.org>

 app-doc/devmanual/Manifest   |  2 -
 app-doc/devmanual/devmanual-0_pre20231106.ebuild | 60 
 app-doc/devmanual/devmanual-0_pre20241031.ebuild | 58 ---
 app-doc/devmanual/files/devmanual-eclasses.patch | 20 
 4 files changed, 140 deletions(-)

diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index 2a45283f4ab1..729d06de793b 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,3 +1 @@
-DIST devmanual-0_pre20231106.tar.xz 187040 BLAKE2B 
20992be79db2b581234a813740bd59c697af624d6edc86e29375078b63cdc13bed3eae116e21d2b82d568703983860cae7be00649f24eb90f2a6f6b7837525d7
 SHA512 
0434e0155876dff01105ac014528d8abaa19631c5b260d2c8c995c417053403ae652d4e082d0a08549994e3238024ed2592b145c6b0435ed84f87397fb7aeacc
-DIST devmanual-0_pre20241031.tar.xz 187940 BLAKE2B 
48ee136dcad8cf2766ea00cd8440b30e8e5a0460480f242417935c4b43bc46df0b36166d6a65a11a875d0ab4399dd8825cd75be3f1d32905d1243ecef6f51717
 SHA512 
0a9ac7978f0415f5c7cf6cb9faeecb42d91939b69522b2693122da714c9917186d5eff0eb44af14ecf433c525288a0863fdacdfa4b2baa486a600c97987660d0
 DIST devmanual-0_pre20241109.tar.xz 187844 BLAKE2B 
91e6d470e6a599d3437646ae884bf85a66482ca630ec2cf4f181ae2e9b785af57826dc4390b0c69525f23a68a664c8ea2d97ac3b74404b268d1fa1521ec12d81
 SHA512 
537a1a196efb3136c28bf8ff4edd48608bfb1ef01f92e5c8e0af7bb8f81fe58dcc2f971be22233b0d96a7a1906f1a9739f5583ccdd80e0fccbe58a21cc77e59d

diff --git a/app-doc/devmanual/devmanual-0_pre20231106.ebuild 
b/app-doc/devmanual/devmanual-0_pre20231106.ebuild
deleted file mode 100644
index 68d730c85f3a..
--- a/app-doc/devmanual/devmanual-0_pre20231106.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git";
-else
-   # "make dist" in devmanual repo
-   SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
-   S="${WORKDIR}/${PN}"
-   KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 
~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-libs/libxml2-2.9.12
-   dev-libs/libxslt
-   gnome-base/librsvg
-   media-fonts/open-sans
-   ${PYTHON_DEPS}
-   test? ( >=app-text/htmltidy-5.8.0 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
-
-src_compile() {
-   emake OFFLINE=$(usex offline 1 0)
-}
-
-src_install() {
-   emake OFFLINE=$(usex offline 1 0) \
-   DESTDIR="${D}" \
-   htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-   install
-
-   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"
-   if ! has_version app-doc/eclass-manpages; then
-   DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does 
not
-   include the documentation for the eclasses. If you need 
it,
-   then emerge app-doc/eclass-manpages."
-   fi
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}

diff --git a/app-doc/devmanual/devmanual-0_pre20241031.ebuild 
b/app-doc/devmanual/devmanual-0_pre20241031.ebuild
deleted file mode 100644
index eb6eb3a9d985..
--- a/app-doc/devmanual/devmanual-0_pre20241031.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git";
-else
-   # "make dist" in devmanual repo
-   SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
-   S="${WORKDIR}/${PN}"
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline test"
-RESTRICT="!t

[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/, app-doc/devmanual/

2020-02-03 Thread Ulrich Müller
commit: 9522709a3740c0c59967383265c82a2fd53c66af
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb  3 10:22:45 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb  3 11:08:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9522709a

app-doc/devmanual: Update live ebuild.

This accounts for "upstream" changes in XSL stylesheet and Makefile.
Drop unused patch. Rename the fallback USE flag to offline.

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 app-doc/devmanual/devmanual-.ebuild  | 14 ++
 app-doc/devmanual/files/devmanual-fallback.patch | 60 
 app-doc/devmanual/metadata.xml   |  4 +-
 3 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/app-doc/devmanual/devmanual-.ebuild 
b/app-doc/devmanual/devmanual-.ebuild
index 0cd5087804b..bb8f0ecfc78 100644
--- a/app-doc/devmanual/devmanual-.ebuild
+++ b/app-doc/devmanual/devmanual-.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-IUSE="+fallback"
+IUSE="+offline"
 
 BDEPEND="dev-libs/libxml2
dev-libs/libxslt
@@ -27,14 +27,9 @@ BDEPEND="dev-libs/libxml2
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
-src_prepare() {
-   default
-   use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch
-}
-
 src_compile() {
-   emake build
-   use fallback || emake documents.js
+   emake build OFFLINE=$(usex offline 1 0)
+   use offline || emake documents.js
 }
 
 src_install() {
@@ -54,7 +49,7 @@ src_install() {
 
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/${PN}/html/index.html"
readme.gentoo_create_doc
 }
 
@@ -66,6 +61,5 @@ pkg_postinst() {
elog "the following package:"
elog
elog "app-doc/eclass-manpages"
-   elog
fi
 }

diff --git a/app-doc/devmanual/files/devmanual-fallback.patch 
b/app-doc/devmanual/files/devmanual-fallback.patch
deleted file mode 100644
index 76cefe2547e..000
--- 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
-@@ -451,8 +451,7 @@
-   
-   
-   
--  https://assets.gentoo.org/tyrian/bootstrap.min.css"; 
rel="stylesheet" media="screen" />
--  https://assets.gentoo.org/tyrian/tyrian.min.css"; 
rel="stylesheet" media="screen" />
-+  
-   
-   https://www.gentoo.org/favicon.ico"; 
type="image/x-icon" />
- 
-@@ -486,9 +485,6 @@
-   
-   
- 
--  https://assets.gentoo.org/tyrian/site-logo.svg"; type="image/svg+xml">
--https://assets.gentoo.org/tyrian/site-logo.png"; 
alt="Gentoo Linux Logo" />
--  
- 
- Development Guide
-   
-@@ -613,9 +609,6 @@
-   
- 
-   
--  https://assets.gentoo.org/tyrian/jquery.min.js";>
--  https://assets.gentoo.org/tyrian/bootstrap.min.js";>
--  https://assets.gentoo.org/lunr/lunr.min.js";>
-   
-   
-   
 /dev/null
-+++ b/fallback.css
-@@ -0,0 +1,22 @@
-+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,
-+.input-group,
-+.modal-dialog,
-+.navbar-toggle,
-+.site-title,
-+.tyrian-navbar {
-+display: none;
-+}

diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index 6179f643632..9248012735b 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.
+