gentoo resync : 15.01.2020

10 files changed, 11 insertions, 336 deletions

diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 945b4c01bbdd..feeaeac3b0ec 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,24 +1,15 @@
-AUX greenbone-security-assistant-7.0.3-auth.patch 4606 BLAKE2B aa9698aea86c1f0253d4f9ce263c83bce8a440184693ec5e438435517a04a87e9e3df7990522a212e6509b61ee1455e4fb11ccb4aa434c01edb4027c8fb38e2d SHA512 8012de90a92518acd71716790730e7ca736e2b64be026a11fa648b569bfb4229813a39be134efa1b1c09ce394aaeb44db6d31687279a6f5468f7cc97bb1a54ba
-AUX greenbone-security-assistant-7.0.3-memleak.patch 1206 BLAKE2B 1349e2cf9d82fa9bc0b05bb471e4ad8c298a12c6ae0ecdc12a44f686440d5cc1b5f6bab8a7fb97a643e2457e99040da9aaf5f0285bbb6582131af3bda297803d SHA512 5ec8404ae8d8c40dc7d1d4cab7572888dc08cedf9c17e8e95e138b9441c34e5d0eeb24f066d15ef5b69d5da9f3a3bbc70ebb6eaf275763b3ec5583af9265652d
 AUX greenbone-security-assistant-8.0.1-cmakelist.patch 1122 BLAKE2B f675217b1cd2164ca8437a6fda22ef050134b3ace1323b111f3491ef23892b34f4398cd11d663daba7c5a0c2897ca9a736ea22c21eaf265e298df13b7ba1956c SHA512 1d725a6b43730675f0c499b5d27a0abc0d326ff9c5e3eb32da543651065e01e55321ee69ebef43f605f91caa619ae0d2a2386e174a822e0bc37a412f414a5659
 AUX greenbone-security-assistant-8.0.1-node.patch 1706 BLAKE2B a075c37a233679eb175a177e2605dd933b3c3d5440c0ae74075267d8f64d32afe2a7b4ae40b79692fef46020c5a5dd649c5f329ad1b786569219c339ad659043 SHA512 c5bbd495e9b5dd82896db841fde03a72c9937cbb3135123b578cb2dc8f86b8ed57226b7b46fc90e3587a94ca6505c61058669937bba1f6f7ad3d0953cb025ca9
 AUX greenbone-security-assistant-8.0.1-pid.patch 283 BLAKE2B 15f3c15da9cc198a0bb933d867c476d505fc11321026a723b4a2826856439edd6f402e14ce2efd4353de84988da3c7f6b7b30f6a404b9301123205bd73d83e4c SHA512 224c29d800e3bd3a79d9386fdbfff7f9e77f4e4abd750513b7ee2b6c1bafe2294517ae804b8a4e7b62ce015755827b71e8422628e28e184a0d8e58d6973b0b14
 AUX greenbone-security-assistant-8.0.1-reactjs.patch 988 BLAKE2B b2e7929ac17d9bd8f7d2ef964b8ab479245a105a42c7c27cb1c0533014c93335683a465b2e67e324d692a61561a912aea484604cd650e79ebcc64390fb214556 SHA512 6dbff78f70620983ada5918d5ebc06b5a2f1077cffcf8b74fdb217fd7df45648c0b6b06367ca9b894b0106cdc7f4be1c05e926c0b9f5819507a548fc3fc26d84
 AUX greenbone-security-assistant-8.0.1-sbin.patch 361 BLAKE2B dfa390d0545a470c73af5cc24059e09967a9134a9f361ba606450ce046999ba200198b8051b515d6c33361bcc33678037a65c7ba68f97f0ff140f0ce622fcacc SHA512 307ca36d757d6ec6e710b1d4ef14bc55a611f0b3b23eb1cf349faf5be298f3f5a6ba852900c2c9b5f03231627364dba021ce8fa3e4859fcfb65eb9049f18e292
 AUX greenbone-security-assistant-8.0.1-uninstall-snippet.patch 398 BLAKE2B 8f9b4c754e4406d6830c69d029a05a3525bce3553550931424a12710b4b88f37257a8415e7219e2714985bf2ed76134e52e52a867f03c35c675debd5cfb0d540 SHA512 b0e44673687b09421beff5eadd02b86a25d87c531144a7c2ec087f48dda4463588d8c462c3b51431f1b5f69d7241ccb86e1eb702ddc8dfeb1402f2a142b29a4d
