commit: 38e0f0a5b383d1b1f703d983ddb473ba1fa52fa0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 11:21:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 11:21:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e0f0a5
app-text/doxygen: drop 1.9.6, 1.9.7-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/doxygen/Manifest | 2 -
app-text/doxygen/doxygen-1.9.6.ebuild | 139 --------------------
app-text/doxygen/doxygen-1.9.7-r1.ebuild | 142 ---------------------
.../files/doxygen-1.9.1-do_not_force_libcxx.patch | 13 --
.../files/doxygen-1.9.1-ignore-bad-encoding.patch | 23 ----
5 files changed, 319 deletions(-)
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index ffc5043bf704..0a55723b880d 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -1,4 +1,2 @@
DIST doxygen-1.10.0.src.tar.gz 8400410 BLAKE2B
dc7882dfb8b023e9250592375105cc79d4744362d96f4518b931ac264259257d27e0f2c5456580f3676bb54cc29fbc2ab3b2ffc37da6441297091c60a38dc13b
SHA512
885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416
-DIST doxygen-1.9.6.src.tar.gz 5293513 BLAKE2B
35d3286b47922776814bb7941c7a1cb27a5a50be35a9f231b1f072333d966630bbf0b97813f56711f71f040a0ceb87e7e1cbee04ca2aa3f035754ba844561697
SHA512
f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
-DIST doxygen-1.9.7.src.tar.gz 5736446 BLAKE2B
e0f6e06399a2dda7226fe8fea351a79f19bf71aee51fba0ce113c3423b85aa633ce8d98894e3e49027839c2accc18af87c7f23a1fd37c0de441de42a8a76d307
SHA512
618ff58aa6f0a2eb89f95b570995ea3ebbcda64f502cabcecd9be2967abffb56d0d6747de0c06df422705919757e6af9c6e5a56ca603b1ddf7a09a7ee79b1803
DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B
9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944
SHA512
edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
diff --git a/app-text/doxygen/doxygen-1.9.6.ebuild
b/app-text/doxygen/doxygen-1.9.6.ebuild
deleted file mode 100644
index 12b8e39a7ff0..000000000000
--- a/app-text/doxygen/doxygen-1.9.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git";
-else
- SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz";
- SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.doxygen.nl/";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite test"
-# We need TeX for tests, bug #765472
-# We keep the odd construct of noop USE=test because of
-# the special relationship b/t RESTRICT & USE for tests. Also, it's a hint
-# which avoids tests being silently skipped during arch testing.
-REQUIRED_USE="test? ( doc )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="app-alternatives/yacc
- app-alternatives/lex
- ${PYTHON_DEPS}
-"
-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
- dev-texlive/texlive-plaingeneric
- )
- doxysearch? ( dev-libs/xapian:= )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
- "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # 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() {
- # -Wodr warnings, see bug #854357 and
https://github.com/doxygen/doxygen/issues/9287
- filter-lto
-
- 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_src_configure
-}
-
-src_compile() {
- cmake_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/" \
- {testing/Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
-
- # -j1 for bug #770070
- cmake_src_compile docs -j1
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doman doc/*.1
-}
diff --git a/app-text/doxygen/doxygen-1.9.7-r1.ebuild
b/app-text/doxygen/doxygen-1.9.7-r1.ebuild
deleted file mode 100644
index 5c412c4fe5be..000000000000
--- a/app-text/doxygen/doxygen-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git";
-else
- SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz";
- SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="https://www.doxygen.nl/";
-
-# GPL-2 also for bundled libmscgen, MIT for bundled spdlog
-LICENSE="GPL-2 MIT"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite test"
-# We need TeX for tests, bug #765472
-# We keep the odd construct of noop USE=test because of
-# the special relationship b/t RESTRICT & USE for tests. Also, it's a hint
-# which avoids tests being silently skipped during arch testing.
-REQUIRED_USE="test? ( doc )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="app-alternatives/yacc
- app-alternatives/lex
- ${PYTHON_DEPS}
-"
-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
- dev-texlive/texlive-plaingeneric
- )
- doxysearch? ( dev-libs/xapian:= )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
- "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
- "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # 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() {
- # -Wodr warnings, see bug #854357 and
https://github.com/doxygen/doxygen/issues/9287
- filter-lto
-
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- -DBUILD_SHARED_LIBS=OFF
- -DGIT_EXECUTABLE="false"
- )
-
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_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/" \
- {testing/Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
-
- # -j1 for bug #770070
- cmake_src_compile docs -j1
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doman doc/*.1
-}
diff --git a/app-text/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch
b/app-text/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch
deleted file mode 100644
index f33f619e62ed..000000000000
--- a/app-text/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3775ed1..b3a1af6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,7 @@ option(build_doc "Build user manual (HTML and PDF)"
OFF)
- option(build_doc_chm "Build user manual (CHM)" OFF)
- option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF)
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-- option(use_libc++ "Use libc++ as C++ standard library." ON)
-+ option(use_libc++ "Use libc++ as C++ standard library." OFF)
- endif()
- option(use_libclang "Add support for libclang parsing." OFF)
- option(static_libclang "Link to a statically compiled version of
LLVM/libclang." OFF)
diff --git a/app-text/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
b/app-text/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
deleted file mode 100644
index 5dd7578f24ec..000000000000
--- a/app-text/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in
position 45: invalid start byte"
-in src/._xmlgen.cpp which is binary. This doesn't seem like it should be
present at the time the docs
-are generated, but this is simpler for now.
---- a/doc/translator.py
-+++ b/doc/translator.py
-@@ -1454,10 +1454,13 @@ class TrManager:
-
- # Read content of the file as one string.
- assert os.path.isfile(fname)
-- f = xopen(fname)
-- cont = f.read()
-- cont = ''.join(cont.split('\n')) # otherwise the 'match' function
won't work.
-- f.close()
-+ try:
-+ with xopen(fname) as f:
-+ cont = f.read()
-+ cont = ''.join(cont.split('\n')) # otherwise the 'match'
function won't work.
-+ except UnicodeDecodeError:
-+ print("Skipping {0} because of decoding errors".format(fname))
-+ return
-
- # Remove the items for identifiers that were found in the file.
- while lst_in:
