From c343f60eeb5acdb31519fb494380793b89146947 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 27 Jan 2021 10:08:05 -0500 Subject: [PATCH] profile: some updates, including lua and python --- profiles/eapi | 1 + profiles/package.mask | 15 ------------- profiles/pentoo/base/make.defaults | 5 ++++- .../base/package.accept_keywords/dev-python | 2 +- .../base/package.accept_keywords/net-dns | 1 + profiles/pentoo/base/package.mask | 21 +++++++++++++++++++ .../pentoo/base/package.use/kde-frameworks | 1 + .../pentoo/overlay/package.use/kde-frameworks | 1 + profiles/pentoo/zero-system/make.defaults | 1 - 9 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 profiles/eapi delete mode 100644 profiles/package.mask create mode 100644 profiles/pentoo/base/package.use/kde-frameworks create mode 120000 profiles/pentoo/overlay/package.use/kde-frameworks diff --git a/profiles/eapi b/profiles/eapi new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/profiles/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/package.mask b/profiles/package.mask deleted file mode 100644 index 4f6fc1fb3..000000000 --- a/profiles/package.mask +++ /dev/null @@ -1,15 +0,0 @@ -# It's a very unstable package -net-analyzer/osmedeus - -# not tested yet... (2019-09-21) -# more info: https://github.com/pentoo/pentoo-overlay/issues/495 -net-wireless/hostapd-mana -net-wireless/berate_ap -net-wireless/wpa_sycophant - -# use a better tool, https://github.com/pentoo/pentoo-overlay/issues/564 -net-misc/rdesktop-brute - -# this is an old python bindings for brotli -# app-arch/brotli provides it's own compatible version and it should be used instead -dev-python/brotlipy diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults index fbae7df68..0f05cc303 100644 --- a/profiles/pentoo/base/make.defaults +++ b/profiles/pentoo/base/make.defaults @@ -45,7 +45,10 @@ PORTAGE_NICENESS="9" PORTAGE_IO_NICENESS="ionice -c 3 -p \${PID}" #tslib causes circular deps with libsdl2 -USE="${INPUT_USE} X abi_x86_32 adns blake2 caps -consolekit curl elogind fbcon gles2 gps jack lm-sensors lm_sensors lua lz4 lzip lzma lzo networkmanager oss pentoo-full perl pulseaudio python ruby samba sqlite subversion vdpau vaapi vulkan wayland xattr xinerama x265 zstd -python_targets_python2_7" +USE="${INPUT_USE} X abi_x86_32 adns blake2 caps -consolekit curl elogind fbcon gles2 gps jack lm-sensors lm_sensors lua lz4 lzip lzma lzo networkmanager oss pentoo-full perl pulseaudio python ruby samba sqlite subversion vdpau vaapi vulkan wayland xattr xinerama x265 zstd" + +#keep pentoo python advanced +USE="${USE} -python_targets_python2_7 python_targets_python3_9" PORTAGE_BZIP2_COMMAND="lbzip2" PORTAGE_BUNZIP2_COMMAND="lbunzip2" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index f56a0042b..a71d56a4c 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -117,7 +117,7 @@ dev-python/pyasn1 ~dev-python/typing-3.5.2.2 ** ~dev-python/urwid-2.0.1 ~dev-python/watchdog-0.8.3-r1 -~dev-python/wsproto-0.15.0 +=dev-python/wsproto-1* # required by net-misc/sherlock ~dev-python/futures-2.1.5 diff --git a/profiles/pentoo/base/package.accept_keywords/net-dns b/profiles/pentoo/base/package.accept_keywords/net-dns index 6d3c55838..aee1d536d 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-dns +++ b/profiles/pentoo/base/package.accept_keywords/net-dns @@ -1 +1,2 @@ net-dns/dnscrypt-proxy amd64 ~amd64 +~net-dns/dnsmasq-2.83 diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index c2727e820..43fbc12d6 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -132,3 +132,24 @@ app-forensics/volatility #no wpe patches yet >=net-dialup/freeradius-3.0.21 + +# It's a very unstable package +net-analyzer/osmedeus + +# not tested yet... (2019-09-21) +# more info: https://github.com/pentoo/pentoo-overlay/issues/495 +net-wireless/hostapd-mana +net-wireless/berate_ap +net-wireless/wpa_sycophant + +# use a better tool, https://github.com/pentoo/pentoo-overlay/issues/564 +net-misc/rdesktop-brute + +# this is an old python bindings for brotli +# app-arch/brotli provides it's own compatible version and it should be used instead +dev-python/brotlipy + +#deprecated unslotted lua +dev-lang/lua:0 +=net-dns/dnsmasq-2.83-r1 +=net-dns/dnsmasq-2.84 diff --git a/profiles/pentoo/base/package.use/kde-frameworks b/profiles/pentoo/base/package.use/kde-frameworks new file mode 100644 index 000000000..6dd362cf4 --- /dev/null +++ b/profiles/pentoo/base/package.use/kde-frameworks @@ -0,0 +1 @@ +kde-frameworks/prison qml diff --git a/profiles/pentoo/overlay/package.use/kde-frameworks b/profiles/pentoo/overlay/package.use/kde-frameworks new file mode 120000 index 000000000..c8b1bf86a --- /dev/null +++ b/profiles/pentoo/overlay/package.use/kde-frameworks @@ -0,0 +1 @@ +../../base/package.use/kde-frameworks \ No newline at end of file diff --git a/profiles/pentoo/zero-system/make.defaults b/profiles/pentoo/zero-system/make.defaults index 67621f489..6b529ca00 100644 --- a/profiles/pentoo/zero-system/make.defaults +++ b/profiles/pentoo/zero-system/make.defaults @@ -3,7 +3,6 @@ ACCEPT_LICENSE="${ACCEPT_LICENSE} NVIDIA-CUDA google-chrome Google-TOS PUEL baudline Intel-SDP Nero-AAC-EULA ms-teams-pre" USE="gentoo-dev pentoo-extra zsh-completion -accessibility" -USE="${USE} python_targets_python3_9" PORTAGE_GPG_DIR="/home/zero/.gnupg/" PORTAGE_GPG_KEY="0xA5DD1427DD11F94A"