From 2bc25a732ed5a62625a46ce3efb2f1c6e9c3cfae Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 10:36:50 +0100 Subject: [PATCH 01/11] dev-python/odfdo: fix RDEPEND and enable tests Add gh suffix to distfile, which causes a Manifest change. Closes: https://bugs.gentoo.org/944083 Signed-off-by: Lucio Sauer --- dev-python/odfdo/Manifest | 2 +- ...o-3.9.4-r1.ebuild => odfdo-3.9.4-r2.ebuild} | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) rename dev-python/odfdo/{odfdo-3.9.4-r1.ebuild => odfdo-3.9.4-r2.ebuild} (50%) diff --git a/dev-python/odfdo/Manifest b/dev-python/odfdo/Manifest index ce9afd9399..b72027b08a 100644 --- a/dev-python/odfdo/Manifest +++ b/dev-python/odfdo/Manifest @@ -1 +1 @@ -DIST odfdo-3.9.4.tar.gz 3857824 BLAKE2B a218e3f23470505fc8c089e33803958f6a59e9ebc70b1c7db243b83eb69a94469fec614f733b0826d935c491f12ccb37b3724ea1436bfc133e883773abe45099 SHA512 a8fe196c7eeb062d89b4f84fa04a1bec7d53b85637007ddae5a7e0655221a666c54bbfb0cc27de4858f58217e50b8a98a1fb90bea09fe356f428aaebb984a4ee +DIST odfdo-3.9.4.gh.tar.gz 3857824 BLAKE2B a218e3f23470505fc8c089e33803958f6a59e9ebc70b1c7db243b83eb69a94469fec614f733b0826d935c491f12ccb37b3724ea1436bfc133e883773abe45099 SHA512 a8fe196c7eeb062d89b4f84fa04a1bec7d53b85637007ddae5a7e0655221a666c54bbfb0cc27de4858f58217e50b8a98a1fb90bea09fe356f428aaebb984a4ee diff --git a/dev-python/odfdo/odfdo-3.9.4-r1.ebuild b/dev-python/odfdo/odfdo-3.9.4-r2.ebuild similarity index 50% rename from dev-python/odfdo/odfdo-3.9.4-r1.ebuild rename to dev-python/odfdo/odfdo-3.9.4-r2.ebuild index 990f90d91a..684494438b 100644 --- a/dev-python/odfdo/odfdo-3.9.4-r1.ebuild +++ b/dev-python/odfdo/odfdo-3.9.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,13 +9,19 @@ PYTHON_COMPAT=( python3_{12..13} ) inherit distutils-r1 DESCRIPTION="Python library for OpenDocument format (ODF)" -HOMEPAGE="https://github.com/jdum/odfdo" -SRC_URI="https://github.com/jdum/odfdo/archive/refs/tags/v${PV}.tar.gz -> odfdo-${PV}.tar.gz" +HOMEPAGE=" + https://github.com/jdum/odfdo + https://pypi.org/project/odfdo/ +" +SRC_URI="https://github.com/jdum/odfdo/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -RDEPEND=" - >=dev-python/poetry-core-1.9.1 -" +RDEPEND=">=dev-python/lxml-5.3.0[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +# No need to test performance downstream +EPYTEST_DESELECT=( tests/test_performance.py::test_all_perf ) From 13b8cbdf3770ba369640a61f99523fc82ae23787 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 10:48:38 +0100 Subject: [PATCH 02/11] dev-python/odfdo: add metadata.xml Signed-off-by: Lucio Sauer --- dev-python/odfdo/metadata.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 dev-python/odfdo/metadata.xml diff --git a/dev-python/odfdo/metadata.xml b/dev-python/odfdo/metadata.xml new file mode 100644 index 0000000000..ba31338ea6 --- /dev/null +++ b/dev-python/odfdo/metadata.xml @@ -0,0 +1,15 @@ + + + + + + + https://github.com/jdum/odfdo/blob/master/CHANGES.md + + jerome.dumonteil@gmail.com + Jérôme Dumonteil + + jdum/odfdo + odfdo + + From e6a427612e2ccfe149a89350971ddcc39ae4b32f Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 10:50:22 +0100 Subject: [PATCH 03/11] dev-python/odfdo: add 3.13.3 Signed-off-by: Lucio Sauer --- dev-python/odfdo/Manifest | 1 + dev-python/odfdo/odfdo-3.13.3.ebuild | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dev-python/odfdo/odfdo-3.13.3.ebuild diff --git a/dev-python/odfdo/Manifest b/dev-python/odfdo/Manifest index b72027b08a..8db6d254e8 100644 --- a/dev-python/odfdo/Manifest +++ b/dev-python/odfdo/Manifest @@ -1 +1,2 @@ +DIST odfdo-3.13.3.gh.tar.gz 4262739 BLAKE2B ccf71a67fea3c7160c8316fceefac805ea4aed1ece4702a12231ff94a98fcf2b5d19db2f4eee67d85b7fd30a1a7ac80c371fac59fb1ecb3528bbbddf107ab8c1 SHA512 7f30687f2f71a54f8f0983a564c97585d1b48894865bf9a7c695114c52170056e7c5dc274461e0225b6c19b6b47934de4992743c2aa948a69b1aa35cd8d55d91 DIST odfdo-3.9.4.gh.tar.gz 3857824 BLAKE2B a218e3f23470505fc8c089e33803958f6a59e9ebc70b1c7db243b83eb69a94469fec614f733b0826d935c491f12ccb37b3724ea1436bfc133e883773abe45099 SHA512 a8fe196c7eeb062d89b4f84fa04a1bec7d53b85637007ddae5a7e0655221a666c54bbfb0cc27de4858f58217e50b8a98a1fb90bea09fe356f428aaebb984a4ee diff --git a/dev-python/odfdo/odfdo-3.13.3.ebuild b/dev-python/odfdo/odfdo-3.13.3.ebuild new file mode 100644 index 0000000000..684494438b --- /dev/null +++ b/dev-python/odfdo/odfdo-3.13.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{12..13} ) + +inherit distutils-r1 + +DESCRIPTION="Python library for OpenDocument format (ODF)" +HOMEPAGE=" + https://github.com/jdum/odfdo + https://pypi.org/project/odfdo/ +" +SRC_URI="https://github.com/jdum/odfdo/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-python/lxml-5.3.0[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +# No need to test performance downstream +EPYTEST_DESELECT=( tests/test_performance.py::test_all_perf ) From 97664fe0153029508c4e71e97362bb9cebd172dc Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 10:50:35 +0100 Subject: [PATCH 04/11] dev-python/odfdo: drop 3.9.4-r2 Signed-off-by: Lucio Sauer --- dev-python/odfdo/Manifest | 1 - dev-python/odfdo/odfdo-3.9.4-r2.ebuild | 27 -------------------------- 2 files changed, 28 deletions(-) delete mode 100644 dev-python/odfdo/odfdo-3.9.4-r2.ebuild diff --git a/dev-python/odfdo/Manifest b/dev-python/odfdo/Manifest index 8db6d254e8..88af67d218 100644 --- a/dev-python/odfdo/Manifest +++ b/dev-python/odfdo/Manifest @@ -1,2 +1 @@ DIST odfdo-3.13.3.gh.tar.gz 4262739 BLAKE2B ccf71a67fea3c7160c8316fceefac805ea4aed1ece4702a12231ff94a98fcf2b5d19db2f4eee67d85b7fd30a1a7ac80c371fac59fb1ecb3528bbbddf107ab8c1 SHA512 7f30687f2f71a54f8f0983a564c97585d1b48894865bf9a7c695114c52170056e7c5dc274461e0225b6c19b6b47934de4992743c2aa948a69b1aa35cd8d55d91 -DIST odfdo-3.9.4.gh.tar.gz 3857824 BLAKE2B a218e3f23470505fc8c089e33803958f6a59e9ebc70b1c7db243b83eb69a94469fec614f733b0826d935c491f12ccb37b3724ea1436bfc133e883773abe45099 SHA512 a8fe196c7eeb062d89b4f84fa04a1bec7d53b85637007ddae5a7e0655221a666c54bbfb0cc27de4858f58217e50b8a98a1fb90bea09fe356f428aaebb984a4ee diff --git a/dev-python/odfdo/odfdo-3.9.4-r2.ebuild b/dev-python/odfdo/odfdo-3.9.4-r2.ebuild deleted file mode 100644 index 684494438b..0000000000 --- a/dev-python/odfdo/odfdo-3.9.4-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{12..13} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for OpenDocument format (ODF)" -HOMEPAGE=" - https://github.com/jdum/odfdo - https://pypi.org/project/odfdo/ -" -SRC_URI="https://github.com/jdum/odfdo/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=">=dev-python/lxml-5.3.0[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -# No need to test performance downstream -EPYTEST_DESELECT=( tests/test_performance.py::test_all_perf ) From 4930210f903c9aacf7516f19aab6f21b7e86e5a9 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 11:06:44 +0100 Subject: [PATCH 05/11] dev-python/odsparsator: fix RDEPEND and enable tests Add gh suffix to distfile, which causes a Manifest change. Closes: https://bugs.gentoo.org/944085 Signed-off-by: Lucio Sauer --- dev-python/odsparsator/Manifest | 2 +- ...2.1-r1.ebuild => odsparsator-1.12.1-r2.ebuild} | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) rename dev-python/odsparsator/{odsparsator-1.12.1-r1.ebuild => odsparsator-1.12.1-r2.ebuild} (59%) diff --git a/dev-python/odsparsator/Manifest b/dev-python/odsparsator/Manifest index 8c9168de02..ef6d646f81 100644 --- a/dev-python/odsparsator/Manifest +++ b/dev-python/odsparsator/Manifest @@ -1 +1 @@ -DIST odsparsator-1.12.1.tar.gz 167385 BLAKE2B 278236054b9dbf94c93757517e0d577c25e034b58332838c487c096b14382c92fa50eec4fcfcf5aba7ad2540939f26b0a558c3b6a090d53ba0c2a39f74173871 SHA512 c3c9abd8634f71826291a3a6f3b1684141c40932a8a77b01e48ef1205dfdac2863710c776c4000ff5b038960c41fa692ac67f9888dbf9e43e1405d166a1ac669 +DIST odsparsator-1.12.1.gh.tar.gz 167385 BLAKE2B 278236054b9dbf94c93757517e0d577c25e034b58332838c487c096b14382c92fa50eec4fcfcf5aba7ad2540939f26b0a558c3b6a090d53ba0c2a39f74173871 SHA512 c3c9abd8634f71826291a3a6f3b1684141c40932a8a77b01e48ef1205dfdac2863710c776c4000ff5b038960c41fa692ac67f9888dbf9e43e1405d166a1ac669 diff --git a/dev-python/odsparsator/odsparsator-1.12.1-r1.ebuild b/dev-python/odsparsator/odsparsator-1.12.1-r2.ebuild similarity index 59% rename from dev-python/odsparsator/odsparsator-1.12.1-r1.ebuild rename to dev-python/odsparsator/odsparsator-1.12.1-r2.ebuild index 189f72666c..6760d516d8 100644 --- a/dev-python/odsparsator/odsparsator-1.12.1-r1.ebuild +++ b/dev-python/odsparsator/odsparsator-1.12.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,13 +9,16 @@ PYTHON_COMPAT=( python3_{12..13} ) inherit distutils-r1 DESCRIPTION="Generate a JSON file from an OpenDocument Format .ods file." -HOMEPAGE="https://github.com/jdum/odsparsator" -SRC_URI="https://github.com/jdum/odsparsator/archive/refs/tags/v${PV}.tar.gz -> odsparsator-${PV}.tar.gz" +HOMEPAGE=" + https://github.com/jdum/odsparsator + https://pypi.org/project/odsparsator/ +" +SRC_URI="https://github.com/jdum/odsparsator/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -RDEPEND=" - >=dev-python/poetry-core-1.9.1 -" +RDEPEND="dev-python/odfdo[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest From a490afbc27e2fc81f38a37a67baf11b0b5473e3e Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 Jan 2025 11:10:38 +0100 Subject: [PATCH 06/11] dev-python/odsparsator: add metadata.xml Signed-off-by: Lucio Sauer --- dev-python/odsparsator/metadata.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 dev-python/odsparsator/metadata.xml diff --git a/dev-python/odsparsator/metadata.xml b/dev-python/odsparsator/metadata.xml new file mode 100644 index 0000000000..d6c895a359 --- /dev/null +++ b/dev-python/odsparsator/metadata.xml @@ -0,0 +1,15 @@ + + + + + + + https://github.com/jdum/odsparsator/releases + + jerome.dumonteil@gmail.com + Jérôme Dumonteil + + jdum/odsparsator + odsparsator + + From 0078193207391451693edc33823bfdbb5a7ba3bb Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 12 Jan 2025 11:49:32 +0100 Subject: [PATCH 07/11] gui-libs/xdg-desktop-portal-hyprland: add 1.3.9 Signed-off-by: Johannes Huber Signed-off-by: David Roman --- gui-libs/xdg-desktop-portal-hyprland/Manifest | 1 + .../xdg-desktop-portal-hyprland-1.3.9.ebuild | 72 +++++++++++++++++++ .../xdg-desktop-portal-hyprland-9999.ebuild | 18 ++--- 3 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.9.ebuild diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest index 268f1a2789..97318f8eed 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/Manifest +++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest @@ -1,2 +1,3 @@ DIST xdg-desktop-portal-hyprland-1.3.3.gh.tar.gz 49323 BLAKE2B 6f0bd6636d1a457d238dbb9095782a41961e30b37eacd05e1a4d545fc933b9d3b529400321a31cfb08c6b5d69279bb8905e84f11743bf97b22587432a5e9cf14 SHA512 c100ca27e9cd430602ad0ea4733f34919d84206df084df0d9f8ed8ca8a634069cc7ef71cb587f92eae6eeedf4029a88644b24b9b8d37138cb544279f5be30720 DIST xdg-desktop-portal-hyprland-1.3.8.gh.tar.gz 50149 BLAKE2B 72fe8b534dce50f8a01e26660ba16516dc15f078a30fecff885afcbf6e36a6b47aefcb1f4cdbd7952d7bf7f1c89fabfb30f288915fdfa320b29f51a2d38cb2a7 SHA512 71e727c6fea3984f8eac62e5448fc7cf4f57ed28f2620a863578b210d2e0a8fd8882b12b65c5e8d3a3f690ef57206815dbb13a7fed4aab50418df2024d70269d +DIST xdg-desktop-portal-hyprland-1.3.9.gh.tar.gz 50667 BLAKE2B 581013bd3bfc2c38f17624cee3a6bc759c88db50d67e0de7031d1ee7cf4cf906238a176f26d12a8f2ae5a88caf983dfdd119d7919bfe2481c9a140d3f8b9ebd8 SHA512 2a157d406b63371b0594a679622e113379a326ef68a02163aa5c0b14703c2472f972d080ff146d401c87e084bbfdbc4133768792d4996c2d2ad45ca6db8ccc1e diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.9.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.9.ebuild new file mode 100644 index 0000000000..f9fbaa42e3 --- /dev/null +++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.9.ebuild @@ -0,0 +1,72 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="xdg-desktop-portal backend for hyprland" +HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/hyprwm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="elogind systemd" +REQUIRED_USE="?? ( elogind systemd )" + +DEPEND=" + >=dev-cpp/sdbus-c++-2.0.0 + dev-libs/hyprlang:= + dev-libs/inih + dev-libs/wayland + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtwayland:6 + media-libs/mesa + >=media-video/pipewire-1.2.0:= + sys-apps/util-linux + x11-libs/libdrm + || ( + sys-libs/basu + elogind? ( >=sys-auth/elogind-237 ) + systemd? ( >=sys-apps/systemd-237 ) + ) +" + +RDEPEND=" + ${DEPEND} + sys-apps/xdg-desktop-portal +" + +BDEPEND=" + dev-libs/hyprland-protocols + >=dev-libs/wayland-protocols-1.24 + >=dev-util/hyprwayland-scanner-0.4.2 + virtual/pkgconfig + || ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* ) +" + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then + eerror "XDPH needs >=gcc-14 or >=clang-17 to compile." + eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" + die "GCC version is too old to compile XDPH!" + elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then + eerror "XDPH needs >=gcc-14 or >=clang-17 to compile." + eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" + die "Clang version is too old to compile XDPH!" + fi +} + +src_prepare() { + sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die + cmake_src_prepare +} diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild index 720fc9be60..f9fbaa42e3 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild +++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,6 @@ IUSE="elogind systemd" REQUIRED_USE="?? ( elogind systemd )" DEPEND=" - >=media-video/pipewire-1.2.0:= >=dev-cpp/sdbus-c++-2.0.0 dev-libs/hyprlang:= dev-libs/inih @@ -30,12 +29,13 @@ DEPEND=" dev-qt/qtbase:6[gui,widgets] dev-qt/qtwayland:6 media-libs/mesa + >=media-video/pipewire-1.2.0:= sys-apps/util-linux x11-libs/libdrm || ( - systemd? ( >=sys-apps/systemd-237 ) - elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu + elogind? ( >=sys-auth/elogind-237 ) + systemd? ( >=sys-apps/systemd-237 ) ) " @@ -45,22 +45,22 @@ RDEPEND=" " BDEPEND=" + dev-libs/hyprland-protocols >=dev-libs/wayland-protocols-1.24 >=dev-util/hyprwayland-scanner-0.4.2 - dev-libs/hyprland-protocols virtual/pkgconfig - || ( >=sys-devel/gcc-13:* >=llvm-core/clang-17:* ) + || ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* ) " pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." + if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then + eerror "XDPH needs >=gcc-14 or >=clang-17 to compile." eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" die "GCC version is too old to compile XDPH!" elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." + eerror "XDPH needs >=gcc-14 or >=clang-17 to compile." eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile XDPH!" fi From d193f60e0f4213d03373034d037b0d5f4cb38b77 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 12 Jan 2025 11:59:49 +0100 Subject: [PATCH 08/11] gui-libs/xdg-desktop-portal-hyprland: remove 1.3.3-r3 Signed-off-by: Johannes Huber Closes: https://github.com/gentoo/guru/pull/276 Signed-off-by: David Roman --- gui-libs/xdg-desktop-portal-hyprland/Manifest | 1 - ...dg-desktop-portal-hyprland-1.3.3-r3.ebuild | 73 ------------------- 2 files changed, 74 deletions(-) delete mode 100644 gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild diff --git a/gui-libs/xdg-desktop-portal-hyprland/Manifest b/gui-libs/xdg-desktop-portal-hyprland/Manifest index 97318f8eed..ca85c6e6db 100644 --- a/gui-libs/xdg-desktop-portal-hyprland/Manifest +++ b/gui-libs/xdg-desktop-portal-hyprland/Manifest @@ -1,3 +1,2 @@ -DIST xdg-desktop-portal-hyprland-1.3.3.gh.tar.gz 49323 BLAKE2B 6f0bd6636d1a457d238dbb9095782a41961e30b37eacd05e1a4d545fc933b9d3b529400321a31cfb08c6b5d69279bb8905e84f11743bf97b22587432a5e9cf14 SHA512 c100ca27e9cd430602ad0ea4733f34919d84206df084df0d9f8ed8ca8a634069cc7ef71cb587f92eae6eeedf4029a88644b24b9b8d37138cb544279f5be30720 DIST xdg-desktop-portal-hyprland-1.3.8.gh.tar.gz 50149 BLAKE2B 72fe8b534dce50f8a01e26660ba16516dc15f078a30fecff885afcbf6e36a6b47aefcb1f4cdbd7952d7bf7f1c89fabfb30f288915fdfa320b29f51a2d38cb2a7 SHA512 71e727c6fea3984f8eac62e5448fc7cf4f57ed28f2620a863578b210d2e0a8fd8882b12b65c5e8d3a3f690ef57206815dbb13a7fed4aab50418df2024d70269d DIST xdg-desktop-portal-hyprland-1.3.9.gh.tar.gz 50667 BLAKE2B 581013bd3bfc2c38f17624cee3a6bc759c88db50d67e0de7031d1ee7cf4cf906238a176f26d12a8f2ae5a88caf983dfdd119d7919bfe2481c9a140d3f8b9ebd8 SHA512 2a157d406b63371b0594a679622e113379a326ef68a02163aa5c0b14703c2472f972d080ff146d401c87e084bbfdbc4133768792d4996c2d2ad45ca6db8ccc1e diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild deleted file mode 100644 index b1323e92b8..0000000000 --- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.3-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="xdg-desktop-portal backend for hyprland" -HOMEPAGE="https://github.com/hyprwm/xdg-desktop-portal-hyprland" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/hyprwm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="elogind systemd" -REQUIRED_USE="?? ( elogind systemd )" - -# sdbus is restricted to 0/1 due to #942404 -DEPEND=" - >=media-video/pipewire-1.2.0:= - dev-cpp/sdbus-c++:0/1 - dev-libs/hyprlang:= - dev-libs/inih - dev-libs/wayland - dev-qt/qtbase:6[gui,widgets] - dev-qt/qtwayland:6 - media-libs/mesa - sys-apps/util-linux - x11-libs/libdrm - || ( - systemd? ( >=sys-apps/systemd-237 ) - elogind? ( >=sys-auth/elogind-237 ) - sys-libs/basu - ) -" - -RDEPEND=" - ${DEPEND} - sys-apps/xdg-desktop-portal -" - -BDEPEND=" - >=dev-libs/wayland-protocols-1.24 - dev-libs/hyprland-protocols - virtual/pkgconfig - || ( >=sys-devel/gcc-13:* >=llvm-core/clang-17:* ) -" - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." - eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" - die "GCC version is too old to compile XDPH!" - elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then - eerror "XDPH needs >=gcc-13 or >=clang-17 to compile." - eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" - die "Clang version is too old to compile XDPH!" - fi -} - -src_prepare() { - eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.2_use_sys_sdbus-c++.patch" - sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die - cmake_src_prepare -} From 164df40767c362ba3f3e4371abadb53bef3bd2e1 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 14 Jan 2025 20:44:03 +0900 Subject: [PATCH 09/11] games-util/ProtonUp-Qt: add 2.11.1 Signed-off-by: Takuya Wakazono --- games-util/ProtonUp-Qt/Manifest | 1 + .../ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild | 47 ++++++++++++++++ .../ProtonUp-Qt/ProtonUp-Qt-9999.ebuild | 56 +++++++++---------- .../ProtonUp-Qt-2.11.1-add-entrypoint.patch | 11 ++++ 4 files changed, 86 insertions(+), 29 deletions(-) create mode 100644 games-util/ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild create mode 100644 games-util/ProtonUp-Qt/files/ProtonUp-Qt-2.11.1-add-entrypoint.patch diff --git a/games-util/ProtonUp-Qt/Manifest b/games-util/ProtonUp-Qt/Manifest index 825d4ba7c5..2f20823f8f 100644 --- a/games-util/ProtonUp-Qt/Manifest +++ b/games-util/ProtonUp-Qt/Manifest @@ -1 +1,2 @@ +DIST ProtonUp-Qt-2.11.1.tar.gz 944076 BLAKE2B bf2c1bd63e81b8fef15e78132b652e9b2ea44fe837ebaccd5eb12a719ef8199f013865f92dcf57e40bf5464f39d6fe7d69dc4e7eb4c5f9edc4d59d4fcace3087 SHA512 b839880656e8957c1b7d5d99a68b2809e208308ceb45df907e04bd1bd0ee24f695f79b3c7ba7c3ed12b9ed7e8106aed68afb361ff81181a556000c5717b25de7 DIST ProtonUp-Qt-2.9.2.tar.gz 915872 BLAKE2B a644c2b29b45cf925a9692c6f0e244d9bc1f22b74ab588f328bc0c2f8e2b07a9ca31e0e61bfde33aa24745e95d13f32e05308a22a4d393adaf888390c72e1095 SHA512 27c31c9b2e41f27deb71ca6c2a6d566ccd82fb0c8496b376ebb515239922425e15dd09b7582daf0a2da6e60dacbe22eab0854c96f4d1f665df840541d2bbfed7 diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild new file mode 100644 index 0000000000..c356479255 --- /dev/null +++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop distutils-r1 xdg + +DESCRIPTION="Install and manage GE-Proton, Luxtorpeda & more for Steam Lutris and Heroic." +HOMEPAGE="https://davidotek.github.io/protonup-qt/" +SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/pyaml[${PYTHON_USEDEP}] + dev-python/pyside6[dbus,gui,uitools,widgets,${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/steam[${PYTHON_USEDEP}] + dev-python/vdf[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/${P}-add-entrypoint.patch" +) + +distutils_enable_tests pytest + +src_prepare() { + # execute entry point instead + sed -i "/^Exec=/s/net.davidotek.pupgui2/${PN}/" share/applications/net.davidotek.pupgui2.desktop || die + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + domenu share/applications/net.davidotek.pupgui2.desktop + for size in 64 128 256; do + doicon -s ${size} share/icons/hicolor/${size}x${size}/apps/net.davidotek.pupgui2.png + done +} diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild index 97cf515d6f..c1fcf5197c 100644 --- a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild +++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild @@ -1,48 +1,46 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -_app_id=net.davidotek.pupgui2 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=(python3_{9..12}) +PYTHON_COMPAT=( python3_{10..12} ) -EPYTHON=python3 +inherit desktop distutils-r1 git-r3 xdg -inherit git-r3 distutils-r1 desktop xdg-utils -EGIT_REPO_URI="https://github.com/DavidoTek/ProtonUp-Qt.git" DESCRIPTION="Install and manage GE-Proton, Luxtorpeda & more for Steam Lutris and Heroic." -HOMEPAGE="https://davidotek.github.io/protonup-qt" +HOMEPAGE="https://davidotek.github.io/protonup-qt/" +EGIT_REPO_URI="https://github.com/DavidoTek/ProtonUp-Qt.git" LICENSE="GPL-3" SLOT="0" -DEPEND="dev-python/steam - dev-python/requests - dev-python/pyside6[dbus,gui,uitools,widgets] - dev-python/vdf - dev-python/pyxdg - dev-python/pyaml - dev-python/zstandard - dev-util/desktop-file-utils - dev-libs/appstream-glib +RDEPEND=" + dev-python/pyaml[${PYTHON_USEDEP}] + dev-python/pyside6[dbus,gui,uitools,widgets,${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/steam[${PYTHON_USEDEP}] + dev-python/vdf[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] " -src_compile() { - appstream-util validate-relax --nonet "share/metainfo/$_app_id.appdata.xml" - desktop-file-validate "share/applications/$_app_id.desktop" - distutils-r1_src_compile +PATCHES=( + "${FILESDIR}/${P}-add-entrypoint.patch" +) + +distutils_enable_tests pytest + +src_prepare() { + # execute entry point instead + sed -i "/^Exec=/s/net.davidotek.pupgui2/${PN}/" share/applications/net.davidotek.pupgui2.desktop || die + distutils-r1_src_prepare } src_install() { distutils-r1_src_install - domenu "${FILESDIR}/ProtonUp-Qt.desktop" - dobin "${FILESDIR}/ProtonUp-Qt" - newicon -s 64 "${WORKDIR}/${P}/share/icons/hicolor/64x64/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png - newicon -s 128 "${WORKDIR}/${P}/share/icons/hicolor/128x128/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png - newicon -s 256 "${WORKDIR}/${P}/share/icons/hicolor/256x256/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png -} - -pkg_postinst() { - xdg_icon_cache_update + domenu share/applications/net.davidotek.pupgui2.desktop + for size in 64 128 256; do + doicon -s ${size} share/icons/hicolor/${size}x${size}/apps/net.davidotek.pupgui2.png + done } diff --git a/games-util/ProtonUp-Qt/files/ProtonUp-Qt-2.11.1-add-entrypoint.patch b/games-util/ProtonUp-Qt/files/ProtonUp-Qt-2.11.1-add-entrypoint.patch new file mode 100644 index 0000000000..7d258ae366 --- /dev/null +++ b/games-util/ProtonUp-Qt/files/ProtonUp-Qt-2.11.1-add-entrypoint.patch @@ -0,0 +1,11 @@ +Add a GUI entry point. +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,3 +30,7 @@ install_requires = + zstandard>=0.19.0 + + packages = find: ++ ++[options.entry_points] ++gui_scripts = ++ ProtonUp-Qt = pupgui2.pupgui2:main From 5c982167249a069ab2bd23bbe31b8f62b15e24a2 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 14 Jan 2025 20:44:03 +0900 Subject: [PATCH 10/11] games-util/ProtonUp-Qt: drop 2.9.2 Signed-off-by: Takuya Wakazono --- games-util/ProtonUp-Qt/Manifest | 1 - .../ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild | 53 ------------------- games-util/ProtonUp-Qt/files/ProtonUp-Qt | 3 -- .../ProtonUp-Qt/files/ProtonUp-Qt.desktop | 12 ----- 4 files changed, 69 deletions(-) delete mode 100644 games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild delete mode 100644 games-util/ProtonUp-Qt/files/ProtonUp-Qt delete mode 100644 games-util/ProtonUp-Qt/files/ProtonUp-Qt.desktop diff --git a/games-util/ProtonUp-Qt/Manifest b/games-util/ProtonUp-Qt/Manifest index 2f20823f8f..02521d1802 100644 --- a/games-util/ProtonUp-Qt/Manifest +++ b/games-util/ProtonUp-Qt/Manifest @@ -1,2 +1 @@ DIST ProtonUp-Qt-2.11.1.tar.gz 944076 BLAKE2B bf2c1bd63e81b8fef15e78132b652e9b2ea44fe837ebaccd5eb12a719ef8199f013865f92dcf57e40bf5464f39d6fe7d69dc4e7eb4c5f9edc4d59d4fcace3087 SHA512 b839880656e8957c1b7d5d99a68b2809e208308ceb45df907e04bd1bd0ee24f695f79b3c7ba7c3ed12b9ed7e8106aed68afb361ff81181a556000c5717b25de7 -DIST ProtonUp-Qt-2.9.2.tar.gz 915872 BLAKE2B a644c2b29b45cf925a9692c6f0e244d9bc1f22b74ab588f328bc0c2f8e2b07a9ca31e0e61bfde33aa24745e95d13f32e05308a22a4d393adaf888390c72e1095 SHA512 27c31c9b2e41f27deb71ca6c2a6d566ccd82fb0c8496b376ebb515239922425e15dd09b7582daf0a2da6e60dacbe22eab0854c96f4d1f665df840541d2bbfed7 diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild deleted file mode 100644 index 28faa3832e..0000000000 --- a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=(python3_{9..12}) - -EPYTHON=python3 - -inherit distutils-r1 desktop xdg-utils - -_app_id=net.davidotek.pupgui2 - -DESCRIPTION="Install and manage GE-Proton, Luxtorpeda & more for Steam Lutris and Heroic." -HOMEPAGE="https://davidotek.github.io/protonup-qt" -SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-python/steam - dev-python/requests - dev-python/pyside6[gui,uitools,widgets] - dev-python/vdf - dev-python/pyxdg - dev-python/pyaml - dev-python/zstandard -" -DEPEND="${RDEPEND} - dev-util/desktop-file-utils - dev-libs/appstream-glib -" - -src_compile() { - appstream-util validate-relax --nonet "share/metainfo/$_app_id.appdata.xml" - desktop-file-validate "share/applications/$_app_id.desktop" - distutils-r1_src_compile -} - -src_install() { - distutils-r1_src_install - domenu "${FILESDIR}/ProtonUp-Qt.desktop" - dobin "${FILESDIR}/ProtonUp-Qt" - newicon -s 64 "${WORKDIR}/${P}/share/icons/hicolor/64x64/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png - newicon -s 128 "${WORKDIR}/${P}/share/icons/hicolor/128x128/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png - newicon -s 256 "${WORKDIR}/${P}/share/icons/hicolor/256x256/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png -} - -pkg_postinst() { - xdg_icon_cache_update -} diff --git a/games-util/ProtonUp-Qt/files/ProtonUp-Qt b/games-util/ProtonUp-Qt/files/ProtonUp-Qt deleted file mode 100644 index f2b298357c..0000000000 --- a/games-util/ProtonUp-Qt/files/ProtonUp-Qt +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -/usr/bin/python -m pupgui2 "$@" \ No newline at end of file diff --git a/games-util/ProtonUp-Qt/files/ProtonUp-Qt.desktop b/games-util/ProtonUp-Qt/files/ProtonUp-Qt.desktop deleted file mode 100644 index 8121071390..0000000000 --- a/games-util/ProtonUp-Qt/files/ProtonUp-Qt.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=ProtonUp-Qt -Exec=/usr/bin/ProtonUp-Qt -Type=Application -Comment=Install Wine and Proton-based Compatibility Tools -Comment[de]=Wine und Proton Kompatibilitätstools installieren -Comment[it]=Installa tool di compatibilità basati su Wine e Proton -Comment[nl]=Installeer op Wine en Proton gebaseerde compatibiliteitshulpmiddelen -Comment[pl]=Zainstaluj narzędzia kompatybilności oparte na Wine i Protonie -Terminal=false -Icon=ProtonUp-Qt -Categories=Game;Utility; \ No newline at end of file From d6e86fdd73e4edffe0334eccb6b336620561efed Mon Sep 17 00:00:00 2001 From: strategictraveler Date: Tue, 14 Jan 2025 11:54:00 +0000 Subject: [PATCH 11/11] games-roguelike/cataclysm-dda: Add doc USE flag and install man pages Signed-off-by: strategictraveler --- .../cataclysm-dda/cataclysm-dda-0h.ebuild | 12 ++++++++++-- .../cataclysm-dda/cataclysm-dda-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild index e14d0d9b09..eb07fc8806 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ fi # CC-BY-SA-4.0 for soundpack LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0" -IUSE="debug ncurses nls +sound +soundpack test +tiles" +IUSE="debug doc ncurses nls +sound +soundpack test +tiles" REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \ || ( tiles ncurses )" RESTRICT="!test? ( test )" @@ -50,6 +50,7 @@ RDEPEND=" )" DEPEND="${RDEPEND}" BDEPEND=" + doc? ( app-text/doxygen[dot] ) soundpack? ( app-arch/unzip ) nls? ( sys-devel/gettext ) " @@ -121,6 +122,8 @@ src_compile() { use nls && export LANGUAGES="all" + use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs" + if use ncurses; then # don't build tests twice if ! use tiles; then @@ -151,6 +154,11 @@ src_install() { [[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin "${WORKDIR}/cataclysm-${SLOT}" + use doc && dodoc -r doxygen_doc/html + + use tiles && newman "doc/cataclysm-tiles.6" "cataclysm-tiles-${SLOT}.6" + use ncurses && newman "doc/cataclysm.6" "cataclysm-${SLOT}.6" + if use soundpack; then insinto "/usr/share/${PN}-${SLOT}/sound" doins -r "${WORKDIR}/CC-Sounds" diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild index 1b614c23bc..b8428c2f5a 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ fi # CC-BY-SA-4.0 for soundpack LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0" -IUSE="debug ncurses nls +sound +soundpack test +tiles" +IUSE="debug doc ncurses nls +sound +soundpack test +tiles" REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \ || ( tiles ncurses )" RESTRICT="!test? ( test )" @@ -50,6 +50,7 @@ RDEPEND=" )" DEPEND="${RDEPEND}" BDEPEND=" + doc? ( app-text/doxygen[dot] ) nls? ( sys-devel/gettext ) " @@ -115,6 +116,8 @@ src_compile() { use nls && export LANGUAGES="all" + use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs" + if use ncurses; then # don't build tests twice if ! use tiles; then @@ -145,6 +148,11 @@ src_install() { [[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin "${WORKDIR}/cataclysm-${SLOT}" + use doc && dodoc -r doxygen_doc/html + + use tiles && newman "doc/cataclysm-tiles.6" "cataclysm-tiles-${SLOT}.6" + use ncurses && newman "doc/cataclysm.6" "cataclysm-${SLOT}.6" + if use soundpack; then insinto "/usr/share/${PN}-${SLOT}/sound" doins -r "${WORKDIR}/CC-Sounds"