Merge remote-tracking branch 'upstream/master'

4 files changed, 36 insertions, 7 deletions

diff --git a/sys-kernel/linux-live-brrc/Manifest b/sys-kernel/linux-live-brrc/Manifest
deleted file mode 100644
index adea3d1a..00000000
--- a/sys-kernel/linux-live-brrc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
index 4ebdafa0..964b0849 100644
--- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
@@ -6,16 +6,16 @@ EAPI=5
 
 inherit versionator
 
-K_ROGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_ARGKERNEL_SELF_TARBALL_NAME="live-brrc"
 K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
-K_ROGKERNEL_FORCE_SUBLEVEL="0"
-K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+K_ARGKERNEL_FORCE_SUBLEVEL="0"
+K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="0"
 
 _ver="$(get_version_component_range 1-2)"
 if use arm; then
 	K_KERNEL_IMAGE_NAME="uImage dtbs"
 elif [ "${_ver}" = "3.9" ]; then
-	K_ROGKERNEL_ZFS="1"
+	K_ARGKERNEL_ZFS="1"
 fi
 K_KERNEL_NEW_VERSIONING="1"
 
@@ -23,7 +23,7 @@ K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
 K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
 K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
 
-inherit argent-kernel
+inherit live-kernel
 
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild
new file mode 100644
index 00000000..964b0849
--- /dev/null
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2004-2013 Sabayon Linux
+# Copyright 2015 Kogaion
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator
+
+K_ARGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
+K_ARGKERNEL_FORCE_SUBLEVEL="0"
+K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+
+_ver="$(get_version_component_range 1-2)"
+if use arm; then
+	K_KERNEL_IMAGE_NAME="uImage dtbs"
+elif [ "${_ver}" = "3.9" ]; then
+	K_ARGKERNEL_ZFS="1"
+fi
+K_KERNEL_NEW_VERSIONING="1"
+
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
+
+inherit live-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc.skel b/sys-kernel/linux-live-brrc/linux-live-brrc.skel
index aeae1309..210de18f 100644
--- a/sys-kernel/linux-live-brrc/linux-live-brrc.skel
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc.skel
@@ -23,7 +23,7 @@ K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
 K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
 K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
 
-inherit kogaion-kernel
+inherit live-kernel
 
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Official Kogaion Linux Standard kernel image"