summaryrefslogtreecommitdiff
path: root/dev-libs/eb
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/eb')
-rw-r--r--dev-libs/eb/Manifest5
-rw-r--r--dev-libs/eb/eb-4.4.1-r1.ebuild42
-rw-r--r--dev-libs/eb/eb-4.4.3-r1.ebuild51
-rw-r--r--dev-libs/eb/files/eb-4.4.1-getopt.patch13
-rw-r--r--dev-libs/eb/files/eb-4.4.1-remove-krdecl.patch18
5 files changed, 85 insertions, 44 deletions
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index ed5ded05d9cc..f774eaebb769 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,7 +1,8 @@
AUX eb-4.4-gcc14-iconv.patch 446 BLAKE2B 9d21df37676fd02cb12259b1664518abf3bbcbe5d6d9290f70b313afec971579973db1618a3418c85c434ce6849857976390eeda520bd73ef312bb6d41aaa3c0 SHA512 ea84c8b8603af79fbccb43eaf33d522e208e63ae8f84a96032713add8f375e93d8abadc9f89e0f56acb429025b4c0f17937ec839584d54ae953357045a9d493c
+AUX eb-4.4.1-getopt.patch 323 BLAKE2B d84f6ac88eac92368600f35c1db97692a3791ce9c76d8f3d9039dd3c9d80df2ce75375c44157c54b10a9ef1fc8383ebe466f69555cb08de928e53e7c93a25d2a SHA512 d239c2cc4aaef0e8970e7abd26ff215ae950f15ef01982f8b651b3dc6e73096e92162b3bcffe85e25873da50562cf97d0ab9436ab38affb68248e8d39f2be5d0
+AUX eb-4.4.1-remove-krdecl.patch 542 BLAKE2B 4025dc87daa972a832fadb9ce93f82970a2d6ec306240caeefff27a20c4ffca345d238dcd058a736f67b9f5b92a90db616b6811264efa671afdaa2f1f479ee13 SHA512 887eea407d5167f2d1958c570857108c270b6adc6afde82a12588c2d9576906575bf62bf9a81ddae908fa3be651343575d45a256e15eaa29f0eb715935a1933b
AUX eb-4.4.3-fix-threads.patch 354 BLAKE2B 9650c76d47e1aaf019313481fec53f775556e0178a10afb354c9e3ba3a7b3656875211af954c0ba5078dc150b1bfb82fc70a3ca6c71cd17b29a67064a21b464d SHA512 e2232857d70e091d644df21aa6c8fefb07669c03ff086dad87318811ad36ff2e08fe1927281a22c17a6c6fcc0a6d779609f145bb30210797626a8704832cd96e
-DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
DIST eb-4.4.3.tar.bz2 505510 BLAKE2B cb7476331498cc70c47406aa89833fdc8dd71b3bfd4d72d2878e9bb773d4f16a35e3b7235a3a1bf426e0b021b07874d13d1e87affbb77b545f8797523fb1f30c SHA512 29578223e9bf0e8475cf0518c4e319d8440eb9dc2b819ea7de6e90d67824eb7ac9f5a29cf1baa9b6e947840de17ad2182d1ea6ee4816df84e7baf025149bbbf2
-EBUILD eb-4.4.1-r1.ebuild 925 BLAKE2B 8007374ee011be5d0c1a702cc0b951ab6b07f20faa0bdf43217b92f4550ce9b01322115a0e678a3f61fa930dd7698ffb34f13f05ca0c726bdd6a9f3eab3c8267 SHA512 823c1c073f86116489fa01609cda9d49c796ada227856cc730437fb7083fbff684094a7749e51ef4210f54a8986ea2cfe60e49659ba84620d47427828fe0432f
+EBUILD eb-4.4.3-r1.ebuild 1193 BLAKE2B f4d161894bbb3f0f86ba92bed197115e5e049282f4fb3a11d210d533061c4f16e948a3af6bf423e0cfe993862eb66ad24e9f9f8099095ed84a0c9b08796a5518 SHA512 0e23d667430a16a666d14c6992f48fd6a7572cf38237fb2b7ec1b6a38a328c01f8876e8eab80acabf40ac90ca0b1328f0749fee9be281bde73fc305d2c28cbb9
EBUILD eb-4.4.3.ebuild 1107 BLAKE2B 38f979cbf49034002b9c1acb91c7b734ff43024649c8d7db7e8fd74c1f92044a3aec6d91f2c9111a74b21514c23ef7a1c9d49f0a856ea1aaa105db2150393054 SHA512 6417176343d2e66e1583cd42564a707de3636792870668f0b44ddbf82734f39b918a04cdc082bdf7c34fe715e89a296e4c4612932bd025fcc07a7cda62fb9c7d
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
deleted file mode 100644
index 8d07d40c2841..000000000000
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="ipv6 nls threads"
-
-RDEPEND="
- sys-libs/zlib
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog{,.0,.1,.2} NEWS README )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_enable threads pthread) \
- --with-pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
- --disable-static
-}
-
-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;
+