From 49acf0c625da1b6c6fcf3f6c123ce446f8533560 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Thu, 20 Aug 2020 16:05:02 -0400
Subject: [PATCH] profile: cleanup old lines, and prep for systemd option

---
 profiles/pentoo/base/package.mask             |  3 ---
 profiles/pentoo/base/package.use/app-admin    |  3 ---
 profiles/pentoo/base/package.use/app-portage  |  2 --
 profiles/pentoo/base/package.use/media-libs   |  3 ---
 profiles/pentoo/base/package.use/net-analyzer |  3 ---
 profiles/pentoo/base/package.use/sys-apps     | 22 ++++---------------
 profiles/pentoo/base/use.mask                 |  3 ---
 7 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index 4ee29a5f6..3adc79569 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -17,9 +17,6 @@ net-wireless/madwifi-ng-tools
 #hopefully easy upgrade/downgrade as the gnome guys removed the middle version...
 =gnome-base/libgnome-keyring-3.4.1
 
-#Systemd is unsupported by Pentoo
-sys-apps/systemd
-
 #mask old wireshark
 <net-analyzer/wireshark-2.6.3
 
diff --git a/profiles/pentoo/base/package.use/app-admin b/profiles/pentoo/base/package.use/app-admin
index 6c10e8712..91e053002 100644
--- a/profiles/pentoo/base/package.use/app-admin
+++ b/profiles/pentoo/base/package.use/app-admin
@@ -1,5 +1,2 @@
 app-admin/sudo offensive
 app-admin/testdisk ntfs ewf
-
-#inline with portage flags
-app-admin/webapp-config -python_targets_python2_7
diff --git a/profiles/pentoo/base/package.use/app-portage b/profiles/pentoo/base/package.use/app-portage
index 04af27d7b..4d22186c3 100644
--- a/profiles/pentoo/base/package.use/app-portage
+++ b/profiles/pentoo/base/package.use/app-portage
@@ -1,3 +1 @@
-app-portage/gemato -python_targets_python2_7
 app-portage/layman gpg subversion git mercurial sync-plugin-portage
-app-portage/unsymlink-lib -python_targets_python2_7
diff --git a/profiles/pentoo/base/package.use/media-libs b/profiles/pentoo/base/package.use/media-libs
index 5d5282755..4c90f0a14 100644
--- a/profiles/pentoo/base/package.use/media-libs
+++ b/profiles/pentoo/base/package.use/media-libs
@@ -13,6 +13,3 @@ media-libs/phonon designer qt5
 media-libs/phonon-vlc qt5
 #required by app-office/libreoffice
 media-libs/harfbuzz icu
-
-#dev-python/numpy
-media-libs/opencv -python_targets_python2_7
diff --git a/profiles/pentoo/base/package.use/net-analyzer b/profiles/pentoo/base/package.use/net-analyzer
index bda0934d6..7e653b8af 100644
--- a/profiles/pentoo/base/package.use/net-analyzer
+++ b/profiles/pentoo/base/package.use/net-analyzer
@@ -10,9 +10,6 @@ net-analyzer/wireshark androiddump ares ciscodump gcrypt geoip gnutls kerberos l
 #https://bugs.gentoo.org/show_bug.cgi?id=334329
 #net-analyzer/tcpdump -chroot
 
-#ipython migration
-net-analyzer/dnsrecon -python_targets_python2_7
-
 #OpenVAS
 net-analyzer/gvm postgres -sqlite
 
diff --git a/profiles/pentoo/base/package.use/sys-apps b/profiles/pentoo/base/package.use/sys-apps
index 271575ef6..1a434bcec 100644
--- a/profiles/pentoo/base/package.use/sys-apps
+++ b/profiles/pentoo/base/package.use/sys-apps
@@ -1,24 +1,10 @@
+sys-apps/fwupd agent amt dell nvme pkcs7 redfish synaptics thunderbolt uefi
 sys-apps/gnome-disk-utility fat
-
-#dev-python/python-magic requires file[-python]
-sys-apps/file -python
-
 sys-apps/hwdata-gentoo binary-drivers
 sys-apps/lm-sensors sensord
 sys-apps/lm_sensors sensord
+sys-apps/systemd -sysv-utils
 sys-apps/usermode-utilities fuse
-#sys-apps/util-linux static-libs
 
-#portage really sucks with python2, significantly more stable to just remove that crap
-sys-apps/portage -python_targets_python2_7
-app-portage/gentoolkit -python_targets_python2_7
-app-portage/porthole -python_targets_python2_7
-app-portage/layman -python_targets_python2_7
-app-portage/gentoopm -python_targets_python2_7
-app-portage/smart-live-rebuild -python_targets_python2_7
-dev-java/java-config -python_targets_python2_7
-app-portage/pfl -python_targets_python2_7
-app-portage/repoman -python_targets_python2_7
-app-portage/overlint -python_targets_python2_7
-
-sys-apps/fwupd agent amt dell nvme pkcs7 redfish synaptics thunderbolt uefi
+#dev-python/python-magic requires file[-python]
+sys-apps/file -python
diff --git a/profiles/pentoo/base/use.mask b/profiles/pentoo/base/use.mask
index b788430c9..f59d42ae9 100644
--- a/profiles/pentoo/base/use.mask
+++ b/profiles/pentoo/base/use.mask
@@ -1,9 +1,6 @@
 #users should never enable this
 livecd-stage1
 
-#no one should ever enable this
-systemd
-
 #we do not want old ruby
 ruby_targets_ruby23
 ruby_targets_ruby24