[gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/, dev-libs/ucl/files/

2021-04-19 Thread Sam James 
commit: 17ebc18d38c78aa29c8d65cdf181afd812fb04ac
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 18:11:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 19:12:08 2021 +
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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/

2021-04-03 Thread Sam James 
commit: abdde2d56be7d7d46cf29e8686431268e0d64ce4
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  3 22:44:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 22:44:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abdde2d5

dev-libs/ucl: eutils->epatch

Signed-off-by: Sam James  gentoo.org>

 dev-libs/ucl/ucl-1.03-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 71e1cac0a15..38e1c6530d1 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
+
+inherit autotools epatch flag-o-matic ltprune
 
 DESCRIPTION="the UCL Compression Library"
 HOMEPAGE="http://www.oberhumer.com/opensource/ucl/";

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/

2020-08-24 Thread Sam James 
commit: 7b38b1b82bd1dd857143cc5e0530aaa17eaf70d2
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 24 23:46:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 24 23:46:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b38b1b8

dev-libs/ucl: Keyword 1.03-r1 arm64, #738720

Signed-off-by: Sam James  gentoo.org>

 dev-libs/ucl/ucl-1.03-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 11208912fb5..9828287020d 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/

2020-08-23 Thread Sam James 
commit: 71b0eb937001aadd4b23ae85dab33c5b5a4b9e0d
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 24 01:57:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 24 01:57:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b0eb93

dev-libs/ucl: Keyword 1.03-r1 arm, #738720

Signed-off-by: Sam James  gentoo.org>

 dev-libs/ucl/ucl-1.03-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 7c4f7a2e0dc..11208912fb5 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ucl/

2016-09-15 Thread David Seifert 
commit: f98f2d1e819cea8085f0c3bbc2771d363f430b72
Author: David Seifert  gentoo  org>
AuthorDate: Thu Sep 15 07:44:33 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Sep 15 07:45:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98f2d1e

dev-libs/ucl: Allow for compiling with GCC 6

Gentoo-bug: 585632

Package-Manager: portage-2.3.0

 dev-libs/ucl/ucl-1.03-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 49083ba..2a7d118 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="the UCL Compression Library"
 HOMEPAGE="http://www.oberhumer.com/opensource/ucl/";
@@ -32,6 +32,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #585632
+   append-cflags -std=c90
+
econf \
--enable-shared \
$(use_enable static-libs static)