scylla: remove patches, all got merged

13 files changed, 0 insertions, 459 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index ae268c5..f34f35d 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,15 +1,3 @@
-AUX 0001-Add-support-for-Gentoo-Linux-irqbalance-configuratio.patch 1258 SHA256 31cd49e867f97080ef8f1d064102659a561d2e837f30b84127978528806a4038 SHA512 9a23a65104ad9bd7ca64c3824d90b911b00bc1b36b1b419b8f4c887d6ac359b4300abe22225648277f2b72014c4028ac5ba5d0358776ea2a82313f477cb75e7e WHIRLPOOL 212e0caa7e8436d499446eefea42762dfc152279762dec7685183bc3e041669f1c32c46960e8ef775ca77550345dd4ee541bac68d00db2ea9c7afbf60a6e3cf6
-AUX 0001-add-gentoo_variant-detection-and-SYSCONFIG-setup.patch 988 SHA256 ff999370b6cc57679a46aa4d2e91d7c5a100afb8d79d5cbabd63b5dcaf445763 SHA512 ab404be3b1c62a2c833015e37b88ed87df974d0fb14c7d1552deb2d13b80e15690d6ea9ba54284318668f2633fcddfa0003f7ac5b3bf6d540b5c183f895f1389 WHIRLPOOL fa7545596fd3b73f790c4ff0e34bc60b5a4190a688f2cee5f2a30d857208df226c3ab98d3ff1b8aeb863ed0d7f211d20115a1659a23c61419561e1ec69c93abe
-AUX 0001-fix-perftune.py-IndexError-when-NIC-uses-less-IRQs-t.patch 1299 SHA256 d6f20028067a5a343f679abc1969180e1b5e1b90fb7663a5aff60a8e92673388 SHA512 5c7cbe85e4124652268f3a7cc1713f498dc96dd957a2a35c4cef51b6c987c33346bd2ae5eb5347c1a0b32379be418714a6db3eccb4336ba0c0b2820db25dc5ce WHIRLPOOL d10415654ae28c82e1c33d32dffa7cc2ddc4c990766dd520c4e686e0ffdeb090179565b24da0fc97de6da5864f1f4b76beabee57c418c58e08062f04789e4661
-AUX 0001-fix-scylla-housekeeping-version-detection-to-work-wi.patch 1697 SHA256 0fea11d0cda16bf80f26dc21addcba7d3fef0c2e1c70815ef03e698c0effa095 SHA512 f865379be465813a59fa2304e174e60fe7075ff2c59c9bccf8ed292b19d310745fb104caa67113d45d18b9fd664b30118fa688eb21d019547343ae635fd014ce WHIRLPOOL a464706c745482e6dd7bb1d4f9040ce09d6c9a88ddb56b1374f785bb37ec7d5da054a7fb46a491ddc8e483395caed16c6a75375c86798f316a49cc66fe84239a
-AUX 0002-detect-gentoo-linux-on-selinux-setup.patch 987 SHA256 8bda3bce0bc374d6cda13f0a60c2566879bb5c0a6004f0c56cb5aaedd0ff0a24 SHA512 f9603b6c754d58b96c6c9e341c56d8c6f24c394af2b48992a7eecf3432189a22fede3caee04d608a5bf5141f3bc5aae25975bc51f09510ce607a80317028cf5e WHIRLPOOL 8de85644e2c44a269a76fde63f2eba14f1ce8fb57490ff16d6a3ddcbf67f0838325b73fbfd5f96d27a328248d45dac482b62427c20d991570ea6af40e3574663
-AUX 0003-coredump-setup-add-support-for-gentoo-linux.patch 948 SHA256 c3fdf30bbf90846289ccf832b4ce5e4073c8b18b4596e18f0677db5cb57d7c87 SHA512 4739e858ca5732534a907db1d2f194b2994f12198585a7fa738023ef29b3873364801364f2f2387fc3e7d6f2377c7267c728cf5ba095371076e72a071b2a9ffb WHIRLPOOL 60f0a6897aad14a5cd6ce18f256b51b0b3f51c0765ccf0798dac5271720472ee5c02628a7800712293039023291adcb571b56fdab0e48c315ae803af3cc5a9bb
-AUX 0004-cpuscaling-setup-add-support-for-gentoo-linux.patch 1264 SHA256 6bfd3ad563c35fe416e6e8a15b3ad656c78d416e5606a37b1cdb3fceb827a7eb SHA512 19be2e27fdab75f4858bd4adfee8e653ec757296c3ae9de75ce40bbcff974f684196b2a3b2ca18a800bacbf244c37a2d6884c654c4ec67db6b08e62083654ca2 WHIRLPOOL b92605b11e357e4d58fb30d5c4738c2bb612ed296879c776434418b82c302e149096cd2cc0be9101468017dda5b2a8675c0ea03a65721da242915597fd6f09d4
-AUX 0005-kernel-check-add-support-for-gentoo-linux.patch 822 SHA256 4ad2d4d22a658bed0fb0e60c06f462ef1dad2f7467855507086cb6fa230dbe5c SHA512 0cafc82b691fb4e5ae1478c825c1068c8dc5c72d8a25aac49f9fa280745693ba398c072db7d3088bf2486e97455c4258e7fe1a294784e65b22b1e5f48c5caf8a WHIRLPOOL ed4345590151b0ef3f655d54bd1bf6467cdec65eafefe9c647118d88d1b70635b308864ecf82179942e77ad79e8740efbb4198e3ab1cc9a7bd8d2d6e3f942aad
-AUX 0006-ntp-setup-add-support-for-gentoo-linux.patch 1153 SHA256 846ae465bed8a39090906a969d455bd63997cfb56ec2d9cfa067f7b847bc1915 SHA512 32a767df2c5a4999857b1ff9dfceef989fcd291e41f732343575950a6f6ec57805dacd3153f7297bed1457328f731c854c8cb509e846b569413aad7f3015268b WHIRLPOOL b8fa63a0a98c94966dc8407656154b58fd625052a42ecfa1f9c928dac2512f75f99abb9ecb3c4a07067379945e841b073b140e96ad236e97fa98805d103a298d
-AUX 0007-raid-setup-add-support-for-gentoo-linux.patch 815 SHA256 6abf2ac099b7f4ef3d03bb8eca0fb29fa321105c0977e9c85219824979a3763f SHA512 fbda65b05bb3d7efab71ce6d6c788b04c66454d3969ebc389c23fa489626ed92d2e5d884b6533c41c7b0fe41d83d3e746faee9b0e6f0898dc21f2b06bd1156ba WHIRLPOOL 07692776523d3d08c2ba195e7bb0e8daad5e32719d526f565aba4000fdf2fecbfce39d0ec969192a8533c1131d7c2b6879acb5243a8ff6ae206d4f9516a39f1a
-AUX 0008-prometheus-node_exporter-install-add-support-for-gen.patch 2841 SHA256 08e76589f844316af82501ea1d195a78c3d5a7be66a27a142a7663e19e352c5b SHA512 3ec5d9777a93bb03d2beaa3a379a76cf4528aac64e0d2d6cdc7df64bb481932c87adbb9169078dec925a54eb487a0350081a6cfe351e2623cb5aecfa07dacd29 WHIRLPOOL 8b81085c3a52b61981bfb39fdd17b41c6f82c0fdc2a5da5881a5a766e5e206a28c25613650d28c22f364e746d72da69df79db0531e3fc0119b8790b1e7138456
-AUX 0009-scylla_setup-add-gentoo-linux-installation-detection.patch 1984 SHA256 5a822448a6e80f03a34a040c94c48b7255ee0063e6404cc0b4fa020b009cbf99 SHA512 f0b7885a94643d22784baafc0f5b49e2e2f8d231a92ff32bc1078044efebc955659132384fcb1ce948392ae1cd4fc8be941de1b418567e84847940a0971115af WHIRLPOOL 6c86e8513fb140949a85a2b81a0dad644315363ee9c6afb757aea1b97cf26798671659d65a6a3a0a0e01f53f77f511754421590bbaec309609b29800ffb93835
 AUX scylla-server.confd 386 SHA256 b0da01117d51478b8cf0e0bc77829c7dab0bd8aeadef100f25ebf098d050b3d0 SHA512 5d3c55933a02d3b16837013b37110f6669c14e01599532f30935b5dc29871a5bed897c9eb01a6e89469eab7d645c9231745a06c2ef827f6700e13c8faa9cdb87 WHIRLPOOL 7c0a17760ae83b34384f17abf81e1cd8e9da54c764102320fe237f74fcf94de9396ca1fd8e6576c72c54d7c504cf6daa54847db548cd7900069bdd972efe5676
 AUX scylla-server.initd 946 SHA256 fbb41258680caf6648201b5980cb0a841337525368006d003e0aa4fd152f2270 SHA512 d8e211162f8b193fc722991226d8b5febace5a765734ed04076b706562256d7d51e335cdaa6551ee0420ddb5d03a67202fe888d9f58c5a6dc539a726ad501ad9 WHIRLPOOL 0a80ea18150a6b45b770c9c1f73d44d71852ac0e1c1f0faee7dbf60196f5bac0167a980fa58f9d105fac177f8a7ce1f97beb1841080e21b3f1c99649c281bbaf
 EBUILD scylla-9999.ebuild 4762 SHA256 4b231722a7d5686f94b6d72b5a20bea6c2aea71b1d45ed2801112e3b7f169546 SHA512 f794f8b13dbd4ddcfda4b0efc5d7da21584e7d2229874e5ce19c88735b778d67d0bde4ff93a9d114e405aee8d070a7dd07cdfd1c318ca675af0fa0e514795e29 WHIRLPOOL 76a12ceccf4778ac82b0919790ebcad9e7dd57f45b6b1ea47a395b435f2126b42a2025ea7750940ad2fe95bf9670e8c70e2074b6f14f35762809ff16140548c4
