From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 dev-libs/uulib/Manifest                        |  4 ++--
 dev-libs/uulib/files/uulib-0.5.20-shared.patch |  6 ++---
 dev-libs/uulib/uulib-0.5.20-r1.ebuild          | 31 +++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'dev-libs/uulib')

diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 95a9662650ee..6637152ebe3f 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,4 +1,4 @@
-AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
+AUX uulib-0.5.20-shared.patch 2528 BLAKE2B aec47f6b2ca06bba0161ea94c32dca12b96baa5e0d6301501f9959499f252fe3557f50cbfb016d8a79fe959775db5694d688ad83d58160d097452d043565b2a9 SHA512 4dc386a2d70569ac218d56f1a1b0c0d9ad1f0708a0c975c273d8b18482d9fbb0863540459f64bdbc5415576c616088ea791001a6f3a8f30f0ef01e650de63996
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 733 BLAKE2B b2b25744d1a492c72592b5019db54362325508002d33f19f77ae0ae21b2d3e8c6dca682e9d5c8c1217c57d705bb8cc031816b4127d22a41574c473e880e31a63 SHA512 af651948075d9504b263e4af451c164055faf321a934745e1fd09da9437bc731ed9178cf7df6cb65cd99a1bc7cd66f24c62dedd223e223326c9eea04c231d3de
+EBUILD uulib-0.5.20-r1.ebuild 1025 BLAKE2B c80ecd15486db6f32cdb65ea6d8265a0c39a8362a50f96dab58c0ea70209de8810190b3c8a6e4819f7badc434426b2def3402f798dd928e31932654083cf21f7 SHA512 62ba0ec14cf4e9a4a185c5b2150d8161f65460d03f71c574e18298eff60c0e5f7d2d0433b854148ea39f1ac0cd5b1940c69c1ec34664ba29264a2ca144edb7c0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/uulib/files/uulib-0.5.20-shared.patch b/dev-libs/uulib/files/uulib-0.5.20-shared.patch
index 3a7f6582ef4e..fade48fb5932 100644
--- a/dev-libs/uulib/files/uulib-0.5.20-shared.patch
+++ b/dev-libs/uulib/files/uulib-0.5.20-shared.patch
@@ -2,10 +2,8 @@ Source: PDL Linux
 https://raw.githubusercontent.com/pld-linux/uudeview/master/uudeview-shared.patch
 https://github.com/pld-linux/uudeview
 
-
-diff -ruN uudeview-0.5.20.orig/uulib/Makefile.in uudeview-0.5.20/uulib/Makefile.in
---- uudeview-0.5.20.orig/uulib/Makefile.in	2002-03-11 10:15:46.000000000 +0100
-+++ uudeview-0.5.20/uulib/Makefile.in	2014-10-11 20:20:04.280175737 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -40,9 +40,13 @@
  VDEF	=	-DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\"
  #
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 96c0207408d5..91efcae15424 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -1,25 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=uudeview-${PV}
 
 DESCRIPTION="Library that supports Base64 (MIME), uuencode, xxencode and binhex coding"
 HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
 SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-S=${WORKDIR}/${MY_P}/${PN}
+BDEPEND="sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-shared.patch"
+	default
+
 	sed -i 's:\<ar\>:$(AR):' Makefile.in || die
+	# Fix Darwin and other platforms with a non-GNU default libtool
+	sed -i 's/libtool/$(LIBTOOL)/' Makefile.in || die
+}
+
+src_configure() {
 	tc-export AR CC RANLIB
+	econf
+}
+
+src_compile() {
+	if use prefix ; then
+		LIBTOOL=glibtool
+	else
+		LIBTOOL=libtool
+	fi
+
+	LIBTOOL="${LIBTOOL}" emake
 }
-- 
cgit v1.2.3