gentoo resync : 15.06.2021

5 files changed, 70 insertions, 53 deletions

diff --git a/sys-libs/fortify-headers/Manifest b/sys-libs/fortify-headers/Manifest
index e9786e75337b..72ca6ff49fa7 100644
--- a/sys-libs/fortify-headers/Manifest
+++ b/sys-libs/fortify-headers/Manifest
@@ -1,6 +1,6 @@
-DIST fortify-headers-0.6.tar.gz 5339 BLAKE2B 404a20de075551e11750f989e05d78f450b09fc879a7ff4b649773ebc012a93c42432cc7b60c70843a375d64f6aea3ec356cdfafc0133f8cc58dadfea9b982d3 SHA512 6106219332515e7c23354d916383cdac6efccba7eefa13b0c2c221d0fd03be7afb29b3a8622bd29b62ee0b602f9d1f273e1a08c07583bdcd12db9938ef4d7acc
 DIST fortify-headers-0.7.tar.gz 5524 BLAKE2B 76ec4ee5b50bc77db05bf45a4a5550f3a369e5a49e333cd095613acbc04794d074103f3110c353a3283757f12cec866c45ed7d71ef4509667cae49926ee6953a SHA512 9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53
-EBUILD fortify-headers-0.6.ebuild 638 BLAKE2B 12446ff4e6c6e3bd0f0ced80cd113279246a929a79ad3866b51ce5884f69ea798344dfd0809f3494a3d15c8785abade9ffbe59248b8188007dc33729cc2e6b49 SHA512 48584a51a37366577d6da17a5d1c61891e0ed75c1b65ef749fca5f4174eb81d5221589f454e0490856bac0132684eba9b4cb9e95684aa589faed9213768781b2
-EBUILD fortify-headers-0.7.ebuild 638 BLAKE2B 12446ff4e6c6e3bd0f0ced80cd113279246a929a79ad3866b51ce5884f69ea798344dfd0809f3494a3d15c8785abade9ffbe59248b8188007dc33729cc2e6b49 SHA512 48584a51a37366577d6da17a5d1c61891e0ed75c1b65ef749fca5f4174eb81d5221589f454e0490856bac0132684eba9b4cb9e95684aa589faed9213768781b2
-EBUILD fortify-headers-9999.ebuild 638 BLAKE2B 12446ff4e6c6e3bd0f0ced80cd113279246a929a79ad3866b51ce5884f69ea798344dfd0809f3494a3d15c8785abade9ffbe59248b8188007dc33729cc2e6b49 SHA512 48584a51a37366577d6da17a5d1c61891e0ed75c1b65ef749fca5f4174eb81d5221589f454e0490856bac0132684eba9b4cb9e95684aa589faed9213768781b2
+DIST fortify-headers-1.1.tar.gz 5510 BLAKE2B d0454ad3ba432c051aeabfffad82799fae4ef37c07a8d2b8efcc26cd867dea8b31586f312d2947cb7e6ef7eedcacc3bb68591be4409376cc702ffbbafe144ea0 SHA512 a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0
+EBUILD fortify-headers-0.7.ebuild 681 BLAKE2B c1642399ee0555b96a8f1f3cc2813427b6dda70260d34ab45cf866df0844267c0467ea44fa0549e19e56851c3072c2b8a4129b2ed6396bb21409faf14c852b09 SHA512 9cabefb0a167b7d327d1801c26749da1044c17c0557a5e971fc520c764c57027493f0dde7a9e3ff3afb6a6d5ecd4849ef5c80a7b7c412df6f8db165fca0f6d03
+EBUILD fortify-headers-1.1.ebuild 862 BLAKE2B db23bac223f4a359e7e984a5a6d364adc8d04e56d32791909a7b6e6bfe678d494fa67d0b6f3068df78c2690bf73ab7a6fef0ad5cf47654879c9afde2aa014a5f SHA512 4040d7ce9bdf4e2a6e6b34cce0abb46b6016419def5f4e31c738cc38abc6a2494c4619be68091b7aa78df973e0a5ba84b1461d5c7f848a7b9ffaf80b7f4c9518
+EBUILD fortify-headers-9999.ebuild 862 BLAKE2B db23bac223f4a359e7e984a5a6d364adc8d04e56d32791909a7b6e6bfe678d494fa67d0b6f3068df78c2690bf73ab7a6fef0ad5cf47654879c9afde2aa014a5f SHA512 4040d7ce9bdf4e2a6e6b34cce0abb46b6016419def5f4e31c738cc38abc6a2494c4619be68091b7aa78df973e0a5ba84b1461d5c7f848a7b9ffaf80b7f4c9518
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
deleted file mode 100644
index 9f9374176ea0..000000000000
--- a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
-	inherit git-r3
-else
-	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="A standalone implementation of fortify source."
-HOMEPAGE="http://git.2f30.org/fortify-headers/"
-
-LICENSE="ISC"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile
-	export DESTDIR="${D}"
-	eapply_user
-}
diff --git a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
index 9f9374176ea0..12b1d42a9749 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
 	inherit git-r3
 else
-	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
+	#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
+	SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
@@ -16,13 +17,13 @@ HOMEPAGE="http://git.2f30.org/fortify-headers/"
 
 LICENSE="ISC"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile
-	export DESTDIR="${D}"
-	eapply_user
+	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
+	default
+}
+
+src_install() {
+	export DESTDIR="${ED}"
+	default
 }
diff --git a/sys-libs/fortify-headers/fortify-headers-1.1.ebuild b/sys-libs/fortify-headers/fortify-headers-1.1.ebuild
new file mode 100644
index 000000000000..5347e1e57683
--- /dev/null
+++ b/sys-libs/fortify-headers/fortify-headers-1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
+	inherit git-r3
+else
+	#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
+	SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="A standalone implementation of fortify source"
+HOMEPAGE="http://git.2f30.org/fortify-headers/"
+
+LICENSE="ISC"
+SLOT="0"
+
+src_prepare() {
+	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
+	default
+}
+
+src_compile() {
+	# Nothing to do here but defining a dummy phase allows us to not trigger
+	# the catch-all rule and try to install here where we don't have access
+	# to ${ED}
+	:;
+}
+
+src_install() {
+	export DESTDIR="${ED}"
+	default
+}
diff --git a/sys-libs/fortify-headers/fortify-headers-9999.ebuild b/sys-libs/fortify-headers/fortify-headers-9999.ebuild
index 9f9374176ea0..5347e1e57683 100644
--- a/sys-libs/fortify-headers/fortify-headers-9999.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-9999.ebuild
@@ -1,28 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
 	inherit git-r3
 else
-	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
+	#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
+	SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 fi
 
-DESCRIPTION="A standalone implementation of fortify source."
+DESCRIPTION="A standalone implementation of fortify source"
 HOMEPAGE="http://git.2f30.org/fortify-headers/"
 
 LICENSE="ISC"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile
-	export DESTDIR="${D}"
-	eapply_user
+	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
+	default
+}
+
+src_compile() {
+	# Nothing to do here but defining a dummy phase allows us to not trigger
+	# the catch-all rule and try to install here where we don't have access
+	# to ${ED}
+	:;
+}
+
+src_install() {
+	export DESTDIR="${ED}"
+	default
 }