[gentoo-commits] repo/gentoo:master commit in: app-dicts/eblook/files/, app-dicts/eblook/

[Sam James]

commit: 0ba1fe984709fecbc6d538692e488bdfd383e3c5
Author: Brahmajit Das  gmail  com>
AuthorDate: Sun Jul 30 08:49:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 30 11:42:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba1fe98

app-dicts/eblook: Fix call to undeclared library function strcmp

Closes: https://bugs.gentoo.org/894360
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32100
Signed-off-by: Sam James  gentoo.org>

 app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild| 34 ++
 .../files/eblook-1.6.1-clang-16-buildfix.patch | 11 +++
 2 files changed, 45 insertions(+)

diff --git a/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild 
b/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild
new file mode 100644
index ..ce4c207a67e0
--- /dev/null
+++ b/app-dicts/eblook/eblook-1.6.1_p16-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Interactive search utility for electronic dictionaries"
+HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/;
+SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${PN}-$(ver_cut 
1-3).tar.gz"
+SRC_URI+=" mirror://debian/pool/main/e/eblook/eblook_$(ver_cut 1-3)-$(ver_cut 
5).debian.tar.xz"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+DEPEND=">=dev-libs/eb-3.3.4"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${WORKDIR}"/debian/patches
+   "${FILESDIR}"/${PN}-1.6.1-clang-16-buildfix.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf --with-eb-conf="${EPREFIX}"/etc/eb.conf
+}

diff --git a/app-dicts/eblook/files/eblook-1.6.1-clang-16-buildfix.patch 
b/app-dicts/eblook/files/eblook-1.6.1-clang-16-buildfix.patch
new file mode 100644
index ..cae0edcdb186
--- /dev/null
+++ b/app-dicts/eblook/files/eblook-1.6.1-clang-16-buildfix.patch
@@ -0,0 +1,11 @@
+Bug: https://bugs.gentoo.org/894360
+--- a/getopt.c
 b/getopt.c
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #include 
++#include 
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+actually compiling the library itself.  This code is part of the GNU C

[gentoo-commits] repo/gentoo:master commit in: app-dicts/eblook/files/, app-dicts/eblook/

[David Seifert]

commit: 137c26e86e2791c8cf73f0cb7b52cd7be965b659
Author: David Seifert  gentoo  org>
AuthorDate: Tue Sep 15 19:52:27 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep 15 19:52:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137c26e8

app-dicts/eblook: Port to EAPI 7

Closes: https://bugs.gentoo.org/742059
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert  gentoo.org>

 app-dicts/eblook/eblook-1.6.1.ebuild  | 13 -
 app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch | 20 
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild 
b/app-dicts/eblook/eblook-1.6.1.ebuild
index c99eec6320c..79e8ddff225 100644
--- a/app-dicts/eblook/eblook-1.6.1.ebuild
+++ b/app-dicts/eblook/eblook-1.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Interactive search utility for electronic dictionaries"
 HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/;
@@ -10,19 +10,14 @@ 
SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
 DEPEND=">=dev-libs/eb-3.3.4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P%_*}"
 
-src_prepare() {
-   sed \
-   -e 's:LDFAGS:LDFLAGS:g' \
-   -i configure || die
-}
+PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
 
 src_configure() {
-   econf --with-eb-conf=/etc/eb.conf
+   econf --with-eb-conf="${EPREFIX}"/etc/eb.conf
 }

diff --git a/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch 
b/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch
new file mode 100644
index 000..79bb33dd029
--- /dev/null
+++ b/app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch
@@ -0,0 +1,20 @@
+--- a/configure
 b/configure
+@@ -21918,7 +21918,7 @@
+ save_LIBS=$LIBS
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS 
$EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -21981,7 +21981,7 @@
+ sysconfdir=$sysconfdir
+ CPPFLAGS="$CPPFLAGS $EBCONF_PTHREAD_CPPFLAGS $EBCONF_EBINCS $EBCONF_ZLIBINCS 
$EBCONF_INTLINCS"
+ CFLAGS="$CFLAGS $EBCONF_PTHREAD_CFLAGS"
+-LDFLAGS="$LDFAGS $EBCONF_PTHREAD_LDFLAGS"
++LDFLAGS="$LDFLAGS $EBCONF_PTHREAD_LDFLAGS"
+ LIBS="$LIBS $EBCONF_EBLIBS $EBCONF_ZLIBLIBS $EBCONF_INTLLIBS"
+ 
+