From 420f91b7c2c77c52f8c0e8916f67e9b43270b33c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 3 Jun 2022 19:38:58 +0200 Subject: [PATCH] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit f3d22c0fe930541422da4b3cb730e1f4576e9c31. --- .../sys-devel/crossdev/Manifest | 8 +++-- ...210621.ebuild => crossdev-20211121.ebuild} | 9 ++--- .../crossdev/crossdev-20220205.ebuild | 36 +++++++++++++++++++ ...211027.ebuild => crossdev-20220424.ebuild} | 5 ++- ...210718.ebuild => crossdev-20220617.ebuild} | 12 +++---- .../crossdev/crossdev-20220709.ebuild | 35 ++++++++++++++++++ .../crossdev/crossdev-99999999.ebuild | 7 ++-- .../sys-devel/crossdev/metadata.xml | 20 ++++++----- 8 files changed, 104 insertions(+), 28 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-devel/crossdev/{crossdev-20210621.ebuild => crossdev-20211121.ebuild} (74%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220205.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/crossdev/{crossdev-20211027.ebuild => crossdev-20220424.ebuild} (85%) rename sdk_container/src/third_party/portage-stable/sys-devel/crossdev/{crossdev-20210718.ebuild => crossdev-20220617.ebuild} (68%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220709.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest index 48756ff975..a09703da90 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest @@ -1,3 +1,5 @@ -DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c -DIST crossdev-20210718.tar.xz 28640 BLAKE2B 1e9b9313a5c9a1cb4d82f00e4979794d61b9eaa0035c575ac55092c6c015d820a590c5816d212a4ffad95b96a3dd99a9b94ca7c20b78a7d7b062f16dec6ed329 SHA512 e1a37aebf759abaa30f071f43a528f9059b83456e71fd86fc8202a7eff5c506c1f34fdd260c7b91a03f491b9f2a107ce6a65c2314845a352176fcc5a27a766e2 -DIST crossdev-20211027.tar.xz 28752 BLAKE2B 058d6254c702709c18cc426fe15d7a11cb856336236837a15c0b2cb0c2389198f8b0ea9893e7cdadd6ecdabb3e75c05b64c22448324ce2ea86032cb57e92a5d9 SHA512 6c15d71fb551dcb5cb8e95d7e3b1ecb52b34e47335842408da5acc9d258c1a5fa7e4699681b9b414b1b444df98601aa8b99b2000700485ec6028c076abeafd03 +DIST crossdev-20211121.tar.xz 28700 BLAKE2B bfe637dcd3c5b6d45e289d6298de18cab4b70b5d21a817a9207b91360b489457b9ee10266a1c2641f8dfac09dffb166bf1565a7e519ba41f84c6d5c2000f5158 SHA512 5189fa7639b819dfffc8f994bb557d8d83f115b82cd61d938db77fdcf16a33cc9d0147f9708b3bed22fdc4ace27ac863436813ebad94876ae767172ac0cbb9ce +DIST crossdev-20220205.tar.xz 29088 BLAKE2B 46e90557f0a6df49e4f6ab7be6495514a188c4366868290d3b6b879ad1e5741e1600bca237735290f7e9278d441534569853b582cd85b96581c6ae0517cb4c54 SHA512 72e7cf690d49a87b32f6fdad2462fd4156e4e35a3f0b5f30911012a2b7936bb999575f757547a7a805c0cfdd1fd0caa8b23bf61e72c4333096314043ed565f40 +DIST crossdev-20220424.tar.xz 29316 BLAKE2B 8b026c165b643262ef934fb2daec5484bc2a2e8c2cafbaca08ecb81c2870a6306dd834c9f72bca8cbe219d1b24274fef0b83a88e301e66d98a1eb0825bb2e161 SHA512 3c2ac2d9c79140c6e0aa7ac9fa7838499f003c6c9c1260abf4b0b7883d2179ef1ded5ab0ba14ca48d471edde5090e22a50fffbf25fd86a32d354a9541e4fd567 +DIST crossdev-20220617.tar.xz 29396 BLAKE2B e3b39edfb4cbd5808851b56d86646bc879ea875b5e320802d86073236474e3aa80c5dbefc42ef4799528334bfb5a2a0abb5c0b344ebdce39ec01aac59306eb84 SHA512 bdc5ea519e4cd6275e8171ff7cd35c8ae45b6240fefd278997e247c8b0758bff6563f7e2613072e179ec4735155f05236f32385fe13579c5e955f761e0859e43 +DIST crossdev-20220709.tar.xz 29408 BLAKE2B dc96be5d86b343215564c2c15e91314c5ed88c765cec4f222b08a7e942ab5fb230915a0cdc3245719c0b12b4ce579066c6a88ae8e7ef4e44b80d8f0c5ddf7663 SHA512 f27929db8b4f7036408a0db18d46eb84312e1cef279336e13a07422ed3a154f3a21821d2d5ada66c0fca37bd70750413dab87b795c957a0a81cb9f27ebce2b90 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211121.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211121.ebuild index 59140a11c2..fe3c418c30 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211121.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" else SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220205.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220205.ebuild new file mode 100644 index 0000000000..fe3c418c30 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220205.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + >=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions +" +BDEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220424.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220424.ebuild index 0c2fe30139..8c680c914a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220424.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -7,8 +7,7 @@ if [[ ${PV} == "99999999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220617.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220617.ebuild index b7f11a2c01..1701b22179 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220617.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi @@ -29,7 +29,7 @@ BDEPEND="app-arch/xz-utils" src_install() { default - if [[ "${PV}" == "99999999" ]] ; then + if [[ ${PV} == "99999999" ]] ; then sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220709.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220709.ebuild new file mode 100644 index 0000000000..1701b22179 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220709.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + >=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions +" +BDEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ ${PV} == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild index 0c2fe30139..1701b22179 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -7,8 +7,7 @@ if [[ ${PV} == "99999999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi @@ -30,7 +29,7 @@ BDEPEND="app-arch/xz-utils" src_install() { default - if [[ "${PV}" == "99999999" ]] ; then + if [[ ${PV} == "99999999" ]] ; then sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml index 00b311f551..a4be5df4df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml @@ -1,12 +1,16 @@ - - crossdev@gentoo.org - Gentoo Crossdev Team - - - embedded@gentoo.org - Embedded Gentoo - + + crossdev@gentoo.org + Gentoo Crossdev Team + + + toolchain@gentoo.org + Gentoo Toolchain Project + + + embedded@gentoo.org + Embedded Gentoo +