gentoo resync : 30.09.2020

5 files changed, 45 insertions, 20 deletions

diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index b2204e2f8f9f..b1a52cab9fc4 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,9 +1,10 @@
+AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
 DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e
-EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
-EBUILD opal-utils-6.6.2.ebuild 2607 BLAKE2B b33bc1f76c5401bcb2dfc8cc33daaeea923e54396a8a1cc0ae2b067a7e845b25d16390fc809ff65390d9f46d6f9fd6395adab6aa2c85767beab51d6eff4719ca SHA512 546ac0837649ff8e1e2498adb28ec393cebbf9038ef4bb7280cf74459379db6daf296d22c6d64ff55a8f589b910e280a4e821d487b8c52047e25528008a0e4c7
-EBUILD opal-utils-6.6.3.ebuild 2608 BLAKE2B 518cf78319f1f14f54d74251123c2350887078c1b38b7fad72fb946948c222f3c44b75327df8322f47703c3dd87a45f9ee7b6b1419ae7ea2c982b2fefdd78eed SHA512 0b6ec21cc3596910251160e33f2dedb7e6e5a9c8224c13fd09258279fa174707fc8d40b247d37804c89ccd6befd75637029a947eb0d75ea8a78b19c3586330eb
+EBUILD opal-utils-6.5.2.ebuild 2104 BLAKE2B d8def5a718bdf95bc54c85d3535302c94719cd9792d86264d5aef38964a54d4dd0d3fb01799bc12636d9afcf4098ce1e56c19025fc3569d7df2418e7a537a23b SHA512 ba5ecba2487789b97898a502bc6c4236c683a13c2b4bdc5b3d76a6c1c0e2f35328344a5e1df61d7554606889b4d0314c49bbb1b01b1c2704a16a9401fbbbd5f5
+EBUILD opal-utils-6.6.2.ebuild 2474 BLAKE2B 7d2955ba22d6cd0e9379fdb60d0974e5871f36075b3d64ac37b0f65dcf5b46497c61db105b34ae0a74303798c5fe2eadf8651d2f3179e5c25228ee8d3d849ea3 SHA512 e0481207daf609c9634ca83bba0455ee30b8a70319f62a83ce095273038265ff700da1381b75efa97b4ec52be22d590cc20688ca0bb9179736e9b32cbad6b3aa
+EBUILD opal-utils-6.6.3.ebuild 2475 BLAKE2B 1005100e0c402e42e8c3c866f6284790e2b8a57093f3059b57a6447c0a66b2f6d0673db1cf1e70dd08d51d1d51258620ff29d9500761d69515de3ea916d24cd7 SHA512 98027c446f9537a87a6dbc60f2ef4a5a4f98706f5a89eb8dd25d20b4ec43c90bc5b32733e1bc7dfae11b15365c75509a95ad277bcc9c0b28977bafb2af3bf6a1
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/files/flags.patch b/sys-apps/opal-utils/files/flags.patch
new file mode 100644
index 000000000000..5aa045ed1ca1
--- /dev/null
+++ b/sys-apps/opal-utils/files/flags.patch
@@ -0,0 +1,35 @@
+From 828c1c28c314c62cf90b9b989f92af7ea96c100d Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 27 Sep 2020 18:48:38 -0700
+Subject: [PATCH] respect user flags
+
+---
+ external/ffspart/rules.mk  | 2 +-
+ external/opal-prd/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk
+index 40972c6..09a025f 100644
+--- a/external/ffspart/rules.mk
++++ b/external/ffspart/rules.mk
+@@ -30,5 +30,5 @@ $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
+ 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(EXE): $(OBJS)
+-	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt -o $@
++	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt $(LDFLAGS) -o $@
+ 
+diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile
+index fb9402f..52f10d9 100644
+--- a/external/opal-prd/Makefile
++++ b/external/opal-prd/Makefile
+@@ -1,5 +1,5 @@
+ # SPDX-License-Identifier: Apache-2.0
+-CFLAGS += -m64 -Werror -Wall -g2 -ggdb
++CFLAGS += -m64 -Wall
+ LDFLAGS += -m64
+ ASFLAGS = -m64
+ CPPFLAGS += -I. -I../../include -I../../
+-- 
+2.28.0
+
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
index 9e12d9fc8b8a..9479de387f7e 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,11 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
index 867857095da6..22d57ef7a346 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
index 6f824f28e385..823783f6fa37 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"