From 88062eeef9cfeecda42dd6301eb4ddb9fab79f54 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sat, 1 Aug 2020 17:54:08 -0400 Subject: [PATCH] pentoo-holyshit: I moved some things around and fixed some deps. Good fucking luck, but now it's a lot easier to make pentoo smaller...probably --- pentoo/pentoo-core/Manifest | 1 + .../files/02locale | 0 .../files/99xz-threaded | 0 .../files/issue.pentoo.logo | 0 .../files/local.conf | 0 .../files/motd-2018.1 | 0 .../files/pentoo-keyring.asc | 0 .../files/pentoo-linux-symlinks.initd | 0 .../files/pentoo-powersave.initd | 0 .../files/pentoo-r2.conf | 0 .../files/pentoo-updater | 0 .../files/pentoo-zram.confd | 0 .../files/pentoo-zram.initd-r3 | 0 .../files/ungit | 0 pentoo/pentoo-core/pentoo-core-2020.2.ebuild | 142 ++++++++++++ ...ld => pentoo-installer-20200728-r1.ebuild} | 5 +- .../pentoo-installer-99999999.ebuild | 1 + ....ebuild => pentoo-livecd-2020.2-r1.ebuild} | 6 +- .../pentoo-system/files/00-linux_link.start | 24 -- .../files/00-speed_shutdown.stop-r2 | 13 -- .../files/99-power_saving.start-r3 | 90 -------- .../pentoo-system/files/dokeybindings-2012.1 | 6 - .../files/sudo_toggle_hardened.desktop | 10 - pentoo/pentoo-system/files/toggle_hardened | 51 ----- .../files/toggle_hardened.desktop | 10 - .../pentoo-system-2020.2-r5.ebuild | 210 ------------------ .../pentoo-system-2020.2-r6.ebuild | 86 +++++++ .../base/package.accept_keywords/pentoo | 1 + profiles/pentoo/base/package.use.mask | 1 + profiles/pentoo/base/package.use/dev-util | 3 - 30 files changed, 237 insertions(+), 423 deletions(-) create mode 100644 pentoo/pentoo-core/Manifest rename pentoo/{pentoo-system => pentoo-core}/files/02locale (100%) rename pentoo/{pentoo-system => pentoo-core}/files/99xz-threaded (100%) rename pentoo/{pentoo-system => pentoo-core}/files/issue.pentoo.logo (100%) rename pentoo/{pentoo-system => pentoo-core}/files/local.conf (100%) rename pentoo/{pentoo-system => pentoo-core}/files/motd-2018.1 (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-keyring.asc (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-linux-symlinks.initd (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-powersave.initd (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-r2.conf (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-updater (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-zram.confd (100%) rename pentoo/{pentoo-system => pentoo-core}/files/pentoo-zram.initd-r3 (100%) rename pentoo/{pentoo-system => pentoo-core}/files/ungit (100%) create mode 100644 pentoo/pentoo-core/pentoo-core-2020.2.ebuild rename pentoo/pentoo-installer/{pentoo-installer-20200728.ebuild => pentoo-installer-20200728-r1.ebuild} (90%) rename pentoo/pentoo-livecd/{pentoo-livecd-2020.2.ebuild => pentoo-livecd-2020.2-r1.ebuild} (92%) delete mode 100755 pentoo/pentoo-system/files/00-linux_link.start delete mode 100755 pentoo/pentoo-system/files/00-speed_shutdown.stop-r2 delete mode 100755 pentoo/pentoo-system/files/99-power_saving.start-r3 delete mode 100755 pentoo/pentoo-system/files/dokeybindings-2012.1 delete mode 100644 pentoo/pentoo-system/files/sudo_toggle_hardened.desktop delete mode 100644 pentoo/pentoo-system/files/toggle_hardened delete mode 100644 pentoo/pentoo-system/files/toggle_hardened.desktop delete mode 100644 pentoo/pentoo-system/pentoo-system-2020.2-r5.ebuild create mode 100644 pentoo/pentoo-system/pentoo-system-2020.2-r6.ebuild diff --git a/pentoo/pentoo-core/Manifest b/pentoo/pentoo-core/Manifest new file mode 100644 index 000000000..cac38c6ce --- /dev/null +++ b/pentoo/pentoo-core/Manifest @@ -0,0 +1 @@ +DIST pentoo-grubtheme.tar.xz 620680 BLAKE2B 7627da925abd52fc778dec1854cd491539e0576c23c738e97f3be9a2c9e2a6fbc2ec4e11d6e480c76366fa6e2ce815c6c0e10118f9f74e93bcf3184b0caa666f SHA512 56e6d9e3a72c456f6c62381b9fd81ca05104383a8c25e09eee7876b87374e251b7cb9fc14a2c5bc74d83978b5b2f93212df2ea9f95338c4c9f9d9638346941d7 diff --git a/pentoo/pentoo-system/files/02locale b/pentoo/pentoo-core/files/02locale similarity index 100% rename from pentoo/pentoo-system/files/02locale rename to pentoo/pentoo-core/files/02locale diff --git a/pentoo/pentoo-system/files/99xz-threaded b/pentoo/pentoo-core/files/99xz-threaded similarity index 100% rename from pentoo/pentoo-system/files/99xz-threaded rename to pentoo/pentoo-core/files/99xz-threaded diff --git a/pentoo/pentoo-system/files/issue.pentoo.logo b/pentoo/pentoo-core/files/issue.pentoo.logo similarity index 100% rename from pentoo/pentoo-system/files/issue.pentoo.logo rename to pentoo/pentoo-core/files/issue.pentoo.logo diff --git a/pentoo/pentoo-system/files/local.conf b/pentoo/pentoo-core/files/local.conf similarity index 100% rename from pentoo/pentoo-system/files/local.conf rename to pentoo/pentoo-core/files/local.conf diff --git a/pentoo/pentoo-system/files/motd-2018.1 b/pentoo/pentoo-core/files/motd-2018.1 similarity index 100% rename from pentoo/pentoo-system/files/motd-2018.1 rename to pentoo/pentoo-core/files/motd-2018.1 diff --git a/pentoo/pentoo-system/files/pentoo-keyring.asc b/pentoo/pentoo-core/files/pentoo-keyring.asc similarity index 100% rename from pentoo/pentoo-system/files/pentoo-keyring.asc rename to pentoo/pentoo-core/files/pentoo-keyring.asc diff --git a/pentoo/pentoo-system/files/pentoo-linux-symlinks.initd b/pentoo/pentoo-core/files/pentoo-linux-symlinks.initd similarity index 100% rename from pentoo/pentoo-system/files/pentoo-linux-symlinks.initd rename to pentoo/pentoo-core/files/pentoo-linux-symlinks.initd diff --git a/pentoo/pentoo-system/files/pentoo-powersave.initd b/pentoo/pentoo-core/files/pentoo-powersave.initd similarity index 100% rename from pentoo/pentoo-system/files/pentoo-powersave.initd rename to pentoo/pentoo-core/files/pentoo-powersave.initd diff --git a/pentoo/pentoo-system/files/pentoo-r2.conf b/pentoo/pentoo-core/files/pentoo-r2.conf similarity index 100% rename from pentoo/pentoo-system/files/pentoo-r2.conf rename to pentoo/pentoo-core/files/pentoo-r2.conf diff --git a/pentoo/pentoo-system/files/pentoo-updater b/pentoo/pentoo-core/files/pentoo-updater similarity index 100% rename from pentoo/pentoo-system/files/pentoo-updater rename to pentoo/pentoo-core/files/pentoo-updater diff --git a/pentoo/pentoo-system/files/pentoo-zram.confd b/pentoo/pentoo-core/files/pentoo-zram.confd similarity index 100% rename from pentoo/pentoo-system/files/pentoo-zram.confd rename to pentoo/pentoo-core/files/pentoo-zram.confd diff --git a/pentoo/pentoo-system/files/pentoo-zram.initd-r3 b/pentoo/pentoo-core/files/pentoo-zram.initd-r3 similarity index 100% rename from pentoo/pentoo-system/files/pentoo-zram.initd-r3 rename to pentoo/pentoo-core/files/pentoo-zram.initd-r3 diff --git a/pentoo/pentoo-system/files/ungit b/pentoo/pentoo-core/files/ungit similarity index 100% rename from pentoo/pentoo-system/files/ungit rename to pentoo/pentoo-core/files/ungit diff --git a/pentoo/pentoo-core/pentoo-core-2020.2.ebuild b/pentoo/pentoo-core/pentoo-core-2020.2.ebuild new file mode 100644 index 000000000..870e850c3 --- /dev/null +++ b/pentoo/pentoo-core/pentoo-core-2020.2.ebuild @@ -0,0 +1,142 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Pentoo minimum core requirements" +HOMEPAGE="http://www.pentoo.ch" +SRC_URI="amd64? ( http://dev.pentoo.ch/~zero/distfiles/pentoo-grubtheme.tar.xz ) + x86? ( http://dev.pentoo.ch/~zero/distfiles/pentoo-grubtheme.tar.xz )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm ~arm64" +IUSE="livecd pentoo-in-a-container pentoo-minimal" + +DEPEND="" +RDEPEND="! pentoo-release + doins pentoo-release + newins "${FILESDIR}"/motd-2018.1 motd + newins "${FILESDIR}"/issue.pentoo.logo issue.pentoo.logo + + #/usr/share/pentoo + insinto /usr/share/pentoo + #to make this file + #gpg --keyserver keyserver.ubuntu.com --recv 4AEE18F83AFDEB23 + #gpg --refresh-keys + # zerochaos- blshkv wuodan linxon ikelos gkroon/Obs1d1an github (merges) + #gpg --armor --export A5DD1427DD11F94A 273E3E90D1A6294F 2FFAE0AE76B5D696 EBE62DD0CCEAE19E D3CF61546B08277D 394C398C531EFAB0 4AEE18F83AFDEB23 > pentoo-keyring.asc + doins "${FILESDIR}/pentoo-keyring.asc" + + #/etc/portage/repos.conf + insinto /etc/portage/repos.conf + newins "${FILESDIR}/pentoo-r2.conf" pentoo.conf + + dobin "${FILESDIR}"/pentoo-updater + + #/etc/portage/postsync.d + exeinto /etc/portage/postsync.d + doexe "${FILESDIR}"/ungit + + if [ ! -e "${EROOT}/etc/env.d/02locale" ] + then + doenvd "${FILESDIR}"/02locale + fi + + use amd64 && doenvd "${FILESDIR}"/99xz-threaded + + insinto /etc/fonts + doins "${FILESDIR}"/local.conf + + if ! use pentoo-in-a-container; then + newinitd "${FILESDIR}"/pentoo-linux-symlinks.initd pentoo-linux-symlinks + newinitd "${FILESDIR}"/pentoo-powersave.initd pentoo-powersave + newinitd "${FILESDIR}"/pentoo-zram.initd-r3 pentoo-zram + newconfd "${FILESDIR}"/pentoo-zram.confd pentoo-zram + fi +} diff --git a/pentoo/pentoo-installer/pentoo-installer-20200728.ebuild b/pentoo/pentoo-installer/pentoo-installer-20200728-r1.ebuild similarity index 90% rename from pentoo/pentoo-installer/pentoo-installer-20200728.ebuild rename to pentoo/pentoo-installer/pentoo-installer-20200728-r1.ebuild index bb29efa73..b1462c0a4 100644 --- a/pentoo/pentoo-installer/pentoo-installer-20200728.ebuild +++ b/pentoo/pentoo-installer/pentoo-installer-20200728-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ "${PV}" == "99999999" ]] ; then KEYWORDS="" else KEYWORDS="~amd64 ~x86" - GIT_COMMIT="a84e389a24aebbc99717fbc1ce602878cf04abc8" + GIT_COMMIT="149104bdf565e3900ed1bea2ccb5e93784408f57" SRC_URI="https://github.com/pentoo/pentoo-installer/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${GIT_COMMIT}" fi @@ -32,6 +32,7 @@ PDEPEND="dev-util/dialog sys-boot/shim sys-boot/mokutil app-crypt/pinentry[gtk,ncurses] + sys-fs/cryptsetup sys-fs/squashfs-tools x11-misc/wmctrl net-misc/rsync diff --git a/pentoo/pentoo-installer/pentoo-installer-99999999.ebuild b/pentoo/pentoo-installer/pentoo-installer-99999999.ebuild index 6185b1425..b1462c0a4 100644 --- a/pentoo/pentoo-installer/pentoo-installer-99999999.ebuild +++ b/pentoo/pentoo-installer/pentoo-installer-99999999.ebuild @@ -32,6 +32,7 @@ PDEPEND="dev-util/dialog sys-boot/shim sys-boot/mokutil app-crypt/pinentry[gtk,ncurses] + sys-fs/cryptsetup sys-fs/squashfs-tools x11-misc/wmctrl net-misc/rsync diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2020.2.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2020.2-r1.ebuild similarity index 92% rename from pentoo/pentoo-livecd/pentoo-livecd-2020.2.ebuild rename to pentoo/pentoo-livecd/pentoo-livecd-2020.2-r1.ebuild index d48632f05..0df7ef2b8 100644 --- a/pentoo/pentoo-livecd/pentoo-livecd-2020.2.ebuild +++ b/pentoo/pentoo-livecd/pentoo-livecd-2020.2-r1.ebuild @@ -15,18 +15,16 @@ IUSE="livecd" S="${WORKDIR}" DEPEND="" -RDEPEND="!&1 > /dev/null) -then - if [ -L /usr/src/linux ] - then - unlink /usr/src/linux - fi - ln -s /usr/src/linux-${KV} /usr/src/linux - - if [ -L /lib/modules/${KV}/build ] - then - unlink /lib/modules/${KV}/build - fi - ln -s /usr/src/linux-${KV} /lib/modules/${KV}/build - - if [ -L /lib/modules/${KV}/source ] - then - unlink /lib/modules/${KV}/source - fi - ln -s /usr/src/linux-${KV} /lib/modules/${KV}/source -fi diff --git a/pentoo/pentoo-system/files/00-speed_shutdown.stop-r2 b/pentoo/pentoo-system/files/00-speed_shutdown.stop-r2 deleted file mode 100755 index e15114868..000000000 --- a/pentoo/pentoo-system/files/00-speed_shutdown.stop-r2 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -for CPU in $(ls /sys/devices/system/cpu/|grep -E "cpu[0-9]+"); do - if [ -e /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor ]; then - echo performance > /sys/devices/system/cpu/${CPU}/cpufreq/scaling_governor - fi -done - -for controller in $(ls /sys/class/scsi_host/|grep -E "host[0-9]+"); do - if [ -e /sys/class/scsi_host/${controller}/link_power_management_policy ]; then - echo max_performance > /sys/class/scsi_host/${controller}/link_power_management_policy - fi -done diff --git a/pentoo/pentoo-system/files/99-power_saving.start-r3 b/pentoo/pentoo-system/files/99-power_saving.start-r3 deleted file mode 100755 index e1258b270..000000000 --- a/pentoo/pentoo-system/files/99-power_saving.start-r3 +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -##This file is mostly fixes stolen directly from the recommendations of powertop. -# For the sake of completeness we will include the fixes we don't want and comment them out with reasoning -# XXX: This should be rewritten into acpid and this file should just be an initial call to acpid default.sh -#--------------------------------------------------------------------------------------------------------- - -##PM runtime (PCI Devices) -##this links to usb and disables usb devices that suck -#for i in `find /sys/devices/pci* -name "control"`; do echo "auto" > $i; done - -##USB Suspend -#currently this kills usb mice, and stops my cell phone from charging -#for i in $(\ls -1 /sys/bus/usb/devices) -#do -# usb_path="/sys/bus/usb/devices/${i}" -# if [ -L ${usb_path}/driver ] -# then -# if [ "$(ls -al ${usb_path}/driver | grep usbhid)" == "" ] -# then -# echo "Enabling power saving for non-input device ${usb_path}" -# ls -al ${usb_path}/driver -# [ -e ${usb_path}/power/autosuspend ] && echo 1 > ${usb_path}/power/autosuspend -# [ -e ${usb_path}/power/level ] && echo auto > ${usb_path}/power/level -# [ -e ${usb_path}/power/control ] && echo auto > ${usb_path}/power/control -# else -# echo "Not enabling power saving for input device ${usb_path}" -# ls -al ${usb_path}/driver -# fi -# fi -#done - -# allowing to not sync the drive for longer on battery means more lost when we run out of battery, not a fan -#echo 1500 > /proc/sys/vm/dirty_writeback_centisecs - -## This TANKS wifi performance way too much -#iwconfig wlan0 power timeout 500ms - -#intel sound -if [ -e /sys/module/snd_hda_intel/parameters/power_save ]; then - echo 1 > /sys/module/snd_hda_intel/parameters/power_save -fi - - -##Making devices take longer to power save means more draw -#USB suspend tweaking based on Linux/Documentation/usb/power-management.txt -#Change the default autosuspend idle value from 2sec to 60sec -#for i in /sys/bus/usb/devices/*/power/autosuspend_delay_ms; do echo 60000 > $i; done -#echo 60 > /sys/module/usbcore/parameters/autosuspend - -#disable NMI watchdog (unless we are running a redundant kernel we don't need this) -if [ -e /proc/sys/kernel/nmi_watchdog ] -then - echo 0 > /proc/sys/kernel/nmi_watchdog -fi - -if [ -e /sys/devices/system/cpu/sched_mc_power_savings ] -then - echo 1 > /sys/devices/system/cpu/sched_mc_power_savings -fi - -##then the battery specific power savings -scsi_path="/sys/class/scsi_host/" -cpu_path="/sys/devices/system/cpu/" - -if [ "$(cat /sys/class/power_supply/AC*/online)" == "0" ]; then - #battery - for CPU in $(\ls ${cpu_path}|grep -E "cpu[0-9]+"); do - if [ -e ${cpu_path}/${CPU}/cpufreq/scaling_governor ]; then - echo conservative > ${cpu_path}/${CPU}/cpufreq/scaling_governor - fi - done - for controller in $(\ls ${scsi_path}|grep -E "host[0-9]+"); do - if [ -e ${scsi_path}${controller}/link_power_management_policy ]; then - echo min_power > ${scsi_path}${controller}/link_power_management_policy - fi - done -else - #AC - for CPU in $(\ls ${scsi_path}|grep -E "cpu[0-9]+"); do - if [ -e ${scsi_path}${CPU}/cpufreq/scaling_governor ]; then - echo ondemand > ${scsi_path}${CPU}/cpufreq/scaling_governor - fi - done - for controller in $(\ls ${scsi_path}|grep -E "host[0-9]+"); do - if [ -e ${scsi_path}${controller}/link_power_management_policy ]; then - echo max_performance > ${scsi_path}${controller}/link_power_management_policy - fi - done -fi diff --git a/pentoo/pentoo-system/files/dokeybindings-2012.1 b/pentoo/pentoo-system/files/dokeybindings-2012.1 deleted file mode 100755 index 60093c009..000000000 --- a/pentoo/pentoo-system/files/dokeybindings-2012.1 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -enlightenment_remote -binding-key-add ANY t ALT 0 exec urxvt -enlightenment_remote -binding-key-add ANY j ALT 0 exec urxvt -enlightenment_remote -binding-key-add ANY l ALT 0 exec "enlightenment_remote -lock-desktop" -rm ~/.e/e/applications/startup/.order - diff --git a/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop b/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop deleted file mode 100644 index 928c15e52..000000000 --- a/pentoo/pentoo-system/files/sudo_toggle_hardened.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=toggle_hardened -Comment={En,Dis}able PaX softmode -Exec=sudo /usr/sbin/toggle_hardened -Icon=changes-allow -Path=/tmp -Terminal=false -StartupNotify=false diff --git a/pentoo/pentoo-system/files/toggle_hardened b/pentoo/pentoo-system/files/toggle_hardened deleted file mode 100644 index c42d8b050..000000000 --- a/pentoo/pentoo-system/files/toggle_hardened +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -if [ -x "$(command -v Xdialog 2>&1)" ]; then - if [ -z "${DISPLAY}" ]; then - dialog=dialog - else - dialog=Xdialog - fi -else - dialog=dialog -fi - -if [ x"$(command -v id 2> /dev/null)" != "x" ] -then - USERID="$(id -u 2> /dev/null)" -fi - -if [ x${USERID} = "x" -a x${UID} != "x" ] -then - USERID=${UID} -fi - -if [ x${USERID} != "x" -a x${USERID} != "x0" ] -then - ${dialog} --aspect 15 --msgbox "Only root can modify PaX, please try 'sudo toggle_hardened' on the command line." 0 0 && exit 1 -fi - - -if [ "$(cat /proc/sys/kernel/pax/softmode)" = "1" ]; then - ${dialog} --aspect 15 --yesno "PaX softmode is currently on, would you like to re-enable hardening?" 0 0 \ - && ANSWER="yes" - if [ "${ANSWER}" = "yes" ]; then - echo 0 > /proc/sys/kernel/pax/softmode - ${dialog} --aspect 15 --msgbox "PaX hardening has been re-enabled." 0 0 - else - ${dialog} --aspect 15 --msgbox "PaX hardening remains disabled." 0 0 - fi -elif [ "$(cat /proc/sys/kernel/pax/softmode)" = "0" ]; then - ${dialog} --aspect 15 --defaultno --yesno "PaX hardening is currently on, would you like disable it and enable softmode?" 0 0 \ - && ANSWER=yes - if [ "${ANSWER}" = "yes" ]; then - echo 1 > /proc/sys/kernel/pax/softmode - ${dialog} --aspect 15 --msgbox "PaX hardening has been disabled." 0 0 - else - ${dialog} --aspect 15 --msgbox "PaX hardening remains enabled." 0 0 - - fi -else - ${dialog} --aspect 15 --msgbox "Failed to detect current PaX softmode state. Either PaX softmode is not allowed, or this isn't a hardened kernel." 0 0 -fi - diff --git a/pentoo/pentoo-system/files/toggle_hardened.desktop b/pentoo/pentoo-system/files/toggle_hardened.desktop deleted file mode 100644 index beb1e027f..000000000 --- a/pentoo/pentoo-system/files/toggle_hardened.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=toggle_hardened -Comment={En,Dis}able PaX softmode -Exec=/usr/sbin/toggle_hardened -Icon=changes-allow -Path=/tmp -Terminal=false -StartupNotify=false diff --git a/pentoo/pentoo-system/pentoo-system-2020.2-r5.ebuild b/pentoo/pentoo-system/pentoo-system-2020.2-r5.ebuild deleted file mode 100644 index cff73b0bd..000000000 --- a/pentoo/pentoo-system/pentoo-system-2020.2-r5.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KEYWORDS="~amd64 ~arm ~x86" -DESCRIPTION="Pentoo meta ebuild to install system" -HOMEPAGE="http://www.pentoo.ch" -SLOT="0" -LICENSE="GPL-3" -SRC_URI="http://dev.pentoo.ch/~zero/distfiles/pentoo-grubtheme.tar.xz" - -IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_virtualbox video_cards_vmware" -IUSE="+2fa livecd livecd-stage1 minimal pax_kernel pentoo-extra pentoo-full qemu windows-compat +X ${IUSE_VIDEO_CARDS}" - -S="${WORKDIR}" - -#remove things which conflict with how we are doing things -RDEPEND="!app-portage/porthole" - -# Things needed for a running system and not for livecd -PDEPEND="livecd? ( pentoo/pentoo-livecd )" - -# Basic systems -PDEPEND="${PDEPEND} - qemu? ( app-emulation/virt-manager - !livecd-stage1? ( sys-apps/usermode-utilities ) ) - video_cards_vmware? ( !livecd-stage1? ( app-emulation/open-vm-tools ) ) - " - -PDEPEND="${PDEPEND} - !livecd-stage1? ( - !minmal? ( sys-apps/fwupd ) - video_cards_virtualbox? ( !pax_kernel? ( app-emulation/virtualbox-guest-additions ) ) - video_cards_nvidia? ( x11-misc/bumblebee x11-misc/primus ) ) - app-admin/sudo - app-crypt/openpgp-keys-gentoo-release - app-shells/bash-completion - app-portage/portage-utils - || ( app-admin/syslog-ng virtual/logger ) - || ( sys-process/fcron virtual/cron ) - !arm? ( !livecd-stage1? ( || ( sys-kernel/genkernel sys-kernel/genkernel-next ) - || ( sys-boot/grub:2 sys-boot/systemd-boot ) - ) - sys-boot/os-prober - !minimal? ( sys-boot/syslinux ) - sys-boot/efibootmgr ) - 2fa? ( X? ( app-crypt/yubikey-manager-qt - sys-auth/yubikey-personalization-gui - ) - app-crypt/yubikey-manager - app-crypt/ccid - sys-auth/pam_yubico ) - !arm? ( app-portage/cpuid2cpuflags ) - app-portage/gentoolkit - app-portage/eix - windows-compat? ( app-emulation/wine-vanilla ) - pax_kernel? ( sys-apps/elfix ) - sys-auth/nss-mdns - amd64? ( sys-apps/bolt ) - sys-apps/pciutils - sys-apps/usbutils - sys-apps/mlocate - !minimal? ( sys-apps/usb_modeswitch ) - !arm? ( sys-firmware/intel-microcode ) - sys-kernel/linux-firmware - !arm? ( sys-power/acpid[pentoo] ) - sys-power/thermald - !minmal? ( sys-process/htop ) - sys-apps/openrc - app-crypt/gnupg - sys-fs/cryptsetup - sys-process/lsof - !arm? ( sys-kernel/pentoo-sources ) - !minimal? ( app-portage/mirrorselect ) - app-editors/nano - app-editors/vim - !minimal? ( app-misc/screen ) - app-portage/smart-live-rebuild - !minimal? ( media-fonts/fira-code - media-fonts/fira-sans - media-sound/alsa-utils - net-dialup/ppp - net-firewall/iptables - net-firewall/nftables - net-misc/dhcp - net-misc/mosh - net-misc/vconfig - net-wireless/wireless-tools - ) - net-misc/dhcpcd - net-wireless/bluez - net-wireless/wpa_supplicant - net-wireless/iw - sys-apps/ethtool - sys-apps/iproute2 - sys-apps/sysvinit - pentoo-full? ( - app-arch/unrar - app-arch/unzip - app-arch/sharutils - app-misc/tmux - dev-python/ipython - dev-python/virtualenv - net-fs/curlftpfs - net-fs/sshfs - sys-libs/gpm - sys-power/hibernate-script - sys-process/iotop - sys-apps/hdparm - dev-vcs/subversion - media-fonts/dejavu - media-fonts/font-misc-misc - media-fonts/wqy-zenhei - media-fonts/wqy-microhei - sys-apps/rng-tools - sys-apps/fbset - net-dialup/lrzsz - || ( net-fs/cifs-utils net-fs/samba ) - amd64? ( sys-apps/fwts ) - x86? ( sys-devel/crossdev ) - sys-fs/squashfs-tools - sys-fs/exfat-utils - sys-fs/f2fs-tools - sys-fs/fuse-exfat - sys-fs/btrfs-progs - ) - pentoo-extra? ( - sys-apps/pcmciautils - sys-fs/jfsutils - sys-fs/reiser4progs - sys-fs/reiserfsprogs - sys-process/atop - x11-libs/libdlo - ) -" - -PDEPEND="${PDEPEND} - X? ( sys-apps/gptfdisk - pax_kernel? ( x11-misc/xdialog ) - )" - -src_install() { - insinto /usr/share/grub/themes/ - doins -r pentoo - - if use pax_kernel; then - dosbin "${FILESDIR}"/toggle_hardened - exeinto /root/Desktop/ - doexe "${FILESDIR}"/toggle_hardened.desktop - exeinto /etc/skel/Desktop/ - newexe "${FILESDIR}"/sudo_toggle_hardened.desktop toggle_hardened.desktop - fi - - #/etc - insinto /etc - echo "Pentoo Release ${PV}" > pentoo-release - doins pentoo-release - newins "${FILESDIR}"/motd-2018.1 motd - newins "${FILESDIR}"/issue.pentoo.logo issue.pentoo.logo - - #/usr/share/pentoo - insinto /usr/share/pentoo - #to make this file - #gpg --keyserver keyserver.ubuntu.com --recv 4AEE18F83AFDEB23 - #gpg --refresh-keys - # zerochaos- blshkv wuodan linxon ikelos gkroon/Obs1d1an github (merges) - #gpg --armor --export A5DD1427DD11F94A 273E3E90D1A6294F 2FFAE0AE76B5D696 EBE62DD0CCEAE19E D3CF61546B08277D 394C398C531EFAB0 4AEE18F83AFDEB23 > pentoo-keyring.asc - doins "${FILESDIR}/pentoo-keyring.asc" - - #/etc/portage/repos.conf - insinto /etc/portage/repos.conf - newins "${FILESDIR}/pentoo-r2.conf" pentoo.conf - - dobin "${FILESDIR}"/pentoo-updater - - #/etc/portage/postsync.d - exeinto /etc/portage/postsync.d - doexe "${FILESDIR}"/ungit - - if [ ! -e "${EROOT}/etc/env.d/02locale" ] - then - doenvd "${FILESDIR}"/02locale - fi - - use amd64 && doenvd "${FILESDIR}"/99xz-threaded - - insinto /etc/fonts - doins "${FILESDIR}"/local.conf - - newinitd "${FILESDIR}"/pentoo-linux-symlinks.initd pentoo-linux-symlinks - newinitd "${FILESDIR}"/pentoo-powersave.initd pentoo-powersave - newinitd "${FILESDIR}"/pentoo-zram.initd-r3 pentoo-zram - newconfd "${FILESDIR}"/pentoo-zram.confd pentoo-zram - -} - -pkg_postinst() { - if [[ "${REPLACING_VERSIONS}" < "2018.0-r8" ]]; then - #finally removing the local.d crap and making real pentoo services - einfo 'You likely want to run "rc-update add pentoo-linux-symlinks default" to migrate to the new symlink fixer.' - einfo 'Check out the new /etc/init.d/pentoo-* services and enable the ones you want.' - fi - if [ -x /usr/bin/layman ]; then - if /usr/bin/layman -l | grep pentoo; then - echo "We no longer use layman to control pentoo, please run the following:" - echo "/usr/bin/layman --delete pentoo && emerge --sync" - fi - fi -} diff --git a/pentoo/pentoo-system/pentoo-system-2020.2-r6.ebuild b/pentoo/pentoo-system/pentoo-system-2020.2-r6.ebuild new file mode 100644 index 000000000..07e7a5d8e --- /dev/null +++ b/pentoo/pentoo-system/pentoo-system-2020.2-r6.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KEYWORDS="~amd64 ~arm ~x86" +DESCRIPTION="Pentoo meta ebuild to install system" +HOMEPAGE="http://www.pentoo.ch" +SLOT="0" +LICENSE="GPL-3" + +IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_virtualbox video_cards_vmware" +IUSE="+2fa livecd-stage1 pentoo-minimal pentoo pentoo-extra pentoo-full qemu windows-compat +X ${IUSE_VIDEO_CARDS}" + +S="${WORKDIR}" + +DEPEND="" +RDEPEND="" +BDEPEND="" + +#the core packages/requirements to make pentoo work +PDEPEND="pentoo? ( pentoo/pentoo-core )" + +# Basic systems +PDEPEND="${PDEPEND} + qemu? ( app-emulation/virt-manager + !livecd-stage1? ( sys-apps/usermode-utilities ) ) + video_cards_vmware? ( !livecd-stage1? ( app-emulation/open-vm-tools ) ) + " + +PDEPEND="${PDEPEND} + !livecd-stage1? ( + !pentoo-minimal? ( sys-apps/fwupd ) + video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions ) + video_cards_nvidia? ( x11-misc/bumblebee x11-misc/primus ) ) + 2fa? ( X? ( app-crypt/yubikey-manager-qt + sys-auth/yubikey-personalization-gui + ) + app-crypt/yubikey-manager + app-crypt/ccid + sys-auth/pam_yubico ) + !arm? ( app-portage/cpuid2cpuflags ) + windows-compat? ( app-emulation/wine-vanilla )" + +#Pentoo Full +PDEPEND="${PDEPEND} + pentoo-full? ( + app-arch/unrar + app-arch/unzip + app-arch/sharutils + app-misc/tmux + dev-python/ipython + dev-python/virtualenv + net-fs/curlftpfs + net-fs/sshfs + sys-libs/gpm + sys-power/hibernate-script + sys-process/iotop + sys-apps/hdparm + dev-vcs/subversion + media-fonts/dejavu + media-fonts/font-misc-misc + media-fonts/wqy-zenhei + media-fonts/wqy-microhei + sys-apps/rng-tools + sys-apps/fbset + net-dialup/lrzsz + || ( net-fs/cifs-utils net-fs/samba ) + amd64? ( sys-apps/fwts ) + x86? ( sys-devel/crossdev ) + sys-fs/exfat-utils + sys-fs/f2fs-tools + sys-fs/fuse-exfat + sys-fs/btrfs-progs + )" + +#Pentoo Extra +PDEPEND="${PDEPEND} + pentoo-extra? ( + sys-apps/pcmciautils + sys-fs/jfsutils + sys-fs/reiser4progs + sys-fs/reiserfsprogs + sys-process/atop + x11-libs/libdlo + )" diff --git a/profiles/pentoo/base/package.accept_keywords/pentoo b/profiles/pentoo/base/package.accept_keywords/pentoo index 10b283768..1fb8bb4fa 100644 --- a/profiles/pentoo/base/package.accept_keywords/pentoo +++ b/profiles/pentoo/base/package.accept_keywords/pentoo @@ -1,6 +1,7 @@ pentoo/pentoo-analyzer pentoo/pentoo-bluetooth pentoo/pentoo-cracking +pentoo/pentoo-core pentoo/pentoo-database pentoo/pentoo-exploit pentoo/pentoo-forensics diff --git a/profiles/pentoo/base/package.use.mask b/profiles/pentoo/base/package.use.mask index 6ebcfebf9..30b0e241f 100644 --- a/profiles/pentoo/base/package.use.mask +++ b/profiles/pentoo/base/package.use.mask @@ -50,3 +50,4 @@ dev-java/openjdk:11 -gentoo-vm #python2 is mostly dead, and this is clinging to it and breaking smooth update dev-libs/libxslt python +