Merge pull request #1897 from pentoo/bootstrap_fix

bootstrap fix

net-proxy/burpsuite/Manifest

@@ -1,3 +1 @@
-DIST burpsuite_community_v2024.1.1.6.jar 548785842 BLAKE2B 0b8887a1e63fac59b4b328a0afe1a85a51f2c94779273993f39218262d0b3fa4d632a5b1de204f2ad6cee7b4267eebc2c53a02dec9b275e788d0b48b643e54e1 SHA512 6ea1a3d7e9b5412e23447e10270b213fcff8f0faa503dac8c4b8220c761d65190dd3a6abfb286118fd2c622d0e288c9761b37e89eb3739cdee00b0dca4428f8e
 DIST burpsuite_community_v2024.3.1.4.jar 550849394 BLAKE2B 1dda0c540a7c44d8c88db3754fa3ac5be6c020fea65eb7dda0fd015a6bfbed004aa6f8503615c89922c751ef9aedc824f9b2609aae85b06bee74d7f0c27d614b SHA512 bbb3148bec76f1d6d725a8f5de497cd1c7c3555ff2eb70f9af1bd1a8c500badb42679da3799247daf631b60abb3dfea04d201ba082ebf5c8779aa64b7d47955d
-DIST burpsuite_community_v9999.jar 34204 BLAKE2B 2ca921851f99bdbcb8ee72a3d13696f760595d9f64b4d6df9193a8896cb59680f1759a075d921e215b5d8b925e20bbc5a11d910171b6f3ff167e681b4465a93a SHA512 e377b69a852f7971f75709c5b755e8142bd40905271cb91c15c5125c24acc34cdb28faf9c167e25d60d3b04eafd4d2f9f5f5274349dcacd0f149f5e292e5b275

net-proxy/burpsuite/burpsuite-9999.ebuild

@@ -15,28 +15,31 @@ SLOT="0"
 # https://portswigger.net/burp/releases
 # https://portswigger.net/burp/releases/professional/latest
 MY_PV=${PV/_rc/}
-if [[ "${PN}" == *"pro" ]]; then
-	MY_P="burpsuite_pro_v${MY_PV}.jar"
-	SRC_URI="https://portswigger.net/burp/releases/download?product=pro&version=${MY_PV}&type=Jar  -> ${MY_P}"
-else
-	MY_P="burpsuite_community_v${MY_PV}.jar"
-	SRC_URI="https://portswigger.net/burp/releases/download?product=community&version=${MY_PV} -> ${MY_P}"
-fi
+if [ "${PV}" != "9999" ]; then
+	if [[ "${PN}" == *"pro" ]]; then
+		MY_P="burpsuite_pro_v${MY_PV}.jar"
+		SRC_URI="https://portswigger.net/burp/releases/download?product=pro&version=${MY_PV}&type=Jar  -> ${MY_P}"
+	else
+		MY_P="burpsuite_community_v${MY_PV}.jar"
+		SRC_URI="https://portswigger.net/burp/releases/download?product=community&version=${MY_PV} -> ${MY_P}"
+	fi
 
-if [[ "${PV}" == *9999 ]]; then
-#	SRC_URI="404.tar.gz"
-#	KEYWORDS=""
-	ewarn "9999 is a template, do not use it"
-elif [[ "${PV}" == *"_rc" ]]; then
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS="amd64 x86"
+	if [ "${PV}" != "9999" ]; then
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
 
 BDEPEND="app-arch/zip"
 #java-pkg-2 sets java based on RDEPEND so the java slot in rdepend is used to build
 RDEPEND="virtual/jre:21"
 
+pkg_setup() {
+	if [[ "${PV}" == *9999 ]]; then
+		eerror "9999 is a template, do not use it"
+		die
+	fi
+}
+
 src_unpack() {
 	cp "${DISTDIR}/${A}" "${S}"
 }

profiles/pentoo/arch/arm/package.accept_keywords/proxies

@@ -3,7 +3,6 @@ dev-python/itsdangerous amd64
 dev-python/werkzeug amd64
 ~dev-python/netlib-0.10 **
 ~dev-python/flask-0.10.1 **
-=virtual/jre-1.7.0 **
 ~net-vpn/iodine-0.7.0 **
 ~net-proxy/burpsuite-1.5 **
 ~net-proxy/zaproxy-2.1.0 **
