summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sys-kernel')
-rw-r--r--metadata/md5-cache/sys-kernel/kpatch-0.6.32
-rw-r--r--metadata/md5-cache/sys-kernel/kpatch-0.7.12
-rw-r--r--metadata/md5-cache/sys-kernel/kpatch-99992
-rw-r--r--metadata/md5-cache/sys-kernel/spl-0.7.134
4 files changed, 7 insertions, 3 deletions
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
index fee56e8e8834..456192800253 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=a53b66a6c4e36e00a9d46cc9270c576b
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1 b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
index 538e38c35e1b..b224dd36c645 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=48fbc234993deb5bfa658ef5e3454e2e
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index 973ef0bb10eb..a615ef8e8479 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
PROPERTIES=live
RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
SLOT=0
-_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
_md5_=43ff3a50e41fe766007aea0aeaf8b95b
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.13 b/metadata/md5-cache/sys-kernel/spl-0.7.13
index fb6f0da4c587..d28e0d11bda0 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.13
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.13
@@ -11,5 +11,9 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
RESTRICT=debug? ( strip ) test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/spl-0.7.13.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+>>>>>>> next
_md5_=efee4a5a953d8c7ae7f5ff6a7f771a23