From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8097913835A for ; Mon, 19 Apr 2021 19:12:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 757CEE0827; Mon, 19 Apr 2021 19:12:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D568E0827 for ; Mon, 19 Apr 2021 19:12:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F60D340E53 for ; Mon, 19 Apr 2021 19:12:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B137A720 for ; Mon, 19 Apr 2021 19:12:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618859528.17ebc18d38c78aa29c8d65cdf181afd812fb04ac.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/, dev-libs/ucl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ucl/files/ucl-1.03-CFLAGS.patch dev-libs/ucl/ucl-1.03-r1.ebuild X-VCS-Directories: dev-libs/ucl/ dev-libs/ucl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 17ebc18d38c78aa29c8d65cdf181afd812fb04ac X-VCS-Branch: master Date: Mon, 19 Apr 2021 19:12:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3be4953-55a9-4517-afe1-c9ab71c3e092 X-Archives-Hash: 943d2f7217d4dd7e67e90723bcf57785 commit: 17ebc18d38c78aa29c8d65cdf181afd812fb04ac Author: Sam James gentoo org> AuthorDate: Mon Apr 19 18:11:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 19 19:12:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ebc18d dev-libs/ucl: port to EAPI 7 Signed-off-by: Sam James gentoo.org> dev-libs/ucl/files/ucl-1.03-CFLAGS.patch | 10 ++++------ dev-libs/ucl/ucl-1.03-r1.ebuild | 15 ++++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch index 07c925b4888..b01a50e3bdf 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 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 38e1c6530d1..9f03c5c83ff 100644 --- a/dev-libs/ucl/ucl-1.03-r1.ebuild +++ b/dev-libs/ucl/ucl-1.03-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools epatch flag-o-matic ltprune +inherit autotools flag-o-matic DESCRIPTION="the UCL Compression Library" HOMEPAGE="http://www.oberhumer.com/opensource/ucl/" @@ -16,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 @@ -42,5 +46,6 @@ src_configure() { src_install() { default - prune_libtool_files + + find "${ED}" -type f -name '*.la' -delete || die }