Merge pull request #1903 from pentoo/python_bump

python bump
pentoo · May 21, 2024 · e2ea023 · e2ea023
2 parents e810796 + 2b2d3c2
commit e2ea023
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 7 deletions.
diff --git a/dev-python/cc2538-bsl/metadata.xml b/dev-python/cc2538-bsl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>[email protected]</email>
+		<name>Zero_Chaos</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cc2538-bsl</remote-id>
+		<remote-id type="github">JelmerT/cc2538-bsl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/.../pentoo-core/pentoo-core-2024.1-r1.ebuild → .../pentoo-core/pentoo-core-2024.1-r2.ebuild b/.../pentoo-core/pentoo-core-2024.1-r1.ebuild → .../pentoo-core/pentoo-core-2024.1-r2.ebuild
@@ -55,7 +55,6 @@ PDEPEND="${PDEPEND}
 		net-misc/dhcp
 		net-misc/mosh
 		net-misc/vconfig
-		sys-apps/elfix
 		sys-apps/mlocate
 		sys-apps/usb_modeswitch
 		sys-auth/nss-mdns

diff --git a/...o-proxies/pentoo-proxies-2022.2-r1.ebuild → ...ntoo-proxies/pentoo-proxies-2024.1.ebuild b/...o-proxies/pentoo-proxies-2022.2-r1.ebuild → ...ntoo-proxies/pentoo-proxies-2024.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,6 @@ PDEPEND="
 		net-dns/dnscrypt-proxy
 		net-misc/proxychains
 		net-proxy/3proxy
-		net-proxy/mitmproxy
 		net-proxy/privoxy
 		net-proxy/redsocks
 		net-proxy/tsocks

diff --git a/.../zero-system/zero-system-2024.0-r8.ebuild → pentoo/zero-system/zero-system-2024.1.ebuild b/.../zero-system/zero-system-2024.0-r8.ebuild → pentoo/zero-system/zero-system-2024.1.ebuild
@@ -114,7 +114,6 @@ RDEPEND="
 			net-wireless/md380tools
 			!lto? ( dev-embedded/arduino )
 			media-tv/v4l-utils
-			media-video/vidcutter
 			x11-misc/xdotool
 			)
 "

diff --git a/profiles/pentoo/base/package.keywords/python3_12 b/profiles/pentoo/base/package.keywords/python3_12
@@ -0,0 +1,6 @@
+=app-admin/supervisor-4.2.5-r1 amd64 x86
+=x11-misc/redshift-1.12-r11 amd64 x86
+=dev-libs/libpwquality-1.4.5-r2 amd64 x86
+=dev-libs/libnl-3.9.0 amd64 x86
+=app-pda/usbmuxd-1.1.1_p20231011 amd64 x86
+=app-pda/libimobiledevice-1.3.0_p20240201 amd64 x86
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
@@ -187,3 +187,6 @@ dev-lang/lua:0
 #not sure why x86 is pulling in the old version
 #forcing upgrade
 <media-libs/audacity-3.3.3
+
+#force sticky upgrade
+<app-pda/libplist-2.3
diff --git a/profiles/pentoo/base/packages b/profiles/pentoo/base/packages
@@ -22,7 +22,6 @@ virtual/os-headers
 sys-devel/gnuconfig
 app-arch/gzip
 net-misc/iputils
-sys-apps/elfix
 virtual/editor
 sys-apps/file
 sys-apps/busybox

diff --git a/profiles/pentoo/zero-system/make.defaults b/profiles/pentoo/zero-system/make.defaults
@@ -1,7 +1,7 @@
 ACCEPT_LICENSE="${ACCEPT_LICENSE} NVIDIA-CUDA android google-chrome Google-TOS baudline Intel-SDP Nero-AAC-EULA ms-teams-pre PUEL PUEL-11"
 
-USE="pentoo-extra zsh-completion -semantic-desktop"
-#USE="${USE} -python_targets_python3_11"
+USE="${USE} pentoo-extra zsh-completion -semantic-desktop"
+USE="${USE} -python_targets_python3_11"
 
 PORTAGE_GPG_DIR="/home/zero/.gnupg/"
 PORTAGE_GPG_KEY="0xA5DD1427DD11F94A"

diff --git a/profiles/pentoo/zero-system/use.mask b/profiles/pentoo/zero-system/use.mask
@@ -0,0 +1 @@
+python_targets_python3_11