-AUX gsa-daemon.conf 1166 BLAKE2B 2611553aa0aa13d105182bd12f7b6f79f94888458aaf142f67111a94bdd3b7c6fb33a8e33844977fb95e09a13d04595ddd5e789624be2eaacbbc78564c05d4ba SHA512 2f085e0b8df0f778b7c9446278d4748b5780abebaa4ac590e1d44280975f22e37d8fe12c2e05b0381391504f42d437597ab4a4880daf20f35315fb4e74753a6d
-AUX gsa.init 634 BLAKE2B 7a99d7bf37475df138acc3e8d3909f91ea4014d29315df8e912b0a3904a1bd7e58f3f527c5e6056d7318f7677f27658a230a37ed6dd2a862f55a8df6377d3668 SHA512 19f8401266923e9c5f86540401c0ac3a04986c442bc0c0b45206b50ff5bfb533291d635d3af91d70e6e4a251b8660815ee4f3beb30ad61e96e9d86b58e285f00
-AUX gsa.logrotate 134 BLAKE2B 56bd0128621688a1b1fc5cb0a96503e60b0a2975bfbe74b4db0853b45356610081996004923bc958b8d71ea8e5add097cc8083ce9cd83af38e87995d9386fc1d SHA512 e6164c4b494d87ad55a9b1120bad2cc8619a623382417e0301738e728c535ea78f89f935807eb7616ae7a17d05942f105a7c76795e636f9bcc672a04e3444149
 AUX gsa.nginx.reverse.proxy.example 3835 BLAKE2B c4ec87cd5f1a0e5aedb93f95c7010a3f19b9123355b24b2899c157a532b020ba192ee6f5a382448b17fe0ff1d8473be6a390e0779d3f8c3963d050d0f5c91775 SHA512 c323f37f4dd1bc4633213f9aede141e2a915344df7aa8e7be043583e6a5415ec8fefea707f1cab29f478423165f3285c629da683515f08d6e046385fb7177751
-AUX gsa.service 641 BLAKE2B 526736f052166e74eca48986609d3a688ba8562a57aee0136ab9d2cea9884e4c17ba8355e3e55cf30fbe6cf93b15d32e54b3a330d814d9116d65ccf8918d59fa SHA512 975d1a02041d25d2e21eefe73de0f083d2bb58e7a0da895ea9455d86941ae6ed2c952b282f05dd48f9706a0c4a883f6b58b9aa2af0b73c54cb91d8f3d703c91a
-AUX gsa.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68
 AUX gsad.init 569 BLAKE2B 8fdfa94dd969e7947e1920c778034bd6db07ccf1be102e69a7c32cda0fb6111b7770d9458b4a86fad25629aba20768b8e6224d04c3d26088a253f665a9773e73 SHA512 806e669529fdaad52cf530df70aaa53889c3947f1dd3b6ec485501dca37fc2383452a7c2877ddca4e23e344f5bef612bbdbee8ca9921f32c907cccb6ced61a28
 AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e16f6e93c4c55b01bf668c57b0151555401d3bc989f3b8e5a4cb872f1b2cbae691a40dd590facb40 SHA512 ab43f8c54cf72e2a800bdcf4daebeabfa18a7ef49f098d65e70f97ccab3d36606c353b82b8fd6b4f2cecd289d36f48f805a5c34cba86f8e8c61bf074b0afe695
 AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476
-DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
 DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
 DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
