commit: fde7d799494e251628f13d48193fe89608328475 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Thu Feb 27 11:07:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 01:39:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde7d799
dev-libs/eb: update EAPI 7 -> 8, port to C23, always enable ipv6 Inclusion of existing patch, removal of extern decl and K&R def Closes: https://bugs.gentoo.org/880525 Closes: https://bugs.gentoo.org/948904 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/eb/eb-4.4.1-r2.ebuild | 50 +++++++++++++++++++++++++ dev-libs/eb/eb-4.4.3-r1.ebuild | 51 ++++++++++++++++++++++++++ dev-libs/eb/files/eb-4.4.1-getopt.patch | 13 +++++++ dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch | 18 +++++++++ 4 files changed, 132 insertions(+) diff --git a/dev-libs/eb/eb-4.4.1-r2.ebuild b/dev-libs/eb/eb-4.4.1-r2.ebuild new file mode 100644 index 000000000000..54c520187f54 --- /dev/null +++ b/dev-libs/eb/eb-4.4.1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books" +HOMEPAGE="https://web.archive.org/web/20120330123930/http://www.sra.co.jp/people/m-kasahr/eb/"; +SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="nls threads" + +RDEPEND=" + sys-libs/zlib + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README ) + +PATCHES=( + "${FILESDIR}/${P}-getopt.patch" + "${FILESDIR}/${PN}-4.4-gcc14-iconv.patch" + "${FILESDIR}/${P}-remove-krdecl.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + $(use_enable nls) + $(use_enable threads pthread) + --with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/eb/eb-4.4.3-r1.ebuild b/dev-libs/eb/eb-4.4.3-r1.ebuild new file mode 100644 index 000000000000..2ac04d31a599 --- /dev/null +++ b/dev-libs/eb/eb-4.4.3-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="EB is a C library and utilities for accessing CD-ROM books" +HOMEPAGE="https://web.archive.org/web/20120330123930/http://www.sra.co.jp/people/m-kasahr/eb/"; +SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.bz2"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="nls threads" + +RDEPEND=" + sys-libs/zlib + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README ) + +PATCHES=( + "${FILESDIR}/eb-4.4-gcc14-iconv.patch" #920641 + "${FILESDIR}/eb-4.4.3-fix-threads.patch" #https://github.com/gentoo/gentoo/pull/37731#pullrequestreview-2218229971 + "${FILESDIR}/eb-4.4.1-getopt.patch" + "${FILESDIR}/eb-4.4.1-remove-krdecl.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + $(use_enable nls) + $(use_enable threads pthread) + --with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/eb/files/eb-4.4.1-getopt.patch b/dev-libs/eb/files/eb-4.4.1-getopt.patch new file mode 100644 index 000000000000..56bedc4e20fb --- /dev/null +++ b/dev-libs/eb/files/eb-4.4.1-getopt.patch @@ -0,0 +1,13 @@ +Remove declaration of getopt we already get from headers +https://bugs.gentoo.org/943827 +--- a/libebutils/getopt.c ++++ b/libebutils/getopt.c +@@ -87,8 +87,6 @@ + + #define EMSG "" + +-extern char *getenv(); +- + static int getopt_internal(int nargc, char * const *nargv, + const char *options); + static int gcd(int a, int b); diff --git a/dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch b/dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch new file mode 100644 index 000000000000..c284bcc29faa --- /dev/null +++ b/dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch @@ -0,0 +1,18 @@ +Remove one forgoten K&R function definition +https://bugs.gentoo.org/880525 +--- a/eb/binary.c 2025-02-27 15:00:13.585242692 +0400 ++++ b/eb/binary.c 2025-02-27 15:02:39.112239956 +0400 +@@ -923,12 +923,7 @@ + * Read binary data. + */ + EB_Error_Code +-eb_read_binary(book, binary_max_length, binary, binary_length) +- EB_Book *book; +- size_t binary_max_length; +- char *binary; +- ssize_t *binary_length; +- ++eb_read_binary(EB_Book *book, size_t binary_max_length, char *binary, ssize_t *binary_length) + { + EB_Error_Code error_code; +
