commit:     1863ce1369d5845680284320391d3e3b633883b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 13:40:56 2022 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 15:39:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1863ce13

sys-apps/agedu: add 20211129

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-apps/agedu/Manifest                            |  1 +
 sys-apps/agedu/agedu-20211129.ebuild               | 42 +++++++++++++++++++
 ...agedu-20211129-fix-automagic-halibut-docs.patch | 48 ++++++++++++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 9ffba693b68a..d00a5d6db3c9 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,2 +1,3 @@
 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

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 <s...@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
+

Reply via email to