Merge pull request 'virtual/linux-sources, sys-kernel/fake-sources, sys-kernel/calculate-sources: improvements' (#67) from kuraga/calculate-overlay:virtual/linux-sources-improvements into develop

Reviewed-on: #67
1 month ago · 64ad264769
parent 9fe20b9c1a 57d422bd3c
commit 64ad264769
8 changed files with 37 additions and 15 deletions
--- a/sys-kernel/calculate-sources/calculate-sources-6.1.82.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.1.82.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $

 EAPI=7
 ETYPE="sources"
--- a/sys-kernel/calculate-sources/calculate-sources-6.6.12.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.6.12.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $

 EAPI=7
 ETYPE="sources"
--- a/sys-kernel/calculate-sources/calculate-sources-6.6.22.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.6.22.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $

 EAPI=7
 ETYPE="sources"
--- a/sys-kernel/calculate-sources/calculate-sources-6.7.10.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-6.7.10.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $

 EAPI=7
 ETYPE="sources"
--- a/sys-kernel/calculate-sources/metadata.xml
+++ b/sys-kernel/calculate-sources/metadata.xml
@ -7,10 +7,10 @@
        <description>Calculate Overlay</description>
    </maintainer>
    <longdescription lang="en">
-        Full sources including the Calculate patchset for the kernel.
+        Full Linux kernel sources including the Calculate patchset.
    </longdescription>
    <longdescription lang="ru">
-        Полные исходники ядра с патчами от Calculate.
+        Полные исходники ядра Linux, включая набор патчей Calculate.
    </longdescription>
    <use lang="en">
        <flag name="desktop">Desktop kernel configuration</flag>
--- a/sys-kernel/fake-sources/fake-sources-0.ebuild
+++ b/sys-kernel/fake-sources/fake-sources-0.ebuild
@ -1,14 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/linux-sources/linux-sources-1.ebuild,v 1.4 2014/04/03 01:35:05 tomwij Exp $

 EAPI=7

 DESCRIPTION="Stub package for Linux kernel sources dependense"
-HOMEPAGE=""
-SRC_URI=""

 LICENSE=""
 SLOT="0"
 KEYWORDS="amd64 x86"
-
--- a/virtual/linux-sources/linux-sources-3-r13.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r13.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: This is a version of `virtual/linux-sources-3-r8::gentoo` adopted to Calculate Linux
+
+EAPI=7
+
+DESCRIPTION="Virtual for Linux kernel sources in Calculate Linux"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="firmware"
+
+RDEPEND="
+	firmware? ( sys-kernel/linux-firmware )
+	|| (
+		sys-kernel/calculate-sources
+		sys-kernel/gentoo-sources
+		sys-kernel/vanilla-sources
+		sys-kernel/git-sources
+		sys-kernel/pf-sources
+		sys-kernel/rt-sources
+		sys-kernel/zen-sources
+		sys-kernel/gentoo-kernel
+		sys-kernel/gentoo-kernel-bin
+		sys-kernel/vanilla-kernel
+	)"
--- a/virtual/linux-sources/metadata.xml
+++ b/virtual/linux-sources/metadata.xml
@ -6,4 +6,8 @@
        <name>Mir Calculate</name>
        <description>Calculate Overlay</description>
    </maintainer>
+    <use>
+        <flag name="firmware">Install linux kernel firmware</flag>
+    </use>
+    <stabilize-allarches/>
 </pkgmetadata>