From f78bde1ed0d19b580accdeecde6b1bc7959d37c1 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Thu, 3 Feb 2022 09:43:49 +0800 Subject: [PATCH] kernel: get rid of pentoo-lts-sources to simplify everything --- ...021.3-r1.ebuild => pentoo-core-2022.0.ebuild} | 2 +- .../pentoo-lts-sources-1.ebuild | 16 ---------------- ...3-r106.ebuild => linux-sources-3-r107.ebuild} | 7 +++---- 3 files changed, 4 insertions(+), 21 deletions(-) rename pentoo/pentoo-core/{pentoo-core-2021.3-r1.ebuild => pentoo-core-2022.0.ebuild} (98%) delete mode 100644 sys-kernel/pentoo-lts-sources/pentoo-lts-sources-1.ebuild rename virtual/linux-sources/{linux-sources-3-r106.ebuild => linux-sources-3-r107.ebuild} (84%) diff --git a/pentoo/pentoo-core/pentoo-core-2021.3-r1.ebuild b/pentoo/pentoo-core/pentoo-core-2022.0.ebuild similarity index 98% rename from pentoo/pentoo-core/pentoo-core-2021.3-r1.ebuild rename to pentoo/pentoo-core/pentoo-core-2022.0.ebuild index a6cfb3451..7a1723413 100644 --- a/pentoo/pentoo-core/pentoo-core-2021.3-r1.ebuild +++ b/pentoo/pentoo-core/pentoo-core-2022.0.ebuild @@ -86,7 +86,7 @@ PDEPEND="${PDEPEND} !arm? ( !pentoo-in-a-container? ( sys-firmware/intel-microcode - || ( sys-kernel/pentoo-sources sys-kernel/pentoo-lts-sources ) + virtual/linux-sources sys-power/acpid[pentoo] sys-kernel/genkernel || ( sys-boot/grub[themes] sys-boot/systemd-boot ) diff --git a/sys-kernel/pentoo-lts-sources/pentoo-lts-sources-1.ebuild b/sys-kernel/pentoo-lts-sources/pentoo-lts-sources-1.ebuild deleted file mode 100644 index 6f641c2f4..000000000 --- a/sys-kernel/pentoo-lts-sources/pentoo-lts-sources-1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" -HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="sys-kernel/pentoo-sources[lts(-)] - !sys-kernel/pentoo-sources[-lts(-)]" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/virtual/linux-sources/linux-sources-3-r106.ebuild b/virtual/linux-sources/linux-sources-3-r107.ebuild similarity index 84% rename from virtual/linux-sources/linux-sources-3-r106.ebuild rename to virtual/linux-sources/linux-sources-3-r107.ebuild index 4a5e2c4bc..9902310c2 100644 --- a/virtual/linux-sources/linux-sources-3-r106.ebuild +++ b/virtual/linux-sources/linux-sources-3-r107.ebuild @@ -6,14 +6,13 @@ EAPI=7 DESCRIPTION="Virtual for Linux kernel sources" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="firmware" +IUSE="firmware lts" RDEPEND=" firmware? ( sys-kernel/linux-firmware ) || ( - sys-kernel/pentoo-lts-sources - sys-kernel/pentoo-sources - sys-kernel/gentoo-sources + !lts? ( sys-kernel/pentoo-sources[-lts(-)] ) + lts? ( sys-kernel/pentoo-sources ) sys-kernel/vanilla-sources sys-kernel/git-sources sys-kernel/mips-sources