scylla: we are indeed building the master branch

16 files changed, 110 insertions, 263 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index c623d2d..ae268c5 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -1,20 +1,16 @@
 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 928 SHA256 b6cebb658a703dacd2d8c84a5ec44d06846c8b721a459fb188e8236392f9044f SHA512 1ea31836516caa651c7466bdb92230584fa3a46e7441d9d0a108142e41ab71f261259423e4e445d345d9ee1efb337f59b358ca10cf3694b8c1734a8d9852c888 WHIRLPOOL 157f6e5d2929322ec4ffc9fcdfb160ed02e211bf3c01173738ae857c4c1ea63dbeafb84751934cda289a2e69e6ed9591e18c43fe23317dd53a651fc253b769d7
+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 eded96381bacc24c14f0fa1015c7e6516537b27f8666ad5e305a9ea79d597329 SHA512 a04aab0599355fd8f5688041a51dda02bf9bccb68292ca305d8105e5fc12d5751d28fea5bb649a932915770a7db9a4880f5ab9f257fc8b19f45e7e72e4a88bc3 WHIRLPOOL 3a1f3d0f533287b0de34647732aa43c72bb4417eecbf36be7d83a0433cfdfd8bd733c953f90b525ffe12b42e0ddfbe363b779b8b603768d4b4a3e39ecee2fa4d
-AUX 0003-coredump-setup-add-support-for-gentoo-linux.patch 905 SHA256 d8b7d57f09eb92ee582fca4e20d1f18da3602346023563b6aeed8ccdb7f63df3 SHA512 d3da51cccc5073ca8386153ec90e031939219a681a6a874dc7358bac369d864324b4971b6efa88a80aef08ea54f2b3e6517e06fec07e5c96fe4a05f44ce875b2 WHIRLPOOL ab056952dda4b252ec8c869126c1e941842cc4ecb0ee2f22a0cede1ae35f7c18b6c8869fedf4192dc28f13dbddd8a33f667517939142ec442923677bdffaada7
-AUX 0004-cpuscaling-setup-add-support-for-gentoo-linux.patch 1211 SHA256 b027990fe57957ae170af552adbcd420085f72cf800aeb9faa6a70af674dc2b8 SHA512 6aa57e305613dfb6484e4e41c39ec2d095abcfe2e9cd3c6c101668a22d092f40dad3fe24fd5b4bb24eb636d3e4103e85637feaba0e44c1daaa31d5554811ab3d WHIRLPOOL f15a0558153a5272036d858140efd9ae9f14ef969427b3fa4588ff4c5cc81d611bda9a5d41f6001b607a512b0ef815c6187d03fd5d78bbbabd232e15742869ee
-AUX 0005-kernel-check-add-support-for-gentoo-linux.patch 769 SHA256 709686dd59f80a026aca648f63bde8bcb00010e28c9085e56dc507e4c242c36b SHA512 1e2279fe8e83f7a6373ff3c24b02e5fc80b3389c804ca5948c2e1f9ba1babc59003d0c7e6d884b9b578399e260665057449b3b73fbd41fe990168744cfb3d382 WHIRLPOOL 842596e7e18f102f292b1f23c4bfe7b350ec60cd2ca71eb82112ec8ad16082e89cf2b2e91d18012dd189e1c4a6747e31fb59968d2d44f32b81c9d562be9b2199
-AUX 0006-ntp-setup-add-support-for-gentoo-linux.patch 1100 SHA256 106285974f717b66646af90fdf7b59fc474f06ccf62b2f4403a8db4dcecf416b SHA512 5932ecac4efbf57ba0f65e246f5ba2c21d7e244c8b0d0d6d070529d3c0df0a4144413cb9804e0dc16dce1a79a6eba910787790914f2b04620fc95523409140fa WHIRLPOOL d3fe4e81a097c03f58b90016ce694c5b30b79093890577361e0ed24bf386084f58434ff9ae8aa518109d39b18c43768587725c3fe34a3b57fae2da25a0099ea1
-AUX 0007-raid-setup-add-support-for-gentoo-linux.patch 762 SHA256 de50884b39a979eeb9d9abb7882c1ce8db4904715888a6ce1181db38bb73e154 SHA512 6284473fbfc3b5ade46e76d894d791786e969be1de3ee260342565ef548458deab929127ffbb0ad23443a45dd6bc027600eaa850a727b7c60bf46953809bdcb5 WHIRLPOOL 8452dc0ff84963618982a37b5f73127dc187a2c56ff4eeb2d4f5051be5f7eae19d268fcea1e08c8a7ac0d54387fba55ddd78a99547e5a3c8a0fa0f22c8c522bf
-AUX 0008-prometheus-node_exporter-install-add-support-for-gen.patch 2788 SHA256 22ace34019009420ef03b1b2f730b833caad8d867b2e3a2e1193bc9bc56e5af4 SHA512 5560a38328f60f8431c05994ad6d5325afc5ac9392f1e44c74d4490dc5f9f72e5014e33cd14f38cbe7cdf7c4eba9726dc2f090d8bddda9c604e8074a744b5ec5 WHIRLPOOL 081ab55bb7fab11a7b54d56f818e47e03b351184241fb5e38b816c4596402a82490c9b32432256aad965e5c786d852979c9794aa8369f33e9532f66059723dd9
-AUX 0009-scylla_setup-add-gentoo-linux-installation-detection.patch 792 SHA256 d5a34ffdb4a52415821946bfefb9db381a6d3080d27dbb77a7813f8404f76a25 SHA512 60d2af321df66caa0126ad4e269a35836439369def7273acffd5b9f7de3838096cd5c898514435178a0438c03e26b5851bd14c9be3ea48fabae7cb17df8d0979 WHIRLPOOL 1c0d23ba909290f400a657c96bacda82dd70792f9b6941b83c42f9ec954a363787317efb47f3cf6275c35df6361fc52a15fee0f3aabc07cbf9e96aa4bb3bf101
-AUX 0010-scylla_setup-refactor-scylla-server-service-setup-wh.patch 2831 SHA256 6adb6a67a60dc09ed80960a3291ec08d908aabb238baac0727b5e182e901a04f SHA512 0d2f0dafba731fa64361fece2aa8c80f0e9d7207badfbcb038c02fbf426849b80938e2c4163bd002d08427c21efa5caa186f2525d5317a35427f45f68bc970d2 WHIRLPOOL b6ba8c42f41acc8be03cf44ee6675681bd175f08beb92b343420db32cc6569dfb13f3aaeba9418b29c78bb9280b23049e92fae2db971fe97075da751c18716d1
-AUX 0011-scylla_setup-disable-useless-version-check-for-gento.patch 1321 SHA256 204e8b7f5feeb4b6c9a7e6e99344c2437e28ad18d6a4fc50e1a40f1fd31331c9 SHA512 85c22bc43b2526c1675557f4314d6fca4db653f984af9db729af55505613a3d0e3ad4c44f3257c8cc0f6ffcfad6a05db411a0d9c06244bff8fc73adbc33e7a86 WHIRLPOOL d73800e0880d5b78859486c9336a6eb3c721f6d6536313ea02b76ad7a74839431bf60adf0aaef4c6891a994c5d49d4f56f405532e9b1c7620cdb189bc3d7bcab
-AUX 0012-scylla_setup-disable-selinux-setup-for-gentoo-linux.patch 1085 SHA256 94101823454ab39c9244504a6de11ff0f00cf65650600b91329d13f7338b3a63 SHA512 41e5a8ca04a41cf618fa1303608d122c6cab277d9bcccfa1563694ee0355d322ec277cc2235e75354a88ffb98bb355f9dfff730613e1eb023e87b454a33368ac WHIRLPOOL c1b1b2e1ddb230b2fcd06f739b0abcbc42264059f688e9af90cb2491eb9854662d86488037740a5014f552d082aab3596c162d452759af171b53f21512d9965c
-AUX 0013-scylla_setup-fix-typo-on-cpu-scaling-messages.patch 1222 SHA256 29806fbb6f14eca07bd17e15f0f4b8c83b89b8e0b9367c1d094b415a8dd04c37 SHA512 b4172be3ff3506f29a3ad240c268aa4c39006b5d67f8c8452166aa2ec0a5e95deb60c89ec85bea40acc2d64d04b99c923804c014eaf7d5e1db29f2d7cbe9090e WHIRLPOOL aed97ba3339f9ad67a01a67731329916117cc07c442665cec9f416a3b72870055b56269e66a44d49e903f0d84a1ea1e3446f6d7a33c6a1057557e1091511c4d8
+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-1.6.4.ebuild 6034 SHA256 11a2e4353f7860f00d47a5b48e2191dbecc5b78146a2abed653d3aecc47594d8 SHA512 c9c75e1911b71dc2e3972b647ea631fc6e7705b074dcb3c14cf9c50af73efdf98621cacd961668b3b41dc22a9c88e33c4785cb5980795f54f1dfdda1eb22ea87 WHIRLPOOL 063598700f6d86ff48c8e35ab52016b79f3b56570cd48980ed1b11ec2ca28d2749be07b584a9607bb7b576fb9bfa57bafde42d790a4eff65e114208e2ded2228
-MISC metadata.xml 361 SHA256 81bb4d0de917cdbdea603c487f11da0e17047530931a9e01cd22758f587b29ec SHA512 87dec3e3deb457710d739c931e6a0f0021321a549f153ab2cc1fe4bbf727c86d0b8cca8fcbdd7aaed814bc87a109939e7f75feeb3a5e7763cbce5759af2b0efd WHIRLPOOL 5f268bc54b00c9f7b6a80788899d6e0cab1714877d8599edd7ecdf00904f2e8bd71e7193e7b68a15e831b36590b36ea8140756864fb70807645f8869a0702330
+EBUILD scylla-9999.ebuild 4762 SHA256 4b231722a7d5686f94b6d72b5a20bea6c2aea71b1d45ed2801112e3b7f169546 SHA512 f794f8b13dbd4ddcfda4b0efc5d7da21584e7d2229874e5ce19c88735b778d67d0bde4ff93a9d114e405aee8d070a7dd07cdfd1c318ca675af0fa0e514795e29 WHIRLPOOL 76a12ceccf4778ac82b0919790ebcad9e7dd57f45b6b1ea47a395b435f2126b42a2025ea7750940ad2fe95bf9670e8c70e2074b6f14f35762809ff16140548c4
+MISC metadata.xml 249 SHA256 658f3f0cb7921722166c25f4a815ec0d7418ad183b9e8a0377eb08b3c3139173 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c WHIRLPOOL 6031231a9c8d06218c688115fb3e0f734964735d3af0b4e4a932afa78cbebecd6586293a16cbf69985fbaad4dce3594b1095a00d91a3a131cf8d683e88c34841
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
index 30c6eb9..bbb92e1 100644
--- 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
@@ -1,14 +1,15 @@
-From c9e499700b607984b872fb062d4fb3ddfb1c523d Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:17:51 +0200
-Subject: [PATCH 01/13] add gentoo_variant detection and SYSCONFIG setup
+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, 6 insertions(+)
+ 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..38f0c06f 100644
+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() {
@@ -22,15 +23,15 @@ index 8dc47bdd..38f0c06f 100644
  is_systemd() {
      grep -q '^systemd$' /proc/1/comm
  }
-@@ -28,6 +32,8 @@ ec2_is_supported_instance_type() {
+@@ -26,7 +30,7 @@ ec2_is_supported_instance_type() {
+ }
+ 
  . /etc/os-release
- if is_debian_variant; then
+-if is_debian_variant; then
++if is_debian_variant || is_gentoo_variant; then
      SYSCONFIG=/etc/default
-+elif is_gentoo_variant; then
-+    SYSCONFIG=/etc/default
  else
      SYSCONFIG=/etc/sysconfig
- fi
 -- 
 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
index 7b04ed7..756673e 100644
--- 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
@@ -1,29 +1,28 @@
-From 047e1dcd5b2620b05d8c2a2dc93a6edea9e47ff1 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:19:25 +0200
-Subject: [PATCH 02/13] detect gentoo linux on selinux setup
+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 | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ 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 9d652bfd..234631dc 100755
+index a6ebf5fa..8d8e864c 100755
 --- a/dist/common/scripts/scylla_selinux_setup
 +++ b/dist/common/scripts/scylla_selinux_setup
-@@ -4,7 +4,11 @@
+@@ -4,7 +4,9 @@
  
  . /usr/lib/scylla/scylla_lib.sh
  
 -if ! is_debian_variant; then
-+if is_debian_variant; then
-+    echo "scylla_selinux_setup only supports Red Hat variants"
-+elif is_gentoo_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 -e "s/enforcing/disabled/" /etc/sysconfig/selinux > /tmp/selinux
+         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
index 6b35d63..902934a 100644
--- 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
@@ -1,25 +1,26 @@
-From 9e89a00568ac56554922243d85b6b210f3ec841b Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:21:37 +0200
-Subject: [PATCH 03/13] coredump setup: add support for gentoo linux
+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, 2 insertions(+)
+ 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..7fea51db 100755
+index e4b50ba0..8876b7e6 100755
 --- a/dist/common/scripts/scylla_coredump_setup
 +++ b/dist/common/scripts/scylla_coredump_setup
-@@ -34,6 +34,8 @@ if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" != "16.04" ]; then
+@@ -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" ]; then
++elif [ "$ID" = "debian" ] || [ "$ID" = "gentoo" ]; then
      sysctl -p /etc/sysctl.d/99-scylla.conf
-+elif [ "$ID" = "gentoo" ]; then
-+    sysctl -p /etc/sysctl.d/99-scylla.conf
  else
      if [ "$ID" = "ubuntu" ]; then
-         apt-get install -y systemd-coredump
 -- 
 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
index fa591a8..e18909f 100644
--- 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
@@ -1,8 +1,9 @@
-From a2069c4ea3b83090219c82878c38ea0432bf49ed Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:21:55 +0200
-Subject: [PATCH 04/13] cpuscaling setup: add support for gentoo linux
+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/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
index 9856756..bdae062 100644
--- 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
@@ -1,8 +1,9 @@
-From a9f662f6992f86cca94812ab7f849370f0b5f650 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:22:11 +0200
-Subject: [PATCH 05/13] kernel check: add support for gentoo linux
+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/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
index 98cec82..dcdc4fa 100644
--- 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
@@ -1,8 +1,9 @@
-From 65b2ccac24e056075bf4712f3d1e3ef92b067b46 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:22:34 +0200
-Subject: [PATCH 06/13] ntp setup: add support for gentoo linux
+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/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
index c1ca0cc..eb661c0 100644
--- 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
@@ -1,8 +1,9 @@
-From b78d665446c8b6d9a0893b3d18d419bbe17d702e Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:22:57 +0200
-Subject: [PATCH 07/13] raid setup: add support for gentoo linux
+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/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
index 8a1a5ea..5444969 100644
--- 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
@@ -1,9 +1,10 @@
-From 816779967afff06c956791f6c1ea61deef1caea1 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:23:56 +0200
-Subject: [PATCH 08/13] prometheus node_exporter install: add support for
- gentoo linux
+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/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
index a2fae79..b1e8880 100644
--- 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
@@ -1,14 +1,15 @@
-From 3c058e8cc68a7560529438480f331a855fb4a3f3 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:24:54 +0200
-Subject: [PATCH 09/13] scylla_setup: add gentoo linux installation detection
+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 | 2 ++
- 1 file changed, 2 insertions(+)
+ 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..17bbef84 100755
+index 7d1de81e..1f86dce3 100755
 --- a/dist/common/scripts/scylla_setup
 +++ b/dist/common/scripts/scylla_setup
 @@ -74,6 +74,8 @@ interactive_ask_service() {
@@ -16,10 +17,31 @@ index 7d1de81e..17bbef84 100755
      if is_debian_variant; then
          dpkg -s $1 > /dev/null 2>&1 &&:
 +    elif is_gentoo_variant; then
-+        grep -q 'dev-db/scylla' /var/lib/portage/world
++        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
 
diff --git a/dev-db/scylla/files/0010-scylla_setup-refactor-scylla-server-service-setup-wh.patch b/dev-db/scylla/files/0010-scylla_setup-refactor-scylla-server-service-setup-wh.patch
deleted file mode 100644
index d1da9b4..0000000
--- a/dev-db/scylla/files/0010-scylla_setup-refactor-scylla-server-service-setup-wh.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 25fca1f9b33e3a86d202e044862d7e962d77c215 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:27:36 +0200
-Subject: [PATCH 10/13] scylla_setup: refactor scylla-server service setup
- while adding gentoo linux openrc support
-
----
- dist/common/scripts/scylla_setup | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
-index 17bbef84..9078f4df 100755
---- a/dist/common/scripts/scylla_setup
-+++ b/dist/common/scripts/scylla_setup
-@@ -271,29 +271,27 @@ if [ $ENABLE_SERVICE -eq 1 ]; then
-     if is_systemd; then
-         systemctl enable scylla-server.service
-         systemctl enable collectd.service
--    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" &&:
--        ENABLE_CHECK_VERSION=$?
--    fi
--    if [ $ENABLE_CHECK_VERSION -eq 1 ]; then
--        if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
--           printf "[housekeeping]\ncheck-version: True\n" > /etc/scylla.d/housekeeping.cfg
-+        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" &&:
-+            ENABLE_CHECK_VERSION=$?
-         fi
--        if is_systemd; then
-+        if [ $ENABLE_CHECK_VERSION -eq 1 ]; then
-+            if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
-+               printf "[housekeeping]\ncheck-version: True\n" > /etc/scylla.d/housekeeping.cfg
-+            fi
-             systemctl unmask scylla-housekeeping-daily.timer
-             systemctl unmask scylla-housekeeping-restart.timer
--        fi
--    else
--        if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
--           printf "[housekeeping]\ncheck-version: False\n" > /etc/scylla.d/housekeeping.cfg
--        fi
--        if is_systemd; then
-+        else
-+            if [ ! -f /etc/scylla.d/housekeeping.cfg ]; then
-+               printf "[housekeeping]\ncheck-version: False\n" > /etc/scylla.d/housekeeping.cfg
-+            fi
-             systemctl mask scylla-housekeeping-daily.timer
-             systemctl mask scylla-housekeeping-restart.timer
-             systemctl stop scylla-housekeeping-daily.timer || true
-             systemctl stop scylla-housekeeping-restart.timer || true
-         fi
-+    elif is_gentoo_variant; then
-+        rc-update add scylla-server default
-     fi
- fi
- 
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0011-scylla_setup-disable-useless-version-check-for-gento.patch b/dev-db/scylla/files/0011-scylla_setup-disable-useless-version-check-for-gento.patch
deleted file mode 100644
index 4bd5646..0000000
--- a/dev-db/scylla/files/0011-scylla_setup-disable-useless-version-check-for-gento.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a5666d324e59ca1cf5229ff0db1a31e7153aab9c Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:28:06 +0200
-Subject: [PATCH 11/13] scylla_setup: disable useless version check for gentoo
- linux
-
----
- dist/common/scripts/scylla_setup | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
-index 9078f4df..cba51261 100755
---- a/dist/common/scripts/scylla_setup
-+++ b/dist/common/scripts/scylla_setup
-@@ -295,11 +295,13 @@ if [ $ENABLE_SERVICE -eq 1 ]; then
-     fi
- fi
- 
--CUR_VERSION=`scylla --version` || true
--if [ "$CUR_VERSION" != "" ]; then
--    NEW_VERSION=`sudo -u scylla /usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid version --version $CUR_VERSION --mode i` || true
--    if [ "$NEW_VERSION" != "" ]; then
--       echo $NEW_VERSION
-+if ! is_gentoo_variant; then
-+    CUR_VERSION=`scylla --version` || true
-+    if [ "$CUR_VERSION" != "" ]; then
-+        NEW_VERSION=`sudo -u scylla /usr/lib/scylla/scylla-housekeeping --uuid-file /var/lib/scylla-housekeeping/housekeeping.uuid version --version $CUR_VERSION --mode i` || true
-+        if [ "$NEW_VERSION" != "" ]; then
-+           echo $NEW_VERSION
-+        fi
-     fi
- fi
- 
--- 
-2.12.2
-
diff --git a/dev-db/scylla/files/0012-scylla_setup-disable-selinux-setup-for-gentoo-linux.patch b/dev-db/scylla/files/0012-scylla_setup-disable-selinux-setup-for-gentoo-linux.patch
deleted file mode 100644
index 2b7526b..0000000
--- a/dev-db/scylla/files/0012-scylla_setup-disable-selinux-setup-for-gentoo-linux.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b2868797b73b1a73c01e5553b776cc945d350738 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:28:56 +0200
-Subject: [PATCH 12/13] scylla_setup: disable selinux setup for gentoo linux
-
----
- dist/common/scripts/scylla_setup | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
-index cba51261..a5fe56cd 100755
---- a/dist/common/scripts/scylla_setup
-+++ b/dist/common/scripts/scylla_setup
-@@ -306,7 +306,11 @@ if ! is_gentoo_variant; then
- fi
- 
- # scylla_selinux_setup only supports Red Hat variants
--if ! is_debian_variant; then
-+if is_debian_variant; then
-+    echo "scylla_selinux_setup only supports Red Hat variants"
-+elif 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
-
diff --git a/dev-db/scylla/files/0013-scylla_setup-fix-typo-on-cpu-scaling-messages.patch b/dev-db/scylla/files/0013-scylla_setup-fix-typo-on-cpu-scaling-messages.patch
deleted file mode 100644
index 9530948..0000000
--- a/dev-db/scylla/files/0013-scylla_setup-fix-typo-on-cpu-scaling-messages.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 16a0f0de4b167a76ea7f3630148ce32d80c15fa9 Mon Sep 17 00:00:00 2001
-From: Ultrabug <ultrabug@gentoo.org>
-Date: Wed, 3 May 2017 17:29:34 +0200
-Subject: [PATCH 13/13] scylla_setup: fix typo on cpu scaling messages
-
----
- dist/common/scripts/scylla_setup | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
-index a5fe56cd..e14a9010 100755
---- a/dist/common/scripts/scylla_setup
-+++ b/dist/common/scripts/scylla_setup
-@@ -465,11 +465,11 @@ if [ $DEV_MODE -eq 1 ]; then
- fi
- 
- if [ $INTERACTIVE -eq 1 ]; then
--    interactive_ask_service "Do you want to setup CPU scalling governor?" "Answer yes to  set CPU scalling governor to performance at boot time. Answer no to do nothing." "yes" &&:
-+    interactive_ask_service "Do you want to setup CPU scaling governor?" "Answer yes to  set CPU scaling governor to performance at boot time. Answer no to do nothing." "yes" &&:
-     CPUSCALING_SETUP=$?
- fi
- if [ $CPUSCALING_SETUP -eq 1 ]; then
--    run_setup_script "CPU Scalling" /usr/lib/scylla/scylla_cpuscaling_setup
-+    run_setup_script "CPU Scaling" /usr/lib/scylla/scylla_cpuscaling_setup
- fi
- 
- if is_redhat_variant; then
--- 
-2.12.2
-
diff --git a/dev-db/scylla/metadata.xml b/dev-db/scylla/metadata.xml
index 2275571..f4e95c6 100644
--- a/dev-db/scylla/metadata.xml
+++ b/dev-db/scylla/metadata.xml
@@ -5,7 +5,4 @@
     <email>ultrabug@gentoo.org</email>
     <name>Ultrabug</name>
   </maintainer>
-  <use>
-        <flag name="collectd">Install <pkg>app-admin/collectd</pkg> configuration file.</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-db/scylla/scylla-1.6.4.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 7a93bf5..edeb1d9 100644
--- a/dev-db/scylla/scylla-1.6.4.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/scylladb/scylla.git"
+#EGIT_COMMIT="scylla-${PV}"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit git-r3 linux-info python-r1 toolchain-funcs systemd user
@@ -14,10 +15,11 @@ HOMEPAGE="http://scylladb.com/"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="collectd doc systemd"
+IUSE="doc systemd"
 
 RDEPEND="
 	=dev-libs/thrift-0.9.1
+	app-admin/collectd
 	app-arch/lz4
 	app-arch/snappy
 	dev-cpp/antlr-cpp:3.5
@@ -57,24 +59,7 @@ ERROR_SYN_COOKIES="${PN} recommends support for TCP syncookie support (SYN_COOKI
 ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage support (TRANSPARENT_HUGEPAGE)."
 
 DOCS=( LICENSE.AGPL README.md )
-PATCHES=(
-	"${FILESDIR}/0001-fix-perftune.py-IndexError-when-NIC-uses-less-IRQs-t.patch"  # merged
-	"${FILESDIR}/0001-fix-scylla-housekeeping-version-detection-to-work-wi.patch"
-	"${FILESDIR}/0001-add-gentoo_variant-detection-and-SYSCONFIG-setup.patch"
-	"${FILESDIR}/0001-Add-support-for-Gentoo-Linux-irqbalance-configuratio.patch"
-	"${FILESDIR}/0002-detect-gentoo-linux-on-selinux-setup.patch"
-	"${FILESDIR}/0003-coredump-setup-add-support-for-gentoo-linux.patch"
-	"${FILESDIR}/0004-cpuscaling-setup-add-support-for-gentoo-linux.patch"
-	"${FILESDIR}/0005-kernel-check-add-support-for-gentoo-linux.patch"
-	"${FILESDIR}/0006-ntp-setup-add-support-for-gentoo-linux.patch"
-	"${FILESDIR}/0007-raid-setup-add-support-for-gentoo-linux.patch"
-	"${FILESDIR}/0008-prometheus-node_exporter-install-add-support-for-gen.patch"
-	"${FILESDIR}/0009-scylla_setup-add-gentoo-linux-installation-detection.patch"
-	"${FILESDIR}/0010-scylla_setup-refactor-scylla-server-service-setup-wh.patch"
-	"${FILESDIR}/0011-scylla_setup-disable-useless-version-check-for-gento.patch"
-	"${FILESDIR}/0012-scylla_setup-disable-selinux-setup-for-gentoo-linux.patch"
-	"${FILESDIR}/0013-scylla_setup-fix-typo-on-cpu-scaling-messages.patch"
-)
+PATCHES=()
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -143,12 +128,8 @@ src_install() {
 		dosym /usr/lib/scylla/${util} /usr/sbin/${util}
 	done
 
-	if use collectd; then
-		insinto /etc/collectd.d
-		doins dist/common/collectd.d/scylla.conf
-	else
-		sed -e 's/collectd=1/collectd=0/g' -i dist/common/sysconfig/scylla-server || die
-	fi
+	insinto /etc/collectd.d
+	doins dist/common/collectd.d/scylla.conf
 
 	for x in /var/lib/${PN}/{data,commitlog,coredump} /var/lib/scylla-housekeeping /var/log/scylla; do
 		keepdir "${x}"