From 9ce8d7fcb15771f2b1e44f9580d3d1fc02a7a4d5 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 17 Sep 2020 14:38:21 -0400 Subject: [PATCH] profile: start moving what makes sense from accept_keywords to keywords. keywords should be used for things we want to stabilize ahead of gentoo in favor of accept_keywords despite it being a bit more annoying to use --- app-crypt/asleap/asleap-2.2_p20160730.ebuild | 2 +- app-dicts/seclists/Manifest | 2 - app-dicts/seclists/seclists-2020.1.ebuild | 26 ------- app-dicts/seclists/seclists-2020.2.ebuild | 26 ------- app-dicts/seclists/seclists-2020.3.ebuild | 2 +- app-editors/visual-studio-code/Manifest | 1 - .../visual-studio-code-1.47.3.ebuild | 74 ------------------- .../visual-studio-code-1.48.0.ebuild | 2 +- .../eselect-metasploit-0.19.ebuild | 5 +- app-eselect/eselect-metasploit/metadata.xml | 2 +- .../base/package.accept_keywords/app-admin | 3 - .../base/package.accept_keywords/app-arch | 2 - .../base/package.accept_keywords/app-crypt | 5 -- .../base/package.accept_keywords/app-dicts | 1 - .../base/package.accept_keywords/app-editors | 6 -- .../package.accept_keywords/app-emulation | 8 -- .../base/package.accept_keywords/app-eselect | 4 - .../base/package.accept_keywords/sys-libs | 3 - .../pentoo/base/package.keywords/app-admin | 1 + .../pentoo/base/package.keywords/app-crypt | 2 + .../pentoo/base/package.keywords/app-editors | 3 + .../base/package.keywords/app-emulation | 5 ++ .../pentoo/overlay/package.keywords/app-admin | 1 + .../pentoo/overlay/package.keywords/app-crypt | 1 + .../overlay/package.keywords/app-editors | 1 + .../overlay/package.keywords/app-emulation | 1 + sys-libs/libxcrypt/libxcrypt-2.4.ebuild | 2 +- 27 files changed, 22 insertions(+), 169 deletions(-) delete mode 100644 app-dicts/seclists/seclists-2020.1.ebuild delete mode 100644 app-dicts/seclists/seclists-2020.2.ebuild delete mode 100644 app-editors/visual-studio-code/visual-studio-code-1.47.3.ebuild delete mode 100644 profiles/pentoo/base/package.accept_keywords/app-admin delete mode 100644 profiles/pentoo/base/package.accept_keywords/app-arch delete mode 100644 profiles/pentoo/base/package.accept_keywords/app-dicts delete mode 100644 profiles/pentoo/base/package.accept_keywords/app-editors delete mode 100644 profiles/pentoo/base/package.accept_keywords/app-eselect delete mode 100644 profiles/pentoo/base/package.accept_keywords/sys-libs create mode 100644 profiles/pentoo/base/package.keywords/app-admin create mode 100644 profiles/pentoo/base/package.keywords/app-crypt create mode 100644 profiles/pentoo/base/package.keywords/app-editors create mode 100644 profiles/pentoo/base/package.keywords/app-emulation create mode 120000 profiles/pentoo/overlay/package.keywords/app-admin create mode 120000 profiles/pentoo/overlay/package.keywords/app-crypt create mode 120000 profiles/pentoo/overlay/package.keywords/app-editors create mode 120000 profiles/pentoo/overlay/package.keywords/app-emulation diff --git a/app-crypt/asleap/asleap-2.2_p20160730.ebuild b/app-crypt/asleap/asleap-2.2_p20160730.ebuild index ed9c9a7e8..1eb913ec8 100644 --- a/app-crypt/asleap/asleap-2.2_p20160730.ebuild +++ b/app-crypt/asleap/asleap-2.2_p20160730.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/joswr1ght/asleap" HASH_COMMIT="f8229d2fd800b36b34699a19f50a35981b1dcb49" # 20160730 SRC_URI="https://github.com/joswr1ght/asleap/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" LICENSE="GPL-2" SLOT="0" IUSE="" diff --git a/app-dicts/seclists/Manifest b/app-dicts/seclists/Manifest index 66fd24425..896c53ae9 100644 --- a/app-dicts/seclists/Manifest +++ b/app-dicts/seclists/Manifest @@ -1,3 +1 @@ -DIST seclists-2020.1.tar.gz 349945327 BLAKE2B f6ba4e62ec684336a01267cc47e32f3cfa1ccbc7241d4e4065ab73982958e74ae81575d11a0b59fe4c3bc521ca5ef40c3214cc1e89c5c7a8a85eae9778bb18ad SHA512 f9f50cfcd17e1f1294ed5cdd5e412a1648e4aa7bbbb78727d21bb0a67551428aede1b18e82575d50031389d10e0f039d7eac6d9b1bf98ea11b182ab043f6806b -DIST seclists-2020.2.tar.gz 459561244 BLAKE2B a3567ad4575d9d56a81c75ca4d8d894788d2b422b33b9363ae6cbc2ecbfd3645421beb8012537da24c597aed3fda276c520e85b30197bf5f40cf612da82913e9 SHA512 7058fb7c57e9959b83a92845d1af1541510275f8dbd564b51811cdacb9bc8bcc82e421c46f78e0e9af7b565fc2bcddd00cd8258393cd2c243b6f8b92037d6f3b DIST seclists-2020.3.tar.gz 458160434 BLAKE2B 8c2856e50794d75dd12a588f49b04a53478d9241697e5a0363f689815dc155b112a941487004ec209cbea379b3838eddbe0bb14b1611c3f798e2f4d6dbdf9b05 SHA512 3f07808e4074d6baf3fa4a7b424161c453d0f3e96b201064ce12571a54200a723e906784c8ee8bdd0cb0d6898cdff791a104873912867c42f305d97d8d4e6dc3 diff --git a/app-dicts/seclists/seclists-2020.1.ebuild b/app-dicts/seclists/seclists-2020.1.ebuild deleted file mode 100644 index 6471b38ae..000000000 --- a/app-dicts/seclists/seclists-2020.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A collection of multiple types of lists used during security assessments" -HOMEPAGE="https://github.com/danielmiessler/SecLists" -SRC_URI="https://github.com/danielmiessler/SecLists/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -S="${WORKDIR}/SecLists-${PV}" - -src_prepare(){ - default - - #https://github.com/danielmiessler/SecLists/issues/226 - rm ./Payloads/File-Names/max-length/* || die -} - -src_install(){ - insinto /usr/share/dict/seclists - doins -r * -} diff --git a/app-dicts/seclists/seclists-2020.2.ebuild b/app-dicts/seclists/seclists-2020.2.ebuild deleted file mode 100644 index 6471b38ae..000000000 --- a/app-dicts/seclists/seclists-2020.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A collection of multiple types of lists used during security assessments" -HOMEPAGE="https://github.com/danielmiessler/SecLists" -SRC_URI="https://github.com/danielmiessler/SecLists/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -S="${WORKDIR}/SecLists-${PV}" - -src_prepare(){ - default - - #https://github.com/danielmiessler/SecLists/issues/226 - rm ./Payloads/File-Names/max-length/* || die -} - -src_install(){ - insinto /usr/share/dict/seclists - doins -r * -} diff --git a/app-dicts/seclists/seclists-2020.3.ebuild b/app-dicts/seclists/seclists-2020.3.ebuild index 6471b38ae..f567a78f7 100644 --- a/app-dicts/seclists/seclists-2020.3.ebuild +++ b/app-dicts/seclists/seclists-2020.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/danielmiessler/SecLists/archive/${PV}.tar.gz -> ${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 arm x86" S="${WORKDIR}/SecLists-${PV}" diff --git a/app-editors/visual-studio-code/Manifest b/app-editors/visual-studio-code/Manifest index d96c2dc49..676bc4911 100644 --- a/app-editors/visual-studio-code/Manifest +++ b/app-editors/visual-studio-code/Manifest @@ -1,2 +1 @@ -DIST visual-studio-code-1.47.3-amd64.tar.gz 89445035 BLAKE2B 82ff0d13ff0c2d553d7f9480997b4a4f535588e72af5f8f3960b09200e559fc1fa6aa43a5dd50c2b9239640c83eb5c513e35365a97cb6e1f483234f848757b7a SHA512 0dafd757d9e7fe0edb1e14463cafe66c850d4ba65ef6a16086d0af4047ad8faccc45e961939f1304eb4e2a914583cc6fb6ab6ee937f8ff29631ed1928c364a7b DIST visual-studio-code-1.48.0-amd64.tar.gz 89962587 BLAKE2B 8e678aa20b038628dd1d847870ba0a9b8b98d0ddec30baa53bb0e06a15f5956b7c5737da36024f91952125f535668f48507601b824a0e8a3db56c6a70900eb26 SHA512 b0cbbe51edc1da285085576ad1753bb583a3df6e88c991a3133a3a0dc37a3e184ab0d4546a0f24c413298a6a585b74ebddd717c176c59dc78d7dc57993d4cc2c diff --git a/app-editors/visual-studio-code/visual-studio-code-1.47.3.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.47.3.ebuild deleted file mode 100644 index cf9f6e060..000000000 --- a/app-editors/visual-studio-code/visual-studio-code-1.47.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils pax-utils desktop - -DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" -HOMEPAGE="https://code.visualstudio.com" -BASE_URI="https://vscode-update.azurewebsites.net/${PV}" -# x86? ( ${BASE_URI}/linux-ia32/stable -> ${P}-x86.tar.gz ) -SRC_URI=" - amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz ) - " - -RESTRICT="mirror strip bindist" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gnome-keyring" - -DEPEND="gnome-base/gsettings-desktop-schemas - >=media-libs/libpng-1.2.46:0 - >=x11-libs/cairo-1.14.12:0 - >=x11-libs/gtk+-2.24.31-r1:2 - >=x11-libs/libXtst-1.2.3:0 - " - -RDEPEND=" - ${DEPEND} - >=net-print/cups-2.1.4:0 - >=x11-libs/libnotify-0.7.7:0 - >=x11-libs/libXScrnSaver-1.2.2-r1:0 - dev-libs/nss - gnome-keyring? ( app-crypt/libsecret[crypt] ) - " - -QA_PREBUILT="opt/${PN}/*" -QA_PRESTRIPPED="opt/${PN}/*" - -pkg_setup(){ - use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32" -} - -src_install(){ - local DEST="/opt/${PN}" - pax-mark m code - insinto "${DEST}" - doins -r * - dosym "${DEST}/bin/code" "/usr/bin/${PN}" - dosym "${DEST}/bin/code" "/usr/bin/vscode" - make_desktop_entry "vscode" "Visual Studio Code" "${PN}" "Development;IDE" - doicon "${FILESDIR}/${PN}.png" - fperms +x "${DEST}/code" - fperms +x "${DEST}/bin/code" -# fperms +x "${DEST}/libnode.so" - fperms +x "${DEST}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" - fperms +x "${DEST}/resources/app/extensions/git/dist/askpass.sh" - insinto "/usr/share/licenses/${PN}" - for i in resources/app/LICEN*; - do - newins "${i}" "`basename ${i}`" - done - for i in resources/app/licenses/*; - do - newins "${i}" "`basename ${i}`" - done -} - -pkg_postinst(){ - einfo "You may install some additional utils, so check them in:" - einfo "https://code.visualstudio.com/Docs/setup#_additional-tools" -} diff --git a/app-editors/visual-studio-code/visual-studio-code-1.48.0.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.48.0.ebuild index cf9f6e060..98616e1e4 100644 --- a/app-editors/visual-studio-code/visual-studio-code-1.48.0.ebuild +++ b/app-editors/visual-studio-code/visual-studio-code-1.48.0.ebuild @@ -17,7 +17,7 @@ RESTRICT="mirror strip bindist" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="gnome-keyring" DEPEND="gnome-base/gsettings-desktop-schemas diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild index 326be039d..90f8895f4 100644 --- a/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild +++ b/app-eselect/eselect-metasploit/eselect-metasploit-0.19.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2020 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=7 @@ -10,7 +9,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 arm x86" IUSE="" DEPEND="! - + zerochaos@gentoo.org Rick Farina diff --git a/profiles/pentoo/base/package.accept_keywords/app-admin b/profiles/pentoo/base/package.accept_keywords/app-admin deleted file mode 100644 index 5a62668cf..000000000 --- a/profiles/pentoo/base/package.accept_keywords/app-admin +++ /dev/null @@ -1,3 +0,0 @@ -~app-admin/paxtest-0.9.9 -app-admin/calamares - diff --git a/profiles/pentoo/base/package.accept_keywords/app-arch b/profiles/pentoo/base/package.accept_keywords/app-arch deleted file mode 100644 index a97851e64..000000000 --- a/profiles/pentoo/base/package.accept_keywords/app-arch +++ /dev/null @@ -1,2 +0,0 @@ -#Gentoo -~app-arch/lzma-9.20 diff --git a/profiles/pentoo/base/package.accept_keywords/app-crypt b/profiles/pentoo/base/package.accept_keywords/app-crypt index 67b53e1a6..ebcd55830 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-crypt +++ b/profiles/pentoo/base/package.accept_keywords/app-crypt @@ -7,9 +7,6 @@ app-crypt/steghide app-crypt/samdump2 - -app-crypt/asleap - ~app-crypt/hashid-3.1.4 #Gentoo @@ -19,8 +16,6 @@ app-crypt/asleap ~app-crypt/libykneomgr-0.1.8 ** -app-crypt/hashcat - ~app-crypt/wisecracker-1.0 ~app-crypt/ophcrack-3.8.0 diff --git a/profiles/pentoo/base/package.accept_keywords/app-dicts b/profiles/pentoo/base/package.accept_keywords/app-dicts deleted file mode 100644 index 6f08fddef..000000000 --- a/profiles/pentoo/base/package.accept_keywords/app-dicts +++ /dev/null @@ -1 +0,0 @@ -=app-dicts/seclists-2020* diff --git a/profiles/pentoo/base/package.accept_keywords/app-editors b/profiles/pentoo/base/package.accept_keywords/app-editors deleted file mode 100644 index 6602d3f16..000000000 --- a/profiles/pentoo/base/package.accept_keywords/app-editors +++ /dev/null @@ -1,6 +0,0 @@ -#Pentoo -app-editors/visual-studio-code - -#Gentoo unstable -=app-editors/sublime-text-3* -=app-editors/wxhexeditor-0.24* diff --git a/profiles/pentoo/base/package.accept_keywords/app-emulation b/profiles/pentoo/base/package.accept_keywords/app-emulation index 7189dc3fa..29e71c771 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-emulation +++ b/profiles/pentoo/base/package.accept_keywords/app-emulation @@ -1,9 +1 @@ app-emulation/open-vm-tools -app-emulation/open-vm-tools-kmod - -=app-emulation/virtualbox-additions-6.1* -=app-emulation/virtualbox-modules-6.1* -=app-emulation/virtualbox-6.1* -=app-emulation/virtualbox-extpack-oracle-6.1* - -~app-emulation/qemu-charm-0.13.0 diff --git a/profiles/pentoo/base/package.accept_keywords/app-eselect b/profiles/pentoo/base/package.accept_keywords/app-eselect deleted file mode 100644 index d2b92e685..000000000 --- a/profiles/pentoo/base/package.accept_keywords/app-eselect +++ /dev/null @@ -1,4 +0,0 @@ -app-eselect/eselect-metasploit ** - -#https://bugs.gentoo.org/show_bug.cgi?id=625368 -~app-eselect/eselect-postgresql-2.2 diff --git a/profiles/pentoo/base/package.accept_keywords/sys-libs b/profiles/pentoo/base/package.accept_keywords/sys-libs deleted file mode 100644 index 90083bcd1..000000000 --- a/profiles/pentoo/base/package.accept_keywords/sys-libs +++ /dev/null @@ -1,3 +0,0 @@ -~sys-libs/libcap-ng-0.7.4 -~sys-libs/libsmbios-2.4.3 -~sys-libs/libxcrypt-2.4 diff --git a/profiles/pentoo/base/package.keywords/app-admin b/profiles/pentoo/base/package.keywords/app-admin new file mode 100644 index 000000000..0bb1eaeb4 --- /dev/null +++ b/profiles/pentoo/base/package.keywords/app-admin @@ -0,0 +1 @@ +app-admin/calamares amd64 x86 diff --git a/profiles/pentoo/base/package.keywords/app-crypt b/profiles/pentoo/base/package.keywords/app-crypt new file mode 100644 index 000000000..5b03f71f5 --- /dev/null +++ b/profiles/pentoo/base/package.keywords/app-crypt @@ -0,0 +1,2 @@ +#zero maintains these things so mark them stable +app-crypt/hashcat diff --git a/profiles/pentoo/base/package.keywords/app-editors b/profiles/pentoo/base/package.keywords/app-editors new file mode 100644 index 000000000..8caed4c1a --- /dev/null +++ b/profiles/pentoo/base/package.keywords/app-editors @@ -0,0 +1,3 @@ +#Gentoo unstable +=app-editors/sublime-text-3* amd64 x86 +=app-editors/wxhexeditor-0.24* amd64 x86 diff --git a/profiles/pentoo/base/package.keywords/app-emulation b/profiles/pentoo/base/package.keywords/app-emulation new file mode 100644 index 000000000..a1f3696a6 --- /dev/null +++ b/profiles/pentoo/base/package.keywords/app-emulation @@ -0,0 +1,5 @@ +#we keep virtualbox working with recent kernels +=app-emulation/virtualbox-additions-6.1.14* amd64 x86 +=app-emulation/virtualbox-modules-6.1.14* amd64 x86 +=app-emulation/virtualbox-6.1.14* amd64 x86 +=app-emulation/virtualbox-extpack-oracle-6.1.14* amd64 x86 diff --git a/profiles/pentoo/overlay/package.keywords/app-admin b/profiles/pentoo/overlay/package.keywords/app-admin new file mode 120000 index 000000000..9806f7ec9 --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/app-admin @@ -0,0 +1 @@ +../../base/package.keywords/app-admin \ No newline at end of file diff --git a/profiles/pentoo/overlay/package.keywords/app-crypt b/profiles/pentoo/overlay/package.keywords/app-crypt new file mode 120000 index 000000000..19d0fb8d4 --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/app-crypt @@ -0,0 +1 @@ +../../base/package.keywords/app-crypt \ No newline at end of file diff --git a/profiles/pentoo/overlay/package.keywords/app-editors b/profiles/pentoo/overlay/package.keywords/app-editors new file mode 120000 index 000000000..0ac934c64 --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/app-editors @@ -0,0 +1 @@ +../../base/package.keywords/app-editors \ No newline at end of file diff --git a/profiles/pentoo/overlay/package.keywords/app-emulation b/profiles/pentoo/overlay/package.keywords/app-emulation new file mode 120000 index 000000000..227fe2b43 --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/app-emulation @@ -0,0 +1 @@ +../../base/package.keywords/app-emulation \ No newline at end of file diff --git a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild index 28ba5c529..e58092d3d 100644 --- a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://packages.debian.org/sid/libxcrypt1" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" src_prepare() {