diff --git a/dev-db/scylla/files/0001-Add-support-for-Gentoo-Linux-irqbalance-configuratio.patch b/dev-db/scylla/files/0001-Add-support-for-Gentoo-Linux-irqbalance-configuratio.patch
deleted file mode 100644
index febb751..0000000
--- a/dev-db/scylla/files/0001-Add-support-for-Gentoo-Linux-irqbalance-configuratio.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fd4e430b7ae2b52c44f6764905ede872bfc9ac1f Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Thu, 4 May 2017 17:31:21 +0200
-Subject: [PATCH] Add support for Gentoo Linux irqbalance configuration
- detection.
-
-This allows perftune.py to work well when using the irqbalance
-daemon on Gentoo Linux.
-
-Signed-off-by: Ultrabug <ultrabug@gentoo.org>
----
- seastar/scripts/perftune.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/seastar/scripts/perftune.py b/seastar/scripts/perftune.py
-index 6748086..1b88d8c 100755
---- a/seastar/scripts/perftune.py
-+++ b/seastar/scripts/perftune.py
-@@ -86,6 +86,11 @@ def restart_irqbalance(banned_irqs):
-             config_file = '/etc/sysconfig/irqbalance'
-             options_key = 'IRQBALANCE_ARGS'
-             systemd = True
-+        elif os.path.exists('/etc/conf.d/irqbalance'):
-+            config_file = '/etc/conf.d/irqbalance'
-+            options_key = 'IRQBALANCE_OPTS'
-+            with open('/proc/1/comm', 'r') as comm:
-+                systemd = 'systemd' in comm.read()
-         else:
-             print("Unknown system configuration - not restarting irqbalance!")
-             print("You have to prevent it from moving IRQs {} manually!".format(banned_irqs_list))
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0001-add-gentoo_variant-detection-and-SYSCONFIG-setup.patch b/dev-db/scylla/files/0001-add-gentoo_variant-detection-and-SYSCONFIG-setup.patch
deleted file mode 100644
index bbb92e1..0000000
--- a/dev-db/scylla/files/0001-add-gentoo_variant-detection-and-SYSCONFIG-setup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2ca0380d068efa0b7be167969ff871f01a354da5 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:03:53 +0200
-Subject: [PATCH 1/9] add gentoo_variant detection and SYSCONFIG setup
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_lib.sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dist/common/scripts/scylla_lib.sh b/dist/common/scripts/scylla_lib.sh
-index 8dc47bdd..fa71daaf 100644
---- a/dist/common/scripts/scylla_lib.sh
-+++ b/dist/common/scripts/scylla_lib.sh
-@@ -9,6 +9,10 @@ is_redhat_variant() {
-     [ -f /etc/redhat-release ]
- }
- 
-+is_gentoo_variant() {
-+    [ -f /etc/gentoo-release ]
-+}
-+
- is_systemd() {
-     grep -q '^systemd$' /proc/1/comm
- }
-@@ -26,7 +30,7 @@ ec2_is_supported_instance_type() {
- }
- 
- . /etc/os-release
--if is_debian_variant; then
-+if is_debian_variant || is_gentoo_variant; then
-     SYSCONFIG=/etc/default
- else
-     SYSCONFIG=/etc/sysconfig
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0001-fix-perftune.py-IndexError-when-NIC-uses-less-IRQs-t.patch b/dev-db/scylla/files/0001-fix-perftune.py-IndexError-when-NIC-uses-less-IRQs-t.patch
deleted file mode 100644
index 1ab1599..0000000
--- a/dev-db/scylla/files/0001-fix-perftune.py-IndexError-when-NIC-uses-less-IRQs-t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d597c842991340ce2ccbb112715ec0f0eb3d21c3 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Tue, 9 May 2017 09:18:32 +0200
-Subject: [PATCH] fix perftune.py IndexError when NIC uses less IRQs than
- requested.
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- seastar/scripts/perftune.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/perftune.py b/scripts/perftune.py
-index 6748086..63fb8fd 100755
---- a/seastar/scripts/perftune.py
-+++ b/seastar/scripts/perftune.py
-@@ -476,7 +476,8 @@ class NetPerfTuner(PerfTunerBase):
-         Otherwise, we will use only IRQs which names fit one of the patterns above.
-         """
-         irqs2procline = get_irqs2procline_map()
--        all_irqs = learn_all_irqs_one("/sys/class/net/{}/device".format(iface), irqs2procline, iface)
-+        # filter 'all_irqs' to only reference valid keys from 'irqs2procline' and avoid an IndexError on the 'irqs' search below
-+        all_irqs = set(learn_all_irqs_one("/sys/class/net/{}/device".format(iface), irqs2procline, iface)).intersection(irqs2procline.keys())
-         fp_irqs_re = re.compile("\-TxRx\-|\-fp\-|\-Tx\-Rx\-")
-         irqs = list(filter(lambda irq : fp_irqs_re.search(irqs2procline[irq]), all_irqs))
-         if len(irqs) > 0:
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0001-fix-scylla-housekeeping-version-detection-to-work-wi.patch b/dev-db/scylla/files/0001-fix-scylla-housekeeping-version-detection-to-work-wi.patch
deleted file mode 100644
index 6b5c2ff..0000000
--- a/dev-db/scylla/files/0001-fix-scylla-housekeeping-version-detection-to-work-wi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2dad4af427a55079e8e2978099511084ebd549a9 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Thu, 11 May 2017 18:24:43 +0200
-Subject: [PATCH] fix scylla-housekeeping version detection to work with newer
- setuptools
-
-Newer setuptools parse_version() don't like dashed version strings,
-so we should trim it to avoid false negative version_compare() checks.
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- scylla-housekeeping | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/scylla-housekeeping b/scylla-housekeeping
-index 01e170a9..796fc25b 100755
---- a/scylla-housekeeping
-+++ b/scylla-housekeeping
-@@ -69,13 +69,23 @@ def create_uuid_file(fl):
-     with open(args.uuid_file, 'w') as myfile:
-         myfile.write(str(uuid.uuid1()) + "\n")
- 
-+def sanitize_version(version):
-+    """
-+    Newer setuptools don't like dashed version strings, trim it to avoid
-+    false negative version_compare() checks.
-+    """
-+    if version and '-' in version:
-+        return version.split('-', 1)[0]
-+    else:
-+        return version
-+
- def check_version(ar):
-     if config and (not config.has_option("housekeeping", "check-version") or not config.getboolean("housekeeping", "check-version")):
-         return
-     if ar.version and ar.version != '':
--        current_version = ar.version
-+        current_version = sanitize_version(ar.version)
-     else:
--        current_version = get_api('/storage_service/scylla_release_version')
-+        current_version = sanitize_version(get_api('/storage_service/scylla_release_version'))
-         if current_version == "":
-             # API is down, nothing to do
-             return
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch b/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch
deleted file mode 100644
index 756673e..0000000
--- a/dev-db/scylla/files/0002-detect-gentoo-linux-on-selinux-setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bc63e501db716495bd7f4b30fbf4b7fba962ad6b Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:04:20 +0200
-Subject: [PATCH 2/9] detect gentoo linux on selinux setup
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_selinux_setup | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dist/common/scripts/scylla_selinux_setup b/dist/common/scripts/scylla_selinux_setup
-index a6ebf5fa..8d8e864c 100755
---- a/dist/common/scripts/scylla_selinux_setup
-+++ b/dist/common/scripts/scylla_selinux_setup
-@@ -4,7 +4,9 @@
- 
- . /usr/lib/scylla/scylla_lib.sh
- 
--if ! is_debian_variant; then
-+if is_debian_variant || is_gentoo_variant; then
-+    echo "scylla_selinux_setup only supports Red Hat variants"
-+else
-     if [ "`sestatus | awk '{print $3}'`" != "disabled" ]; then
-         setenforce 0
-         sed --follow-symlinks -i -e "s/^SELINUX=enforcing/SELINUX=disabled/" /etc/sysconfig/selinux
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0003-coredump-setup-add-support-for-gentoo-linux.patch b/dev-db/scylla/files/0003-coredump-setup-add-support-for-gentoo-linux.patch
deleted file mode 100644
index 902934a..0000000
--- a/dev-db/scylla/files/0003-coredump-setup-add-support-for-gentoo-linux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6a1807a7d8b3da6a6f830ef459b4534648b1bc8f Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:05:08 +0200
-Subject: [PATCH 3/9] coredump setup: add support for gentoo linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_coredump_setup | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dist/common/scripts/scylla_coredump_setup b/dist/common/scripts/scylla_coredump_setup
-index e4b50ba0..8876b7e6 100755
---- a/dist/common/scripts/scylla_coredump_setup
-+++ b/dist/common/scripts/scylla_coredump_setup
-@@ -32,7 +32,7 @@ done
- if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" != "16.04" ]; then
-     apt-get remove -y apport-noui
-     sysctl -p /etc/sysctl.d/99-scylla.conf
--elif [ "$ID" = "debian" ]; then
-+elif [ "$ID" = "debian" ] || [ "$ID" = "gentoo" ]; then
-     sysctl -p /etc/sysctl.d/99-scylla.conf
- else
-     if [ "$ID" = "ubuntu" ]; then
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0004-cpuscaling-setup-add-support-for-gentoo-linux.patch b/dev-db/scylla/files/0004-cpuscaling-setup-add-support-for-gentoo-linux.patch
deleted file mode 100644
index e18909f..0000000
--- a/dev-db/scylla/files/0004-cpuscaling-setup-add-support-for-gentoo-linux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a198f2b1afbfa341eabfdbaadcbea1111c716930 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:05:24 +0200
-Subject: [PATCH 4/9] cpuscaling setup: add support for gentoo linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_cpuscaling_setup | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/dist/common/scripts/scylla_cpuscaling_setup b/dist/common/scripts/scylla_cpuscaling_setup
-index 5d02ae51..1089a77a 100755
---- a/dist/common/scripts/scylla_cpuscaling_setup
-+++ b/dist/common/scripts/scylla_cpuscaling_setup
-@@ -12,6 +12,16 @@ if is_debian_variant; then
-         systemctl enable cpufrequtils.service
-     fi
-     service cpufrequtils start
-+elif is_gentoo_variant; then
-+    emerge -uq sys-power/cpupower
-+    sed -e 's/--governor ondemand/--governor performance/g' -i /etc/conf.d/cpupower
-+    if is_systemd; then
-+        systemctl enable cpupower-frequency-set.service
-+        systemctl start cpupower-frequency-set.service
-+    else
-+        rc-update add cpupower default
-+        service cpupower start
-+    fi
- else
-     yum install -y cpupowerutils || true
-     echo 'CPUPOWER_START_OPTS="frequency-set -g performance"' > /etc/sysconfig/cpupower
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0005-kernel-check-add-support-for-gentoo-linux.patch b/dev-db/scylla/files/0005-kernel-check-add-support-for-gentoo-linux.patch
deleted file mode 100644
index bdae062..0000000
--- a/dev-db/scylla/files/0005-kernel-check-add-support-for-gentoo-linux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 412f96a1bfc473e974d14b13ddba28c15e3a3370 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:05:45 +0200
-Subject: [PATCH 5/9] kernel check: add support for gentoo linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_kernel_check | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dist/common/scripts/scylla_kernel_check b/dist/common/scripts/scylla_kernel_check
-index 76ba301b..e27bb9a5 100755
---- a/dist/common/scripts/scylla_kernel_check
-+++ b/dist/common/scripts/scylla_kernel_check
-@@ -7,6 +7,8 @@
- if [ ! -f /sbin/mkfs.xfs ]; then
-     if is_debian_variant; then
-         apt-get install -y xfsprogs
-+    elif is_gentoo_variant; then
-+        emerge -uq sys-fs/xfsprogs
-     else
-         yum install -y xfsprogs
-     fi
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0006-ntp-setup-add-support-for-gentoo-linux.patch b/dev-db/scylla/files/0006-ntp-setup-add-support-for-gentoo-linux.patch
deleted file mode 100644
index dcdc4fa..0000000
--- a/dev-db/scylla/files/0006-ntp-setup-add-support-for-gentoo-linux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fdd5944ab29f51188634874097d674c643e9e141 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:05:59 +0200
-Subject: [PATCH 6/9] ntp setup: add support for gentoo linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_ntp_setup | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/dist/common/scripts/scylla_ntp_setup b/dist/common/scripts/scylla_ntp_setup
-index 75598229..1587e195 100755
---- a/dist/common/scripts/scylla_ntp_setup
-+++ b/dist/common/scripts/scylla_ntp_setup
-@@ -35,6 +35,16 @@ if is_debian_variant; then
-     fi
-     ntpdate `cat /etc/ntp.conf |egrep "^server"|head -n1|awk '{print $2}'`
-     service ntp start
-+elif is_gentoo_variant; then
-+    emerge -uq net-misc/ntp
-+    pidof ntpd &>/dev/null || ntpdate `cat /etc/ntp.conf |grep "^server"|head -n1|awk '{print $2}'`
-+    if is_systemd; then
-+        systemctl enable sntpd.service
-+        systemctl start sntpd.service
-+    else
-+        rc-update add ntpd default
-+        service ntpd start
-+    fi
- else
-     yum install -y ntp ntpdate || true
-     if [ "$DOMAIN" != "" ]; then
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0007-raid-setup-add-support-for-gentoo-linux.patch b/dev-db/scylla/files/0007-raid-setup-add-support-for-gentoo-linux.patch
deleted file mode 100644
index eb661c0..0000000
--- a/dev-db/scylla/files/0007-raid-setup-add-support-for-gentoo-linux.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1d235e50125a57ad36223260638347905b035022 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:06:14 +0200
-Subject: [PATCH 7/9] raid setup: add support for gentoo linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_raid_setup | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dist/common/scripts/scylla_raid_setup b/dist/common/scripts/scylla_raid_setup
-index 8bb42cfe..36664b27 100755
---- a/dist/common/scripts/scylla_raid_setup
-+++ b/dist/common/scripts/scylla_raid_setup
-@@ -88,6 +88,8 @@ fi
- 
- if is_debian_variant; then
-     env DEBIAN_FRONTEND=noninteractive apt-get -y install mdadm xfsprogs
-+elif is_gentoo_variant; then
-+    emerge -uq sys-fs/mdadm sys-fs/xfsprogs
- else
-     yum -y install mdadm xfsprogs
- fi
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0008-prometheus-node_exporter-install-add-support-for-gen.patch b/dev-db/scylla/files/0008-prometheus-node_exporter-install-add-support-for-gen.patch
deleted file mode 100644
index 5444969..0000000
--- a/dev-db/scylla/files/0008-prometheus-node_exporter-install-add-support-for-gen.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9bb1bda466013dda3bf50d5fc4a9967b20555f07 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:06:34 +0200
-Subject: [PATCH 8/9] prometheus node_exporter install: add support for gentoo
- linux
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/node_exporter_install | 44 ++++++++++++++++++++-----------
- 1 file changed, 28 insertions(+), 16 deletions(-)
-
-diff --git a/dist/common/scripts/node_exporter_install b/dist/common/scripts/node_exporter_install
-index c796b393..8083eb08 100755
---- a/dist/common/scripts/node_exporter_install
-+++ b/dist/common/scripts/node_exporter_install
-@@ -22,26 +22,37 @@ if [ "`id -u`" -ne 0 ]; then
-     exit 1
- fi
- 
--if [ -f /usr/bin/node_exporter ]; then
-+if [ -f /usr/bin/node_exporter ] || [ -f /usr/bin/prometheus-node_exporter ]; then
-     echo "node_exporter already installed"
-     exit 1
- fi
- 
--version=0.12.0
--dir=/usr/lib/scylla/Prometheus/node_exporter
--mkdir -p $dir
--cd $dir
--curl -L https://github.com/prometheus/node_exporter/releases/download/$version/node_exporter-$version.linux-amd64.tar.gz -o $dir/node_exporter-$version.linux-amd64.tar.gz
--tar -xvzf $dir/node_exporter-$version.linux-amd64.tar.gz
--rm $dir/node_exporter-$version.linux-amd64.tar.gz
--ln -s $dir/node_exporter-$version.linux-amd64/node_exporter /usr/bin
--. /etc/os-release
--
-- if [ "$(cat /proc/1/comm)" = "systemd" ]; then
--    systemctl enable node-exporter
--    systemctl start node-exporter
-+. /usr/lib/scylla/scylla_lib.sh
-+
-+if is_gentoo_variant; then
-+    emerge -uq net-analyzer/prometheus-node_exporter
-+    if is_systemd; then
-+       echo "net-analyzer/prometheus-node_exporter does not install systemd service files, please fill a bug if you need them."
-+    else
-+        rc-update add prometheus-node_exporter default
-+        service prometheus-node_exporter start
-+    fi
- else
--    cat <<EOT >> /etc/init/node_exporter.conf
-+    version=0.12.0
-+    dir=/usr/lib/scylla/Prometheus/node_exporter
-+    mkdir -p $dir
-+    cd $dir
-+    curl -L https://github.com/prometheus/node_exporter/releases/download/$version/node_exporter-$version.linux-amd64.tar.gz -o $dir/node_exporter-$version.linux-amd64.tar.gz
-+    tar -xvzf $dir/node_exporter-$version.linux-amd64.tar.gz
-+    rm $dir/node_exporter-$version.linux-amd64.tar.gz
-+    ln -s $dir/node_exporter-$version.linux-amd64/node_exporter /usr/bin
-+    . /etc/os-release
-+
-+     if is_systemd; then
-+        systemctl enable node-exporter
-+        systemctl start node-exporter
-+    else
-+        cat <<EOT >> /etc/init/node_exporter.conf
- # Run node_exporter
- 
- start on startup
-@@ -50,7 +61,8 @@ script
-    /usr/bin/node_exporter
- end script
- EOT
--    service node_exporter start
-+        service node_exporter start
-+    fi
- fi
- 
- printf "node_exporter successfully installed\n"
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0009-scylla_setup-add-gentoo-linux-installation-detection.patch b/dev-db/scylla/files/0009-scylla_setup-add-gentoo-linux-installation-detection.patch
deleted file mode 100644
index b1e8880..0000000
--- a/dev-db/scylla/files/0009-scylla_setup-add-gentoo-linux-installation-detection.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fa0944ac193b053585a553c8680faf24d57affc2 Mon Sep 17 00:00:00 2001
-From: Alexys Jacob <ultrabug@gentoo.org>
-Date: Wed, 17 May 2017 18:06:54 +0200
-Subject: [PATCH 9/9] scylla_setup: add gentoo linux installation detection
-
-Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
----
- dist/common/scripts/scylla_setup | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
-index 7d1de81e..1f86dce3 100755
---- a/dist/common/scripts/scylla_setup
-+++ b/dist/common/scripts/scylla_setup
-@@ -74,6 +74,8 @@ interactive_ask_service() {
- verify_package() {
-     if is_debian_variant; then
-         dpkg -s $1 > /dev/null 2>&1 &&:
-+    elif is_gentoo_variant; then
-+        find /var/db/pkg/dev-db -type d -name "${1}-*" | egrep -q ".*"
-     else
-         rpm -q $1 > /dev/null 2>&1 &&:
-     fi
-@@ -269,6 +271,9 @@ if [ $ENABLE_SERVICE -eq 1 ]; then
-     if is_systemd; then
-         systemctl enable scylla-server.service
-         systemctl enable collectd.service
-+    elif is_gentoo_variant; then
-+        rc-update add scylla-server default
-+        rc-update add collectd default
-     fi
-     if [ $INTERACTIVE -eq 1 ] && [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
-         interactive_ask_service "Do you want to enable ScyllaDB version check?" "Answer yes to automatically start Scylla-housekeeping service that checks for a newer version periodically; answer no to skip this step." "yes" &&:
-@@ -304,7 +309,9 @@ if [ "$CUR_VERSION" != "" ]; then
- fi
- 
- # scylla_selinux_setup only supports Red Hat variants
--if ! is_debian_variant; then
-+if is_debian_variant || is_gentoo_variant; then
-+    echo "scylla_selinux_setup only supports Red Hat variants"
-+else
-     if [ $INTERACTIVE -eq 1 ]; then
-         interactive_ask_service "Do you want to disable SELinux?" "Answer yes to disable SELinux and improve performance; answer no to keep it activated." "yes" &&:
-         SELINUX_SETUP=$?
--- 
-2.12.2
-