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/ucl/Manifest                    |  4 ++--
 dev-libs/ucl/files/ucl-1.03-CFLAGS.patch | 10 ++++------
 dev-libs/ucl/ucl-1.03-r1.ebuild          | 18 ++++++++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'dev-libs/ucl')

diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index 523fcba2e46b..53e425bfbe7e 100644
--- a/dev-libs/ucl/Manifest
+++ b/dev-libs/ucl/Manifest
@@ -1,5 +1,5 @@
-AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890
+AUX ucl-1.03-CFLAGS.patch 3992 BLAKE2B 7bff736b3231ddeb3518a49d302fab830ee0d18195f3d0ec7cac43d618c5eb7dfb71efb4a9682bc437709e94ecbbabf3d994a5f37c8823d903d5760a2afdca1f SHA512 87c699479c9d8d3c2e6ecf5e947379fa3132f0cd82056a43cebf23cfb8d39c3c4e6dd40a1c97b159ad3ee7ce839f987efa41ebc1b3fde70cf43a13c4954492a1
 AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef
 DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-EBUILD ucl-1.03-r1.ebuild 1157 BLAKE2B 2400b7b0712ae856586b1ebd4c8963b08b8cb2baf22c82c21a4c5515af5ed0c62f37e981021c82738cc9cd1c673c686e1cfd1861d4b70e67fafeb0bb4e02fedc SHA512 c9211cb26760210e5bb9b10aaeee4104becfb49e32b2a774879451d7abe5239a65ac5e3c09caa0416815480012bf5729d1929b616339cc09057ad19c758e7bbf
+EBUILD ucl-1.03-r1.ebuild 1181 BLAKE2B e7b265deca09cc4484ec0550b167a47b5eae3874a53a7fffd5bb6eca90a5eef83e72155632f7aa0559e096d282d230428f65c7bca0838a5bf90f14c2c2890a96 SHA512 eb9047d72eca0d7ac21cad130a63eafa6acac41a6e6da13100c8f7c7736fa121dc2abb0a852b81d7f54f9f9fa084af34f12c0d004c09cc967cdcc98843faad74
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
index 07c925b4888e..b01a50e3bdf5 100644
--- a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
+++ b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch
@@ -2,9 +2,8 @@ From: Nathan Phillip Brink <binki@gentoo.org>
 Subject: Respect CCASFLAGS (which often defaults to CFLAGS). Fixes
 	compilation for portage-multilib users.
 
-diff -r c090ed619e90 configure.ac
---- a/configure.ac	Sun Jun 26 16:00:09 2011 -0400
-+++ b/configure.ac	Sun Jun 26 20:52:01 2011 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -47,14 +47,12 @@
  AC_CANONICAL_TARGET
  AM_MAINTAINER_MODE
@@ -49,9 +48,8 @@ diff -r c090ed619e90 configure.ac
  AC_CONFIG_FILES([Makefile examples/Makefile include/Makefile include/ucl/Makefile src/Makefile])
  AC_OUTPUT
  
-diff -r c090ed619e90 src/Makefile.am
---- a/src/Makefile.am	Sun Jun 26 16:00:09 2011 -0400
-+++ b/src/Makefile.am	Sun Jun 26 20:52:01 2011 -0400
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -4,11 +4,10 @@
  #
  
diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 71e1cac0a157..9f03c5c83fff 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="the UCL Compression Library"
 HOMEPAGE="http://www.oberhumer.com/opensource/ucl/"
@@ -15,9 +16,13 @@ IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${P}-x32.patch #426334
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-CFLAGS.patch
-	epatch "${FILESDIR}"/${P}-x32.patch #426334
+	default
 
 	# lzo (and ucl) have some weird sort of mfx_* set of autoconf macros
 	# which may only be distributed with lzo itself? Rescue them and
@@ -41,5 +46,6 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
-- 
cgit v1.2.3