Updating liguros repov21.1.3

7 files changed, 61 insertions, 204 deletions

diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index ebc70e1b5948..57a22b2e3638 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1 +1,2 @@
 DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
+DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
diff --git a/app-doc/devmanual/devmanual-0_pre20210118.ebuild b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
new file mode 100644
index 000000000000..7e891c4d74db
--- /dev/null
+++ b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-any-r1 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
+	# "make dist" in devmanual repo
+	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 ~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
+	${PYTHON_DEPS}"
+
+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-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index ef54bd1812f4..7e891c4d74db 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -13,6 +13,7 @@ if [[ ${PV} == *9999 ]]; 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 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
@@ -25,7 +26,8 @@ IUSE="+offline"
 BDEPEND="dev-libs/libxml2
 	dev-libs/libxslt
 	gnome-base/librsvg
-	media-fonts/open-sans"
+	media-fonts/open-sans
+	${PYTHON_DEPS}"
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
diff --git a/app-doc/diveintopython/Manifest b/app-doc/diveintopython/Manifest
index 9067c87f8419..eb03085a45eb 100644
--- a/app-doc/diveintopython/Manifest
+++ b/app-doc/diveintopython/Manifest
@@ -1,4 +1,2 @@
-DIST diveintopython-2-pdf.zip 782047 BLAKE2B aecb0dab23fc9737a22e032628e23eecdec1c56b330d7ba884acc97e63bc4f4b9ff5dc53ad89f588ef7e1d15991f1aa11cf70c479864a6b8e3b959287c299dbc SHA512 24857e22b587878e22b8347bb53ca60697b3940ea2d2f9ea7fe5eabc5d8d2b3d580b278379436f4282f515a25a285f3f558f461daa9edaae6f565c246154978c
-DIST diveintopython-2.zip 865555 BLAKE2B 55c541c3c77f3b0c4942212f4a15925571d1eb5974af4330f9edd610ba0037a9042442d2c1283d05e893888b2e2bb3da8cfe17c62a699fe8cb6e2682cbe0cd35 SHA512 9c57a9e228d30186b1e6fc10a47d4fa69704fd83ea68bba030d7909ad8df2b9cfeee942caf359b1dd1fd8f9459fee58ea8ddb3813759b17f06b93b3ccf4ca296
 DIST diveintopython-3-pdf.tar.gz 2235256 BLAKE2B 2617ae5fc8e7a61402a56aa43c094412bdf9b3350901980d4d0e33179f7e1ae9100e4d3ca8201e18a473c17205a7ee6a8efab55cfd230249f1eb07b671f90c96 SHA512 ecca7ba1540a48eb41b5bfd7ca878962939b9ec47eac6100f13d75eb24c6cae20177110877d34e6d1de47bed6883f9a25b379ced5c03b8c220103774a00a54b4
 DIST diveintopython-3.tar.gz 9958889 BLAKE2B 5c0b9764b6bb5f51af05142446750e9831fa6edb53336c47b398bf604c349e6c5c002c8f19f390d4929c94e2c19c5f0bb18a71ddb4b8b85d3701ee5feb35a4a4 SHA512 19a8498e4d91fc2ea2c899400336696732dae73da48faf55de43507e41e72a68c6ac25cea0acfdf3ca783344cd12c41326190ac9bbaf7ebdc113833e8bfea3a4
diff --git a/app-doc/diveintopython/diveintopython-2.ebuild b/app-doc/diveintopython/diveintopython-2.ebuild
deleted file mode 100644
index 0f68cfe2f3a0..000000000000
--- a/app-doc/diveintopython/diveintopython-2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="5.4"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 2"
-HOMEPAGE="https://www.diveintopython.net/"
-SRC_URI="
-http://www.diveintopython.net/download/${PN}-html-${MY_PV}.zip -> ${P}.zip
-pdf? ( http://www.diveintopython.net/download/${PN}-pdf-${MY_PV}.zip -> ${P}-pdf.zip )
-"
-
-LICENSE="FDL-1.1"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="pdf"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto "/usr/share/doc/${PN}-${SLOT}"
-	use pdf && dodoc "${PN}.pdf"
-	doins -r html/*
-	insinto "/usr/share/doc/${PN}-${SLOT}"/examples
-	doins -r py
-}
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
deleted file mode 100644
index 0f490f5c5a17..000000000000
--- a/app-doc/doxygen/doxygen-1.8.17.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( <sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
deleted file mode 100644
index cdc630c4d42b..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
-index 33e01c1..165fc3e 100644
---- a/addon/doxysearch/CMakeLists.txt
-+++ b/addon/doxysearch/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-                       qtools
-+                      pthread
- )
- 
- add_executable(doxysearch.cgi
-@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi
-                       ${XAPIAN_LIBRARIES}
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-+                      pthread
- )
- 
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index bf2eda8..8eb2a1c 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC}
- qt_use_modules(doxywizard Core Gui Widgets Xml)
- target_link_libraries(doxywizard
- ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
-+pthread
- )
- 
- install(TARGETS doxywizard DESTINATION bin)