From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 app-dicts/eblook/Manifest                         |  3 ++-
 app-dicts/eblook/eblook-1.6.1.ebuild              | 13 ++++---------
 app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 app-dicts/eblook/files/eblook-1.6.1-LDFLAGS.patch

(limited to 'app-dicts/eblook')

diff --git a/app-dicts/eblook/Manifest b/app-dicts/eblook/Manifest
index 2c7b55194373..3ae4041e2cd1 100644
--- a/app-dicts/eblook/Manifest
+++ b/app-dicts/eblook/Manifest
@@ -1,3 +1,4 @@
+AUX eblook-1.6.1-LDFLAGS.patch 751 BLAKE2B 03b79539c03224db4bdcc0d1f1865cb8e2f162949610083dde146260d40acd0a4de94d28850f6115648b406cbadac8603e07c624fd60f4b76159acadf4979eda SHA512 9d24ec3ff3aa1f363153cb1c20b2c2128bae2309ba0fe4e6244f4366f80473612130d29447752382a2d9e4bbe1137d195df3fdbb0cb2df23732fc52faae93bb6
 DIST eblook-1.6.1.tar.gz 440727 BLAKE2B 313dcc89fea9dbc8dac8c9fda618cf4e39d0cfef4f67ba7cf2ab29e3b1c8dc0559407c1f1c68c9994594b784acb445c6fe988456e14da324bd38c89de23f3ffe SHA512 36f4f383a53a0332a2dec0e40d2743c93d35c9f51a7de2d2706bbc18a4fde215d4e345feb175bebf428c1760cb32e73148fb9b336fcde8c0d8b924ee6ecfd6a4
-EBUILD eblook-1.6.1.ebuild 571 BLAKE2B 1607e198c2b9b097be393ccb02816d2296dc9e31811e365d955720a131dccdf7df88056aa226e65df8850434243d98027c5232a735af8153f9a4740d9da16f6e SHA512 03c60fb350104aea1a060f9e12e28406f14c97f0daccb5dc012b0ed43d5c3f7aaf663899216ba3a6539578c7884fc6f2c4ea1fa5b223d86a390c683ce358c23c
+EBUILD eblook-1.6.1.ebuild 542 BLAKE2B 86b268aa6c6d1c5fcce60ef318339feedd6e928583f7ce4f8d592b9c3753b1aa00174ac986e3d01c619ab93a3ae9ec1783a5b096b5f2327063d67faf079c95fb SHA512 08d10c392345e06b4f29a9fcd9bcbb36d0ef6d590b23988185210f9d5eed3c970ca27e8b0324d0653beff681d3134c73f1c0f813a4146ebb2c9cb9db37bd0624
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild b/app-dicts/eblook/eblook-1.6.1.ebuild
index c99eec6320c0..79e8ddff2253 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 000000000000..79bb33dd0292
--- /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"
+ 
+ 
-- 
cgit v1.2.3