@@ -12,7 +11,6 @@ dev-python/werkzeug amd64
 <net-proxy/proxystrike-9999 **
 ~net-proxy/privoxy-tor-01 **
 =net-misc/proxychains-4.2.0 **
-=virtual/jdk-1.7.0 **
 =virtual/jpeg-62 ~arm
 ~net-proxy/3proxy-0.6.1 **
 ~net-proxy/ratproxy-1.58 **

profiles/pentoo/base/package.accept_keywords/net-proxy

@@ -1,7 +1,7 @@
 #required by go > 1.19
 ~net-dns/dnscrypt-proxy-2.1.3
 
-~net-proxy/burpsuite-1.5
+~net-proxy/burpsuite-2024.3.1.4
 =net-proxy/zaproxy-2.9*
 
 net-proxy/redsocks

profiles/pentoo/base/package.use.mask

@@ -7,10 +7,6 @@ net-dialup/freeradius python
 #breaks ardunio
 cross-avr/gcc pie ssp
 
-#livecd use flag forces no gentoo-syntax, we want gentoo-syntax
-app-editors/vim-core livecd
-#livecd is often not desired
-net-misc/openssh livecd
 #symlinks busybox to vi
 sys-apps/busybox livecd
 #basically just forces gpm and fbcon
@@ -27,16 +23,9 @@ sys-apps/portage build
 #https://bugs.gentoo.org/show_bug.cgi?id=531540
 #this breaks a lot of things, and it sounds like all the patents are expired
 dev-libs/openssl bindist
-#we don't let openssl be bindist and this is just to support openssl
-net-wireless/wpa_supplicant bindist
-#this exists only to match abi with openssl
-net-misc/openssh bindist
-#this exists only to match abi with openssl
-dev-qt/qtnetwork bindist
 
 #this is too old to work right anymore afaict
 net-wireless/pyrit cuda
-net-wireless/wifite cuda
 net-wireless/wifite2 cuda
 
 #wine doesn't need opencl for anything important afaik, and opencl sucks in gentoo
@@ -47,30 +36,17 @@ app-emulation/wine-vanilla opencl
 #modesetting is superior in all noticable ways and it default nearly everywhere
 x11-base/xorg-drivers video_cards_i915
 
-#unmask flag
-dev-java/openjdk-bin:11 -gentoo-vm
-dev-java/openjdk:11 -gentoo-vm
-dev-java/openjdk-bin:17 -gentoo-vm
-dev-java/openjdk:17 -gentoo-vm
-
 #no python3 support
 #python2 is mostly dead, and this is clinging to it and breaking smooth update
-dev-lang/yasm python
 dev-libs/libdnet python
-dev-libs/libgamin python
-dev-libs/libnatspec python
 dev-libs/libxslt python
-x11-libs/goocanvas python
 
 #older versions are python 2 only
 <dev-vcs/subversion-1.14.0 python #1.14.0 doesn't actually build with python of course... https://bugs.gentoo.org/725850
 <media-gfx/gimp-2.10.21 python #doesn't actually exist yet, might need modification
 <dev-vcs/subversion-1.14.0 python
 <net-analyzer/net-snmp-5.9 python
 
-#lto is broken https://bugs.gentoo.org/754021
-net-analyzer/wireshark lto
-
 #this breaks hashcat
 dev-libs/pocl accel
 

profiles/pentoo/bootstrap/package.use

@@ -5,7 +5,6 @@ app-crypt/gnupg -verify-sig
 app-crypt/pinentry -gtk -qt5
 app-crypt/pinentry -verify-sig
 app-text/ghostscript-gpl -X -cups
-dev-build/cmake -qt5
 dev-build/meson -verify-sig
 dev-lang/python -bluetooth
 dev-lang/python -sqlite -tk
@@ -19,6 +18,7 @@ dev-libs/libpcre2 -verify-sig
 dev-libs/libtasn1 -verify-sig
 dev-libs/nettle -verify-sig
 dev-libs/openssl -verify-sig
+dev-python/pillow -webp
 media-libs/freetype -harfbuzz
 media-libs/mesa -vaapi
 net-analyzer/rrdtool -python -ruby