-EBUILD greenbone-security-assistant-7.0.3-r1.ebuild 2083 BLAKE2B 5ae58fee712384339facec71085f9d1f8b5344605cfaa9187041d1e27cfc92276a4dbe2f56ffef3ae6317339b04da680dd1a702d49ce9e710cd7c10bb89f04bd SHA512 03adc25258afd8be87e5565f02712069513e03b3be1cb0c31b4468fdf148eea6dd9a30a43be8a4ab5460ebe1ec71ffb4ec334ba80377db88e5eca864488bf97a
-EBUILD greenbone-security-assistant-8.0.1.ebuild 3367 BLAKE2B 76811d4d6b361238845beba2a41996eec4552b07f3705389182228210508a1d88dbf9b29f01c6db25664de6e9ec6834448a88b0a2423bd5c3bfcb5e8e4ae9330 SHA512 d5ecb70f8b6b3567b619908ab6a23a54662e0572789869441238dcd566d0610763afe9c61a03e4c10e27d25673dedd66a20b65e8277adb0db82a33b67112e544
+EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3249 BLAKE2B 4b5d19930f9f1156961b4f9fb82e8393193d752aea82212f3f5c7ad3044bc9a1b6a7ac5cfe5f6f7bed174a7092caf28435ab74a2a4e994066d5cde73a9ab943d SHA512 50d53ec5df7ec44cf5ee483072903a0885b84a5c6c5fba1d8e1dd76450f14782479599096ab61bc7b4d70aa4ae95454fe088e731d94f04b71918cdf43d2ac892
 MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
