gentoo resync : 05.02.2020

4 files changed, 43 insertions, 15 deletions

diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 2e493e8af18f..51dcfee149c5 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
-EBUILD gentoo-functions-0.12.ebuild 817 BLAKE2B 2aa656c7166d7003313536966b36931b4fb66ab00fca4b0f4a808dae797d9fc4fa03f0ca98e36e288c734e135820dafaad4d3381bf3e1fd0c6b455f9eac1ec8b SHA512 fa4898bcfc228a0c5018fe079be18f0950d0f1541713e2a4d688f5b2306f3c5b2ffa4452b1e3f31f68d7ebc8f775e5eed359c839e4cfcb63112ed86647535a1e
-EBUILD gentoo-functions-9999.ebuild 814 BLAKE2B f499bc57b9ea9ffb48fd1da818d9c8cbcee0c2f07a1addbc287271f86808d172d62502ede3bcfcb512bbd70dada7a579d1cabe5ce445a591623e5c363795ff25 SHA512 256843a43221915744f63f1080e99d344f8fbfc06ce35c9689a2ac397c11c1d994ba16fe01859965e53b06f9a4afb4efe496159618d78a099d6e422afe15208b
+DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
+EBUILD gentoo-functions-0.12.ebuild 818 BLAKE2B 36314c207eb995b721240f68bb472810451d5d5337ff755151c314dc667f622ccd66977272a74f6c86731be91daf47b134bbca099b2ffb6786035017eef8b1a1 SHA512 4abfaf4a69424c69733a44dfd17cb33931b205ba5b305bbb5864ca9da78d2e6796f1b3807bb2618639600b52547cb7626006c7b81f1ecde6978dbfabb7f80d00
+EBUILD gentoo-functions-0.13.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
+EBUILD gentoo-functions-9999.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index 5479d058b0d4..287a61aa175b 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2014-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
new file mode 100644
index 000000000000..c06e9afa8388
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_configure() {
+	tc-export CC
+	append-lfs-flags
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
+}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index a8780922f9d2..c06e9afa8388 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-src_prepare() {
+src_configure() {
 	tc-export CC
 	append-lfs-flags
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
 }