gentoo resync : 20.03.2022

3 files changed, 93 insertions, 0 deletions

diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 14fe543520bd..63502787cb26 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,6 +1,9 @@
+AUX agedu-20211129-fix-automagic-halibut-docs.patch 1448 BLAKE2B 5b652e5401f892500024c1b3d9361eb040da7c343dfb555192e22736d5a502447a13b34892513d98c537273a6c6a8f20cce99f6bc289d86eaa00195b7865c90e SHA512 21ad2d26f1091050ce71687715061bf64feb3b599399d71edd8b8a489f9a70bffd1731279b36079534ac1905acff0c8fe46db24267bd3234d88ece0fc7edcbd3
 AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
 DIST agedu-20200617.cec3021.tar.gz 181804 BLAKE2B 19acc1ac37d09f45227e08b92483c1a0be7d9faaf4b2bf65479ca99a0294305788e88d6494508ac742a4396c4a22352d927c125ed7437fe29cb71890dbb2217b SHA512 d7a913a867817a0457c8ec3644a6986ed3632721df1040de1db96c04e85f9e59c4aba632dc1f3f3666496435b6be3f68335a2ec3e50440c844ebd4ab81b2682a
 DIST agedu-20200705.2a7d4a2.tar.gz 181809 BLAKE2B 2802b223979b2f15efd14b6f1f445b9ca00312068ade3c26a057d54a65d5074fdcdee043c9673a59e4e6cc222deba7c817ee078a0a742f09ec1087ec921414bd SHA512 a65f90990706493fc2a080dc313706107ab603f461dcd63531f9afbc1efe785747947f2222559ab2b0b354453a7d9242025c7b96df7f4cac608b8422855c55d6
+DIST agedu-20211129.tar.gz 92346 BLAKE2B 8e865ba5dbccd22aff82da715b7fd606c915e7fd98f34a6b01dec7be5f98d3a8995667417137eb67540ff561b5e932ee7a95e0346325cea2a8e14055b75fb2a8 SHA512 6291b80db953b8b6ef61aa557636fe11c556acc67b3005a32b8a335afe7aff1a4c7935aa766a19d28c549857ac02bf2707febd850bcc60befca79609ffc5b9f3
 EBUILD agedu-20200617.ebuild 810 BLAKE2B 630a990f3002327d6581856e5b4146df7277ddbd631d798bbb8494cc2c501fa7906a69c4c555763231ad9896cf58418ae8b88b3bac2898daad1a09ad2627631f SHA512 07c26d320976498fde96dbd9b644abb1ad11f31220faf7c27434bfa3f324877177ea9800691294bfd944e0d9312611b5590f31c4d975836a8df0c02ad0c7df05
 EBUILD agedu-20200705.ebuild 810 BLAKE2B ae805dfc46890b17fced092675bedbcf9c8d06979b3f66b79832e72f544260cef2bd102a5aa49f13511ef62b05617ac90f9c0e48f5c7d46346d5b45099ca2ba5 SHA512 5ba38f2aad20d8fb0fe7f771864fffc70d71d44c7462cb17871ce85ddea2726b4ebfab3356914f1d2103c889132c0b9ce7604fdcfa0b9e8330379b45869c6715
+EBUILD agedu-20211129.ebuild 1079 BLAKE2B 47225ba0755212f92287ee919b024706ae35195e7dbb0707ab65b294aa1633438d1ca9f116456db18205da66f7d3f891fca5e7fbbb7a8e7d267b5df224a0c048 SHA512 bb8a072edaa6ebfca81bd1d1e1eccf043eed428bff8e3aa9dd57e8b710862eddb6eb493037e11be9b959c77c7e53e6f90a683d720686357d4c10dc9453404371
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/sys-apps/agedu/agedu-20211129.ebuild b/sys-apps/agedu/agedu-20211129.ebuild
new file mode 100644
index 000000000000..37be7923f167
--- /dev/null
+++ b/sys-apps/agedu/agedu-20211129.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# agedu-20151213.59b0ed3.ebuild is not a legitimate name
+# so we'll drop versionator and just set MY_P manually.
+MY_P="${PN}"-$(ver_cut 1).8cd63c5
+
+DESCRIPTION="A utility for tracking down wasted disk space"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/halibut )"
+
+# Notes:
+# - IPv4 / IPv6 are still optional but enabled by default; they don't
+# use the normal option() but it's (from CMakeLists.txt):
+#  set(AGEDU_IPV6 ON
+#    CACHE BOOL "Build agedu with IPv6 support if possible")
+#  set(AGEDU_IPV4 ON
+#    CACHE BOOL "Build agedu with IPv4 support if possible")
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20211129-fix-automagic-halibut-docs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=$(usex doc)
+	)
+
+	cmake_src_configure
+}
diff --git a/sys-apps/agedu/files/agedu-20211129-fix-automagic-halibut-docs.patch b/sys-apps/agedu/files/agedu-20211129-fix-automagic-halibut-docs.patch
new file mode 100644
index 000000000000..8d77268509e5
--- /dev/null
+++ b/sys-apps/agedu/files/agedu-20211129-fix-automagic-halibut-docs.patch
@@ -0,0 +1,48 @@
+From d4dd77f5ca2e0b3b53aaef59c7bb692517fc2848 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 14 Mar 2022 13:39:01 +0000
+Subject: [PATCH] Fix automagic halibut/docs
+
+---
+ CMakeLists.txt | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cdad437..11a05e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,17 +62,20 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+   configure_file(cmake.h.in ${GENERATED_SOURCES_DIR}/cmake.h)
+ 
+   # If Halibut is available, build the docs too.
+-  find_program(HALIBUT halibut)
+-  if(HALIBUT)
+-    set(BUILD_MANPAGE ON)
+-    add_custom_command(OUTPUT agedu.1
+-      COMMAND ${HALIBUT} --man=agedu.1
+-        ${CMAKE_CURRENT_SOURCE_DIR}/agedu.but
+-      DEPENDS
+-        ${CMAKE_CURRENT_SOURCE_DIR}/agedu.but)
+-    add_custom_target(doc ALL DEPENDS agedu.1)
+-  else()
+-    set(BUILD_MANPAGE OFF)
++  option(BUILD_DOCS "Build man pages using halibut" ON)
++  if(BUILD_DOCS)
++    find_program(HALIBUT halibut REQUIRED)
++    if(HALIBUT)
++      set(BUILD_MANPAGE ON)
++      add_custom_command(OUTPUT agedu.1
++        COMMAND ${HALIBUT} --man=agedu.1
++          ${CMAKE_CURRENT_SOURCE_DIR}/agedu.but
++        DEPENDS
++          ${CMAKE_CURRENT_SOURCE_DIR}/agedu.but)
++      add_custom_target(doc ALL DEPENDS agedu.1)
++    else()
++      set(BUILD_MANPAGE OFF)
++    endif()
+   endif()
+ 
+   # Installation
+-- 
+2.35.1
+