deleted file mode 100644
index cce885e10e01..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-auth.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:22:19.297954361 +0300
-+++ gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:27:57.690214371 +0300
-@@ -1366,7 +1366,8 @@
-           || (strstr (param_name, "_id")
-                 == param_name + strlen (param_name) - strlen ("_id"))
-           || (strcmp (param_name, "name") == 0
--              && strcasecmp (prev_action, "Run Wizard") == 0)
-+              && (strcasecmp (prev_action, "Run Wizard") == 0
-+                  || strcasecmp (next_cmd, "auth_settings") == 0))
-           || (strcmp (param_name, "get_name") == 0
-               && strcasecmp (next_cmd, "wizard_get") == 0))
-         {
-@@ -25984,7 +25976,7 @@
- 
-   html = response_from_entity (connection, credentials, params, entity,
-                                (no_redirect && strcmp (no_redirect, "0")),
--                               NULL, NULL,
-+                               NULL, "auth_settings",
-                                NULL, "modify_auth",
-                                "Save Authentication Configuration",
-                                response_data);
---- gsa-7.0.3/src/html/classic/js/greenbone.js  2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/html/classic/js/greenbone.js  2019-02-02 03:40:37.162714538 +0300
-@@ -1559,6 +1559,9 @@
-           if (reload === 'next') {
-             reload_next(response);
-           }
-+          else if (reload === 'window') {
-+            location.reload();
-+          }
-         },
-         function(jqXHR) {
-           if (jqXHR.status == 0 && jqXHR.readyState == 0) {
---- gsa-7.0.3/src/html/classic/omp.xsl	2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/html/classic/omp.xsl	2019-02-02 03:44:28.470599715 +0300
-@@ -36775,7 +36822,8 @@
- <!-- AUTHENTICATION DESCRIPTION -->
- 
- <xsl:template match="group" mode="ldapauth">
--  <div class="section-box" id="ldap-box">
-+  <div class="section-box ajax-post" id="ldap-box"
-+      data-button="form #save_button" data-reload="window">
-     <form action="/omp" method="post" enctype="multipart/form-data">
-       <input type="hidden" name="token" value="{/envelope/token}"/>
-       <input type="hidden" name="cmd" value="save_auth"/>
-@@ -36784,6 +36832,15 @@
-       <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
-       <!-- group name is e.g. of method:ldap -->
-       <input type="hidden" name="group" value="{@name}"/>
-+      <!-- Auth type name for next page -->
-+      <input type="hidden" name="name" value="ldap"/>
-+
-+      <div class="error-dialog">
-+        <div class="text-center">
-+          <xsl:value-of select="gsa:i18n ('LDAP authentication config could not be modified.')"/>
-+        </div>
-+      </div>
-+
-       <table class="gbntable">
-         <tr class="gbntablehead2">
-           <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
-@@ -36838,7 +36895,8 @@
-         </tr>
-         <tr>
-           <td colspan="2" style="text-align:right;">
--            <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
-+            <input type="submit" name="submit" id="save_button"
-+                   value="{gsa:i18n ('Save')}"/>
-           </td>
-         </tr>
-       </table>
-@@ -36847,7 +36905,8 @@
- </xsl:template>
- 
- <xsl:template match="group" mode="radiusauth">
--  <div class="section-box" id="radius-box">
-+  <div class="section-box ajax-post" id="radius-box"
-+      data-button="form #save_button" data-reload="window">
-     <form action="/omp" method="post" enctype="multipart/form-data">
-       <input type="hidden" name="token" value="{/envelope/token}"/>
-       <input type="hidden" name="cmd" value="save_auth"/>
-@@ -36856,6 +36915,15 @@
-       <input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
-       <!-- group name is e.g. of method:radius_connect -->
-       <input type="hidden" name="group" value="{@name}"/>
-+      <!-- Auth type name for next page -->
-+      <input type="hidden" name="name" value="radius"/>
-+
-+      <div class="error-dialog">
-+        <div class="text-center">
-+          <xsl:value-of select="gsa:i18n ('Radius authentication config could not be modified.')"/>
-+        </div>
-+      </div>
-+
-       <table class="gbntable">
-         <tr class="gbntablehead2">
-           <td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
-@@ -36890,7 +36958,8 @@
-           </tr>
-         <tr>
-           <td colspan="2" style="text-align:right;">
--            <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
-+            <input type="submit" name="submit" id="save_button"
-+                   value="{gsa:i18n ('Save')}"/>
-           </td>
-         </tr>
-       </table>
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
deleted file mode 100644
index 5132e344a798..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-7.0.3-memleak.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- gsa-7.0.3/src/gsad_omp.c	2018-03-28 16:23:57.000000000 +0300
-+++ gsa-7.0.3/src/gsad_omp.c	2019-02-02 03:12:16.617046562 +0300
-@@ -7737,16 +7738,21 @@
-   g_string_append (xml, command_escaped);
-   g_free (command_escaped);
- 
-+  response = NULL;
-   ret = omp (connection, credentials, &response, &entity, response_data,
-              command->str);
-   g_string_free (command, TRUE);
-+
-+  if (ret)
-+    {
-+      free_entity (entity);
-+      g_string_free (xml, TRUE);
-+    }
-+
-   switch (ret)
-     {
-       case 0:
-         break;
--      case -1:
--        /* 'omp' set response. */
--        return response;
-       case 1:
-         response_data->http_status_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
-         return gsad_message (credentials,
-@@ -7770,10 +7776,14 @@
-                              "/omp?cmd=get_tasks", response_data);
-     }
- 
-+  if (omp_success (entity) == 0)
-+    set_http_status_from_entity (entity, response_data);
-   g_string_append (xml, response);
- 
-   g_string_append (xml, "</get_aggregate>");
- 
-+  free_entity (entity);
-+  g_free (response);
-   return xsl_transform_omp (connection, credentials, params,
-                             g_string_free (xml, FALSE), response_data);
- }
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
deleted file mode 100644
index 2c9a62eef811..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa-daemon.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# OpenVAS Security Assistant command args
-# man page --> https://www.mankier.com/8/gsad
-
-# e.g. --foreground | e.g. --no-redirect -- > Don't listen port 80 anymore
-OPENVAS_SECURITY_ASSISTANT_OPTIONS="--no-redirect"
-
-# WebUI adress
-OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS="--listen=127.0.0.1"
-
-# WebUI Port
-OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT="--port=9392"
-
-# WebUI Manager Address
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS="--mlisten=127.0.0.1"
-
-# WebUI Manager Port
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT="--mport=9390"
-
-# TLS Settings
-OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL"
-
-# If you use reverse proxy you must set OPENVAS_REVERSE_PROXY daemon arg
-# otherwise you will get the below error.
-# --------------------------------------------------------------- 
-# The request contained an unknown or invalid Host header. 
-# If you are trying to access GSA via its hostname or a proxy, 
-# make sure GSA is set up to allow it.
-# ---------------------------------------------------------------
-
-# Reverse Proxy Settings ( e.g. --allow-header-host=subdomain.example.com )
-OPENVAS_REVERSE_PROXY="--allow-header-host="
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.init b/net-analyzer/greenbone-security-assistant/files/gsa.init
deleted file mode 100644
index 2b4636422422..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="Greenbone Security Assistant Daemon"
-command="/usr/sbin/gsad"
-command_args="${OPENVAS_SECURITY_ASSISTANT_OPTIONS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS} ${OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT} ${OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES} ${OPENVAS_REVERSE_PROXY}"
-pidfile="/var/run/gsad.pid"
-command_background="true"
-
-depend() {
-	after bootmisc
-	need localmount net openvas-scanner gvmd
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.logrotate b/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
deleted file mode 100644
index 79e54e854319..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-# logrotate for openvas security agent
-/var/log/openvas/gsad.log {
-	daily
-	rotate 7
-	compress
-	missingok
-	notifempty
-	sharedscripts
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.service b/net-analyzer/greenbone-security-assistant/files/gsa.service
deleted file mode 100644
index bc8c1d9e285c..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=OpenVAS Manager
-After=network.target
-After=openvas-scanner.service
-After=gvmd.service
-Wants=gvmd.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/openvas/sysconfig/gsa-daemon.conf
-ExecStart=/usr/sbin/gsad $OPENVAS_SECURITY_ASSISTANT_OPTIONS $OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS $OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT $OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES $OPENVAS_REVERSE_PROXY
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=mixed
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
deleted file mode 100644
index 18e820caec1b..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
deleted file mode 100644
index 6fc3cbaf5271..000000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils systemd
-MY_PN="gsa"
-
-DESCRIPTION="Greenbone Security Assistant for OpenVAS"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-9.0.3
-	net-libs/gnutls:=[tools]
-	net-libs/libmicrohttpd[messages]
-	extras? ( dev-python/polib )"
-
-RDEPEND="
-	${DEPEND}
-	~net-analyzer/openvas-scanner-5.1.3
-	>=net-analyzer/openvas-manager-7.0.3
-	extras? ( dev-texlive/texlive-latexextra )"
-
-BDEPEND="
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  sys-devel/gettext
-	)"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-memleak.patch"
-	"${FILESDIR}/${P}-auth.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	if use extras; then
-		doxygen -u "$S"/doc/Doxyfile_full.in || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/sysconfig
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-
-	insinto /etc/openvas/reverse-proxy
-	doins "${FILESDIR}"/gsa.nginx.reverse.proxy.example
-
-	newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${MY_PN}.tmpfiles.d" ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
index 6177f8f13836..ed0bcabf18ff 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd toolchain-funcs
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 MY_PN="gsa"
 MY_DN="gsad"
@@ -25,11 +25,10 @@ DEPEND="
 	dev-libs/libxslt
 	>=net-analyzer/gvm-libs-10.0.1
 	net-libs/gnutls:=
-	net-libs/libmicrohttpd[messages]"
+	net-libs/libmicrohttpd"
 
 RDEPEND="
 	${DEPEND}
-	!~net-analyzer/greenbone-security-assistant-7.0.3
 	~net-analyzer/openvas-scanner-6.0.1
 	>=net-analyzer/gvmd-8.0.1"
 
@@ -64,7 +63,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# We will use pre-generated npm stuff.
 	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
 	# Update .yarnrc accordingly.
@@ -93,21 +92,21 @@ src_configure() {
 	# Add release hardening flags for 8.0.1
 	append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /etc/gvm/sysconfig
 	doins "${FILESDIR}/${MY_DN}-daemon.conf"