summaryrefslogtreecommitdiff
path: root/sys-apps/moreutils
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
commit9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree8ac67e26b45f34d71c5aab3621813b100a0d5f00 /sys-apps/moreutils
parentf516638b7fe9592837389826a6152a7e1b251c54 (diff)
gentoo resync : 13.06.2020
Diffstat (limited to 'sys-apps/moreutils')
-rw-r--r--sys-apps/moreutils/Manifest4
-rw-r--r--sys-apps/moreutils/files/moreutils-0.63-respect-env.patch25
-rw-r--r--sys-apps/moreutils/moreutils-0.63.ebuild4
3 files changed, 9 insertions, 24 deletions
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index c15456e84a7a..2676416d481f 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,4 @@
-AUX moreutils-0.63-respect-env.patch 1160 BLAKE2B 3d62cf5d86e22962093c1e7f315233d4da3643a809ff37af637bfc327001702f6e17e741e269c2c49b99ece922e46e435469c45f744bd67f07033018b43f9c83 SHA512 cfe8696cfd5502012dc500d44c632bd7cb143902c29b2a5bb545e309762d63a5bb41daed04a289d2b6b50be3c16256f897260471a38ac4adfd6a0b856ade1444
+AUX moreutils-0.63-respect-env.patch 657 BLAKE2B 2f33bb68f3d23f0fa45849fd5d5fb63f8cdbb27b3c28eb92e132d632aa0b9487ecf85c9b9cdfa2bcebc009be4a5ce5da2407742b02f52352dd00a88f84ba1eff SHA512 e9cffcba65d224daa5bba7f15d9e8b39cd18ac2f0e25b91aae6e49017b8c6edb4eff1458c68832e207ec5ed4bca193df3f01ddf4851639509c70cdc967befa8a
DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
-EBUILD moreutils-0.63.ebuild 1495 BLAKE2B ec8305ce981fefadd7dd18773bbf6f6ef45f478bd88f6c1cef777e51c7d214e05fd80b68c95125c62833c17adeae10235adecd3ab0c586bd7825b418d79970fb SHA512 d4242878b139be134789bd5644bc97c46bf9a61a45186f1ba04e2c1ab8a3b627a0aea42797e695199d71e5aa8a151df75880c27a4852ad7559ba4406e2df0a67
+EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
MISC metadata.xml 427 BLAKE2B 311360aef2c49094822392ff35feb4bcbf03f16a909e6047a89c6280094d51b2347817dcd6938df998909101d53b8a14ee847f0eea5568bae6326ff01ebe2fee SHA512 d535b7f684ce284bf60ff162383773df08a753e9b2e80bcfe271cf39f0765719f8a00cffb46fed0c948e971875286bc9c3ca5972debfc3ed3653fcc33ac6a2a0
diff --git a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
index a4091cf599da..45f85b1988e5 100644
--- a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
+++ b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
@@ -1,26 +1,14 @@
-From 6c88aaa6b828d7bd7c1dccb3b842594d48c1764c Mon Sep 17 00:00:00 2001
-From: Nicolas Schier <nicolas@fjasle.eu>
-Date: Wed, 27 Nov 2019 21:16:12 +0100
-Subject: is_utf8: allow propagation of compiler and linker flags
-
-Allow propagating compiler and linker flags via overrides of CFLAGS and
-LDFLAGS variables. This allows enabling of hardening flags w/o
-modification of the original Makefile.
-
-Signed-off-by: Nicolas Schier <nicolas@fjasle.eu>
----
- is_utf8/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
diff --git a/is_utf8/Makefile b/is_utf8/Makefile
-index 4ebf8be..13b1021 100644
+index 4ebf8be..f0a111e 100644
--- a/is_utf8/Makefile
+++ b/is_utf8/Makefile
-@@ -38,13 +38,13 @@ SONAME = $(LINKERNAME).$(VERSION)
+@@ -37,14 +37,14 @@ LINKERNAME = lib$(NAME).so
+ SONAME = $(LINKERNAME).$(VERSION)
REALNAME = $(SONAME).$(MINOR).$(RELEASE)
- CC = gcc
+-CC = gcc
-CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
++CC ?= gcc
+CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
$(NAME): $(OBJ)
@@ -33,6 +21,3 @@ index 4ebf8be..13b1021 100644
all:
@make $(NAME)
---
-cgit v1.2.3
-
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
index 4cb0b5d1cf8f..616df9ea930b 100644
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
IUSE="+doc +perl"
RDEPEND="
@@ -29,7 +29,7 @@ DEPEND="
)"
PATCHES=(
- "${FILESDIR}"/${P}-respect-env.patch
+ "${FILESDIR}"/${PN}-0.63-respect-env.patch
)
src_prepare() {