From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46C291582EF for ; Mon, 10 Mar 2025 01:42:29 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 219E5343164 for ; Mon, 10 Mar 2025 01:42:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 745231103A8; Mon, 10 Mar 2025 01:42:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6BC051103A8 for ; Mon, 10 Mar 2025 01:42:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E71034313F for ; Mon, 10 Mar 2025 01:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C41728B3 for ; Mon, 10 Mar 2025 01:42:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741570762.fde7d799494e251628f13d48193fe89608328475.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/eb/files/, dev-libs/eb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/eb/eb-4.4.1-r2.ebuild dev-libs/eb/eb-4.4.3-r1.ebuild dev-libs/eb/files/eb-4.4.1-getopt.patch dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch X-VCS-Directories: dev-libs/eb/ dev-libs/eb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fde7d799494e251628f13d48193fe89608328475 X-VCS-Branch: master Date: Mon, 10 Mar 2025 01:42:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 641df09f-83ac-4592-b424-770f735167df X-Archives-Hash: 6fd733d33a531b60791b33726618e2a3 commit: fde7d799494e251628f13d48193fe89608328475 Author: NHOrus yahoo com> AuthorDate: Thu Feb 27 11:07:00 2025 +0000 Commit: Sam James gentoo 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 yahoo.com> Signed-off-by: Sam James 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; +