* [gentoo-commits] repo/gentoo:master commit in: sys-apps/agedu/, sys-apps/agedu/files/
@ 2018-04-21 11:15 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2018-04-21 11:15 UTC (permalink / raw
To: gentoo-commits
commit: 84c562000c3d887247baac3673f564ce7d4a7928
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 16:54:17 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 21 11:15:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c56200
sys-apps/agedu: epatch->PATCHES=()
Also dropped unneeded eutils eclass.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
sys-apps/agedu/agedu-20170831.ebuild | 13 ++++++++-----
sys-apps/agedu/agedu-20171202.ebuild | 13 ++++++++-----
sys-apps/agedu/agedu-20180302.ebuild | 11 +++++++----
sys-apps/agedu/agedu-20180329.ebuild | 9 ++++++---
sys-apps/agedu/files/agedu-r9671-fix-automagic.patch | 5 ++---
5 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/sys-apps/agedu/agedu-20170831.ebuild b/sys-apps/agedu/agedu-20170831.ebuild
index 8b2ec089f3f..0924f923953 100644
--- a/sys-apps/agedu/agedu-20170831.ebuild
+++ b/sys-apps/agedu/agedu-20170831.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
-inherit autotools eutils
+inherit autotools
# agedu-20151213.59b0ed3.ebuild is not a legitimate name
# so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
DEPEND="doc? ( app-doc/halibut )"
+PATCHES=(
+ "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
- eapply_user
+ default
eautoreconf
}
diff --git a/sys-apps/agedu/agedu-20171202.ebuild b/sys-apps/agedu/agedu-20171202.ebuild
index b157209b497..0cfc94bc80f 100644
--- a/sys-apps/agedu/agedu-20171202.ebuild
+++ b/sys-apps/agedu/agedu-20171202.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
-inherit autotools eutils
+inherit autotools
# agedu-20151213.59b0ed3.ebuild is not a legitimate name
# so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
DEPEND="doc? ( app-doc/halibut )"
+PATCHES=(
+ "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
- eapply_user
+ default
eautoreconf
}
diff --git a/sys-apps/agedu/agedu-20180302.ebuild b/sys-apps/agedu/agedu-20180302.ebuild
index 8aeb20dc984..ced64253757 100644
--- a/sys-apps/agedu/agedu-20180302.ebuild
+++ b/sys-apps/agedu/agedu-20180302.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
-inherit autotools eutils
+inherit autotools
# agedu-20151213.59b0ed3.ebuild is not a legitimate name
# so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
DEPEND="doc? ( app-doc/halibut )"
+PATCHES=(
+ "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
- eapply_user
+ default
eautoreconf
}
diff --git a/sys-apps/agedu/agedu-20180329.ebuild b/sys-apps/agedu/agedu-20180329.ebuild
index 72f7d024250..24322243c5c 100644
--- a/sys-apps/agedu/agedu-20180329.ebuild
+++ b/sys-apps/agedu/agedu-20180329.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
inherit autotools eutils
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
DEPEND="doc? ( app-doc/halibut )"
+PATCHES=(
+ "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
- eapply_user
+ default
eautoreconf
}
diff --git a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
index 8e0c6ea2969..0ea79d1a170 100644
--- a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
+++ b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
@@ -1,6 +1,5 @@
-diff -Naur agedu-r9671.orig/configure.ac agedu-r9671/configure.ac
---- agedu-r9671.orig/configure.ac 2012-10-20 21:20:47.000000000 -0400
-+++ agedu-r9671/configure.ac 2012-10-21 15:13:08.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
@@ -10,8 +10,6 @@
AC_PROG_CC
AC_PROG_CC_C99
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/agedu/, sys-apps/agedu/files/
@ 2022-03-14 15:41 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2022-03-14 15:41 UTC (permalink / raw
To: gentoo-commits
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 <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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/agedu/, sys-apps/agedu/files/
@ 2024-03-10 1:59 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-03-10 1:59 UTC (permalink / raw
To: gentoo-commits
commit: c6a206cd117c2d09bd4973fbde943e71760bc011
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 01:57:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 01:57:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a206cd
sys-apps/agedu: drop 20200617, 20200705
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/agedu/Manifest | 2 -
sys-apps/agedu/agedu-20200617.ebuild | 37 -------------------
sys-apps/agedu/agedu-20200705.ebuild | 37 -------------------
.../agedu/files/agedu-r9671-fix-automagic.patch | 43 ----------------------
4 files changed, 119 deletions(-)
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index d00a5d6db3c9..496a891cb4aa 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,3 +1 @@
-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-20200617.ebuild b/sys-apps/agedu/agedu-20200617.ebuild
deleted file mode 100644
index 1521d19f0309..000000000000
--- a/sys-apps/agedu/agedu-20200617.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20200617.cec3021
-
-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 -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-text/halibut )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --enable-ipv4 \
- $(use_enable doc halibut) \
- $(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/agedu-20200705.ebuild b/sys-apps/agedu/agedu-20200705.ebuild
deleted file mode 100644
index e044de694b53..000000000000
--- a/sys-apps/agedu/agedu-20200705.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20200705.2a7d4a2
-
-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 -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-text/halibut )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --enable-ipv4 \
- $(use_enable doc halibut) \
- $(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
deleted file mode 100644
index 0ea79d1a170a..000000000000
--- a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,8 +10,6 @@
- AC_PROG_CC
- AC_PROG_CC_C99
- AC_PROG_INSTALL
--AC_CHECK_PROG([HALIBUT],[halibut],[yes],[no])
--AM_CONDITIONAL([HAVE_HALIBUT],[test "x$HALIBUT" = "xyes"])
-
- # Checks for libraries.
-
-@@ -43,13 +41,28 @@
-
- AC_CHECK_FUNCS([ftruncate fdopendir lstat64 stat64 memchr munmap select socket strcasecmp strchr strcspn strerror strrchr strspn strtoul strtoull connect inet_ntoa inet_addr gethostbyname getaddrinfo])
-
-+AC_ARG_ENABLE([halibut],
-+ AS_HELP_STRING([--disable-halibut],
-+ [disable documentation with halibut (default off)]),
-+ [halibut=$enableval],[halibut=no])
-+
-+if test "$halibut" = "no"; then
-+ AM_CONDITIONAL([HAVE_HALIBUT],[false])
-+else
-+ AC_CHECK_PROG([have_halibut],[halibut],[yes],[no])
-+ if test "$have_halibut" = "no"; then
-+ AC_MSG_ERROR([halibut configured but not found])
-+ fi
-+ AM_CONDITIONAL([HAVE_HALIBUT],[true])
-+fi
-+
- AC_ARG_ENABLE([ipv6],
- AS_HELP_STRING([--disable-ipv6],
-- [disable IPv6 in the built-in web server]),
-- [ipv6=$enableval],[ipv6=$ac_cv_func_getaddrinfo])
-+ [disable IPv6 in the built-in web server (default off)]),
-+ [ipv6=$enableval],[ipv6=no])
- AC_ARG_ENABLE([ipv4],
- AS_HELP_STRING([--disable-ipv4],
-- [disable IPv4 in the built-in web server]),
-+ [disable IPv4 in the built-in web server (default on)]),
- [ipv4=$enableval],[ipv4=yes])
- if test "$ipv6" = "no"; then
- AC_DEFINE([NO_IPV6], [1], [define if IPv6 is disabled at configure time])
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-10 1:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-10 1:59 [gentoo-commits] repo/gentoo:master commit in: sys-apps/agedu/, sys-apps/agedu/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-14 15:41 Anthony G. Basile
2018-04-21 11:15 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox