From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 20 Mar 2022 00:40:44 +0000
Subject: gentoo resync : 20.03.2022

---
 sys-libs/libucontext/Manifest                      |  3 +-
 .../files/libucontext-1.1-respect-CFLAGS.patch     | 13 +++++
 sys-libs/libucontext/libucontext-1.1-r1.ebuild     | 67 ++++++++++++++++++++++
 sys-libs/libucontext/libucontext-1.1.ebuild        | 51 ----------------
 4 files changed, 82 insertions(+), 52 deletions(-)
 create mode 100644 sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
 create mode 100644 sys-libs/libucontext/libucontext-1.1-r1.ebuild
 delete mode 100644 sys-libs/libucontext/libucontext-1.1.ebuild

(limited to 'sys-libs/libucontext')

diff --git a/sys-libs/libucontext/Manifest b/sys-libs/libucontext/Manifest
index 91334bc00e78..62aef2d8e282 100644
--- a/sys-libs/libucontext/Manifest
+++ b/sys-libs/libucontext/Manifest
@@ -1,3 +1,4 @@
+AUX libucontext-1.1-respect-CFLAGS.patch 368 BLAKE2B b04163e9e75ad3f8704d85d78091a41957cb072edd3ecbe58dbf45bf59c5ffb3662b5f96bf413eaaa5e328c964cbe99a70c6f8f23f4f8bc74bfdda7a0e45c54d SHA512 889b67269066ccdf84221dd1a636d4f6782f4c5f6800828f4068f3764b7e9d1797614d9f07f81864bc720f415c475c1b78aba38dd35355a54fcbf2f7a64a57ff
 DIST libucontext-1.1.tar.gz 25261 BLAKE2B 269b3899657779bc2c6a2f1c365242f0ee936afeb0acf74e48af5c1e6b96918bbaa239039508e7b1b1f7b358679fb4a222311b761223b69b9a3e7a9be2d0bc40 SHA512 05aed6f82a2b3d9dba896423335a7fc2fc5eddc87ed725f05e14488c6ddfcef10b835c928619439c7783e052baff7ef2dc162b6e06aa78992f6f611ca13c2e39
-EBUILD libucontext-1.1.ebuild 1077 BLAKE2B 0c4b3f18440b3fb002fb9538fc97360056038ac2f59e9c63e18cf6203d89aec95c47161bd0dd09261172b20a5da3dd150285b9088c4ad6abf27611e929315b6a SHA512 beeddc6b1366d0e94e9826074c4137a778838be4cba9b698890c1b7ebcdcb936b1731a22510c3774ee997423f75ae49f9bb4be149f83a0e306c52e7163357cc6
+EBUILD libucontext-1.1-r1.ebuild 1227 BLAKE2B 80165906c3525c3a1d8cd1079a509ff11cb8ec92833ea493e03103c775f99c4f303d86c33ee4fb921cb9c1dcdfc9e06b031e2c6158c1547a99a86edf7b4ff9ab SHA512 accd79cbc600ca4f02dcdc76f6ed7a964b8714238dfe2d5d44734ef3be472a998a6d04afa196c9a086e58ca18138c80b64973b4caa870ffe7e1ba5e579220ede
 MISC metadata.xml 329 BLAKE2B 8958a3567263e9f2fc2409c2cd5858ca3e68659a45f67e5132fca640c6ffe05cac8810436f334b5c775ed049709f43aaf366cfecc97bc732a0917bb47aa5c34d SHA512 7b5d5832b22828f6a0600e3be45ff1da8ff340481a3602db6f5b8540373ff0ac3c72f0de64f00a1691598bbd9cea0128eb869cda67d8ac4894e3a51a7009a730
diff --git a/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch b/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
new file mode 100644
index 000000000000..49dd872690d5
--- /dev/null
+++ b/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/832677
+https://github.com/kaniini/libucontext/issues/39
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ endif
+ LIBDIR := /lib
+ INCLUDEDIR := /usr/include
+ PKGCONFIGDIR := /usr/lib/pkgconfig
+-CFLAGS := -ggdb3 -O2 -Wall
++CFLAGS ?= -ggdb3 -O2 -Wall
+ CPPFLAGS := -Iinclude -Iarch/${ARCH} -Iarch/common
+ EXPORT_UNPREFIXED := yes
+ FREESTANDING := no
diff --git a/sys-libs/libucontext/libucontext-1.1-r1.ebuild b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
new file mode 100644
index 000000000000..7ec73298a79c
--- /dev/null
+++ b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="ucontext implementation featuring glibc-compatible ABI"
+HOMEPAGE="https://github.com/kaniini/libucontext"
+SRC_URI="https://github.com/kaniini/libucontext/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+
+BDEPEND="man? ( app-text/scdoc )"
+
+# segfault needs investigation
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-respect-CFLAGS.patch
+)
+
+src_compile() {
+	tc-export AR CC
+
+	arch=
+
+	# Override arch detection
+	# https://github.com/kaniini/libucontext/blob/master/Makefile#L3
+	if use x86 ; then
+		arch="x86"
+	elif use arm ; then
+		arch="arm"
+	elif use arm64 ; then
+		arch="aarch64"
+	elif use ppc64 ; then
+		arch="ppc64"
+	else
+		arch="$(uname -m)"
+	fi
+
+	emake \
+		ARCH="${arch}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		all $(usev man 'docs')
+}
+
+src_test() {
+	emake \
+		ARCH="${arch}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		check
+}
+
+src_install() {
+	emake \
+		ARCH="${arch}" \
+		DESTDIR="${ED}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install $(usev man 'install_docs')
+}
diff --git a/sys-libs/libucontext/libucontext-1.1.ebuild b/sys-libs/libucontext/libucontext-1.1.ebuild
deleted file mode 100644
index f637a693a337..000000000000
--- a/sys-libs/libucontext/libucontext-1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="ucontext implementation featuring glibc-compatible ABI"
-HOMEPAGE="https://github.com/kaniini/libucontext"
-SRC_URI="https://github.com/kaniini/libucontext/archive/refs/tags/${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${P}
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+man"
-
-BDEPEND="man? ( app-text/scdoc )"
-
-# segfault needs investigation
-RESTRICT="test"
-
-src_compile() {
-	tc-export AR CC
-
-	local arch
-
-	# Override arch detection
-	# https://github.com/kaniini/libucontext/blob/master/Makefile#L3
-	if use x86 ; then
-		arch="x86"
-	elif use arm ; then
-		arch="arm"
-	elif use arm64 ; then
-		arch="aarch64"
-	elif use ppc64 ; then
-		arch="ppc64"
-	else
-		arch="$(uname -m)"
-	fi
-
-	emake ARCH="${arch}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" all $(usev man 'docs')
-}
-
-src_test() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" check
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install $(usev man 'install_docs')
-}
-- 
cgit v1.2.3