gentoo resync : 28.04.2021

9 files changed, 525 insertions, 242 deletions

diff --git a/www-apps/liquid_feedback_frontend/Manifest b/www-apps/liquid_feedback_frontend/Manifest
index 9bdddb52c0dd..4f2b1a33e519 100644
--- a/www-apps/liquid_feedback_frontend/Manifest
+++ b/www-apps/liquid_feedback_frontend/Manifest
@@ -1,10 +1,5 @@
-AUX lqfb-apache.conf 1433 BLAKE2B 2dd199afd8cf2fcabb480bbb309fba56a0b65fefe82462d15f669f2aa00590b516427269894389c6641daa0aff509e57047bdeaca4d6bbb853072b24fc116ede SHA512 732869250eedef711f5513090c2b756da8242929cbe027aa90abb015b4a0d473b995cc09d6ae5744a4933e7c8db717d76503ece410eee98e8357116c7c6ef9b5
-AUX lqfb.example.com.conf 624 BLAKE2B cca8acf615ad52bc342d2c9d831734a6bfb54428e7d41b86c68e1535168cfe99603cf2a8a2439cef1bcf2921c507fb7b5460236d95f479d2b0be629f6323104a SHA512 2e55fa22f7217aad6a83b15ceb723872e9b506b0199d224ff8a08592ce884341354a40c9b2ae6d4f9fb62d6fff80d6c77954b0d1056f18b44831c3d5bb705d4c
-AUX myconfig.lua 904 BLAKE2B 3a15ac09495c124fa73f15e533e91f9bda09a9c3194de135e329340b934e3ec1a0c28dd7f57e893057bbf8e7513311aa1e28ec331812d896b5551fdab3d709af SHA512 acd21b4e4ae5a43ed8d31fdb13a7531f43df78897792987cf1eeb6b0f85fae30dd61ce96ac6fcc383f857093739ecfe92de84cdf21a8210218cd4cc4801769c6
-AUX postinstall-en.txt 2550 BLAKE2B 10f43b315cd156d74e3e70a8af1bbcd2a7a2e1835409e0ef4af6007ee7f95814bfb4863c9660f3f8bfc33bcd6b5988339462063a7102555a2ea772dcb5705861 SHA512 a0c2ebcffffde5e15645efa753d567b75622f65481837a9c3613cad586166e4ba7e2a5d988e7ca2735b3a5e4de971ef68a7f0f73626c4d813ff58e8ef726efe8
-DIST liquid_feedback_frontend-italian-2.2.7.tar.gz 7670 BLAKE2B 8131613849efdea1eaa1eda4f5620d7418d6b32c0f57b0aebb07c7dbe17afda2eee814733eada0656a159a93dda97a5a21e17db71baf3ca84e708caf502a4247 SHA512 63cfcb4a565fa570777c2f3d2dcec2e98f16415ad9f8a6d62076f4e2cdf0ddae95610688b6b7751a865344acb7b65f78e7cb1ae4103b24dacf63e3e346405918
-DIST liquid_feedback_frontend-v2.2.7.tar.gz 362509 BLAKE2B 980e261ac9bddfb0f87757457fe58e93481e6d56dc0199b9fc72308e094aec21730f6d901f2e5c1b18a7f5993d1704cc91f64870c16c6215cbbf806095aabe12 SHA512 aa8c99e53c329dbf4659dabe617938d63b2aa42bab99ff4e200d4e15be8ed8ef5f64a71293fa796adde47525d1a76ece3b04cff982474eb2307a3fcd4f269d78
-DIST liquid_feedback_frontend-v3.0.6.tar.gz 497521 BLAKE2B a9e7e7944b418a707a459093b41798818644e2d8aed47a48808c2bf7800acdcde61a04e07483dbb387264df2236b1b02f2410cb34f62bdec6244405db0cf3474 SHA512 d283d277cf6836c53398480c566158481fc65400e128bc4817975fd39c41e6e56b17f7f789a74b1b2a89f84aaf315101e9aa86a474c1817362443d03610fe6e9
-EBUILD liquid_feedback_frontend-2.2.7.ebuild 1582 BLAKE2B e95f59e5b9aaa346e1eb84ce3394511ed649503a0161c522ee015c016c4713d64a123210d0ced632371de7d913f318af4f8780af30df4c384137473a2c3454e0 SHA512 5e3f1683ec2e9287d27b91336f691628ca41430b0198a989e13114bdb0d8c34cb6d81285ee7cc359ebea941e035c1a7978cb9e3541ded240fa27d389678d7865
-EBUILD liquid_feedback_frontend-3.0.6.ebuild 1100 BLAKE2B f01ee9844d42cca1a3543e46d1186c42b416ce650222527aa911514d4f82f17403e8c3be779bdeeaccccac2c3bfd91261ed3048c2ff87d935aa0564b928337fe SHA512 b6cc541e266eed0898ea9a28424b981ac2a88f63da0b8ceca08e42661d6c51b8582f59b165567c33bbb77cd47cd97a0360edd84eb161f505ae7cfd78c7ce3f7e
+AUX liquid_feedback.initd 480 BLAKE2B 1deaec9df8842f3f99a6e2f79386477a6b773369290e1f6876bfc505ccde43f0c787c73c03148e62a8741650c73bb06fafa926107fc9880fd322d73fa30d9a3c SHA512 25c426f3cfd8dc641c284a85e5833eb1c57d39b479305bdc2ad36f9092e7e620dd7bbf0e6096cd8b70a28dac7bfde55074b703c979dadafb0a3764fc6b936c12
+AUX myconfig-3.lua 17462 BLAKE2B d045bb6846ffbbc856938b09171e4ce3f4cac152bbae30b252bf101ed46038608fb168b10b9b323b991c577e3befab957ef1f4abcd84573a2b52920ad3ad2e76 SHA512 f03fd6c84a0d9947d8c479ae0b21303bdac2b20263b9fb80f64572279ca3666750fa92e8cf2dfa8bcedccf36e296f0c66a57200f0b182fbfb84d0b3afd1d364e
+DIST liquid_feedback_frontend-v3.2.1.tar.gz 499832 BLAKE2B 6d9ead85fa7e47c04c4169b85ffa119737a798d94b236dbd7d11ae4c5d38cc072a71a45b52e250effa62dac65c3ebcd723061e395b05d9f31d0bb01f8e82f9b9 SHA512 1b5e5fc390a2a705c99145ea36556f9b14de4c052c4673e2c7f12148efe485feaf1a91781c016015c41465559204e906e3cad78e37f41289abd5ca27c4257bb3
+EBUILD liquid_feedback_frontend-3.2.1.ebuild 1140 BLAKE2B be95934e48c53174a1974cbf43e72861cfdfc4c3b33fa481aee010fa9c6892a65ed69a984b6bc0fd940d293bb14dea44143b86d92dbe34863706fdd83d86fc11 SHA512 cf46935530f1597feab48d238a925ff1f14c9ac3366ed8c9f119f5b8f434bfaed6365ceca355f76aad207ec26f189d516282ae0ff7706a76c7a8ec24b53243a5
 MISC metadata.xml 699 BLAKE2B 12bf221f2c88a9f60051a1e91e00d855a12c937384470c92272f0ecd195f0a0cbb921ff401932a77a4304f02ed30f8afc9339035eaa6995c932db04b7529e06a SHA512 5a9961a632ba7d64fa23d2e6d43cff15cdd4b0fae14681cf7a0c809cdaa527cc6a1e5dcde7d7d9f26cf824cd18599f39345e5592064c4ebbfa29406256117038
diff --git a/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd b/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd
new file mode 100644
index 000000000000..0fe14172b52f
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/liquid_feedback.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="liquid feedback daemon"
+description="Liquid Feedback Frontend"
+command=/usr/bin/moonbridge
+command_args="-l /var/log/liquid_feedback/lqfb.log /usr/lib/webmcp/bin/mcp.lua /usr/lib/webmcp /var/lib/liquid_feedback_frontend main myconfig-3"
+pidfile=/run/lqfb.pid
+command_user="apache:apache"
+command_background=true
+
+depend() {
+  need net
+  need postgresql
+}
diff --git a/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf b/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf
deleted file mode 100644
index 3f1924b6ae3a..000000000000
--- a/www-apps/liquid_feedback_frontend/files/lqfb-apache.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-RewriteEngine on
-
-RewriteRule ^/$ /lf/ [R]
-
-RewriteRule ^/lf/static/(.*)$ /lf/static/$1 [L,PT]
-
-RewriteCond %{QUERY_STRING} (.*)?
-RewriteRule ^/lf/$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=0&_webmcp_module=index&_webmcp_view=index&%1 [PT]
-
-RewriteCond %{QUERY_STRING} (.*)?
-RewriteRule ^/lf/([^/]+)/$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_view=index&%1 [PT]
-
-RewriteCond %{QUERY_STRING} (.*)?
-RewriteRule ^/lf/([^/]+)/([^/\.]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_action=$2&%1 [PT]
-
-RewriteCond %{QUERY_STRING} (.*)?
-RewriteRule ^/lf/([^/]+)/([^/\.]+)\.([^/]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=1&_webmcp_module=$1&_webmcp_view=$2&_webmcp_suffix=$3&%1 [PT]
-
-RewriteCond %{QUERY_STRING} (.*)?
-RewriteRule ^/lf/([^/]+)/([^/]+)/([^/\.]+)\.([^/]+)$ /lf/webmcp-wrapper.lua?_webmcp_urldepth=2&_webmcp_module=$1&_webmcp_view=$2&_webmcp_id=$3&_webmcp_suffix=$4&%1 [PT]
-
-Alias /lf/static /var/lib/liquid_feedback_frontend/static
-
-ScriptAlias /lf/ /usr/lib/webmcp/framework/cgi-bin/
-
-<Directory "/var/lib/liquid_feedback_frontend/static">
-  AllowOverride None
-  Order allow,deny
-  Allow from all
-</Directory>
-
-<Directory "/usr/lib/webmcp/framework/cgi-bin">
-  AllowOverride None
-  Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-  Order allow,deny
-  Allow from all
-</Directory>
-
-<Location /lf>
-  SetEnv WEBMCP_APP_BASEPATH '/var/lib/liquid_feedback_frontend'
-</Location>
diff --git a/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf b/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf
deleted file mode 100644
index 149084138683..000000000000
--- a/www-apps/liquid_feedback_frontend/files/lqfb.example.com.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<VirtualHost *:80>
-  ServerName lqfb.example.com
-
-  RewriteEngine On
-  RewriteRule (.*) https://lqfb.example.com%{REQUEST_URI}
-</VirtualHost>
-
-<VirtualHost *:443>
-  ServerName lqfb.example.com
-
-  SSLEngine on
-  SSLProtocol all -SSLv2
-  SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM
-  SSLCertificateFile /etc/ssl/apache2/wildcard/server.crt
-  SSLCertificateKeyFile /etc/ssl/apache2/wildcard/server.key
-
-  include /usr/share/liquid_feedback_frontend/lqfb-apache.conf
-
-  <Location /lf>
-    SetEnv WEBMCP_CONFIG_NAME 'myconfig'
-  </Location>
-
-  ErrorLog /var/log/apache2/lqfb.example.com-error.log
-</VirtualHost>
diff --git a/www-apps/liquid_feedback_frontend/files/myconfig-3.lua b/www-apps/liquid_feedback_frontend/files/myconfig-3.lua
new file mode 100644
index 000000000000..1a1c51f2ac39
--- /dev/null
+++ b/www-apps/liquid_feedback_frontend/files/myconfig-3.lua
@@ -0,0 +1,487 @@
+-- ========================================================================
+-- MANDATORY (MUST BE CAREFULLY CHECKED AND PROPERLY SET!)
+-- ========================================================================
+
+-- Name of this instance, defaults to name of config file
+-- ------------------------------------------------------------------------
+config.instance_name = "Instance name"
+
+
+-- Information about service provider (HTML)
+-- ------------------------------------------------------------------------
+config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
+
+
+-- A HTML formatted text the user has to accept while registering
+-- ------------------------------------------------------------------------
+config.use_terms = "<h1>Terms of Use</h1><p>Insert terms here</p>"
+
+
+-- Checkbox(es) the user has to accept while registering
+-- ------------------------------------------------------------------------
+--[[
+config.use_terms_checkboxes = {
+  {
+    name = "terms_of_use_v1",
+    html = "I accept the terms of use.",
+    not_accepted_error = "You have to accept the terms of use to be able to register."
+  },
+  {
+    name = "extra_terms_of_use_v1",
+    html = "I accept the extra terms of use.",
+    not_accepted_error = "You have to accept the extra terms of use to be able to register."
+  }
+}
+--]]
+  
+-- Absolute base url of application
+-- ------------------------------------------------------------------------
+config.absolute_base_url = "http://example.com/"
+config.localhost = false
+
+
+-- Connection information for the LiquidFeedback database
+-- ------------------------------------------------------------------------
+config.database = { engine='postgresql', dbname='liquid_feedback', user='liquid_feedback', password='xxx' }
+
+
+-- Location of the rocketwiki binaries
+-- ------------------------------------------------------------------------
+config.enforce_formatting_engine = "markdown2"
+config.formatting_engines = {
+  { id = "markdown2",
+    name = "python-markdown2",
+    executable = "markdown2",
+    args = {'-s', 'escape', '-x', 'nofollow,wiki-tables'},
+    remove_images = true
+  },
+--  { id = "markdown_py",
+--    name = "Python Markdown",
+--    executable = "markdown_py",
+--    args = {'-s', 'escape', '-x', 'extra', '-x', 'nl2br', '-x', 'sane_lists'},
+--    remove_images = true
+--  },
+--  { id = "rocketwiki",
+--    name = "RocketWiki",
+--    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb"
+--  },
+--  { id = "compat",
+--    name = "Traditional WIKI syntax",
+--    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
+--  },
+}
+
+
+-- Public access level
+-- ------------------------------------------------------------------------
+-- Available options:
+-- "none" 
+--     -> Closed user group, no public access at all
+--        (except login/registration/password reset)
+-- "anonymous"
+--     -> Shows only initiative/suggestions texts and aggregated
+--        supporter/voter counts
+-- "authors_pseudonymous" 
+--     -> Like anonymous, but shows screen names of authors
+-- "all_pseudonymous" 
+--     -> Show everything a member can see, except profile pages
+-- "everything"
+--     -> Show everything a member can see, including profile pages
+-- ------------------------------------------------------------------------
+config.public_access = "none"
+
+
+
+-- ========================================================================
+-- OPTIONAL
+-- Remove leading -- to use a option
+-- ========================================================================
+
+-- Disable registration
+-- ------------------------------------------------------------------------
+-- Available options:
+-- false: registration is enabled (default)
+-- true: registration is disabled
+-- ------------------------------------------------------------------------
+-- config.disable_registration = true
+
+
+-- List of enabled languages, defaults to available languages
+-- ------------------------------------------------------------------------
+-- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu', 'it', 'ka', 'nl', 'zh-Hans', 'zh-TW' }
+
+
+-- Default language, defaults to "en"
+-- ------------------------------------------------------------------------
+-- config.default_lang = "en"
+
+
+-- after how long is a user considered inactive and the trustee will see warning,
+-- notation is according to postgresql intervals, default: no warning at all
+-- ------------------------------------------------------------------------
+-- config.delegation_warning_time = '6 months'
+
+
+-- after which time a user is advised (_soft) or forced (_hard) to check
+-- unit and area delegations. default: no check at all
+-- ------------------------------------------------------------------------
+-- config.check_delegations_interval_hard = "6 months"
+-- config.check_delegations_interval_soft = "3 months"
+
+
+-- default option when checking delegations
+-- available options: "confirm", "revoke" and "none", default: "confirm"
+-- ------------------------------------------------------------------------
+-- config.check_delegations_default = "confirm"
+
+
+-- Prefix of all automatic mails, defaults to "[Liquid Feedback] "
+-- ------------------------------------------------------------------------
+-- config.mail_subject_prefix = "[LiquidFeedback] "
+
+
+-- Sender of all automatic mails, defaults to system defaults
+-- ------------------------------------------------------------------------
+-- config.mail_envelope_from = "liquidfeedback@example.com"
+-- config.mail_from = { name = "LiquidFeedback", address = "liquidfeedback@example.com" }
+-- config.mail_reply_to = { name = "Support", address = "support@example.com" }
+
+
+-- Template for digest emails
+-- #{name} will be replaced by member screen name
+-- #{digest} will be replaced with the digest content
+-- ------------------------------------------------------------------------
+-- config.notification_digest_template = [[
+-- Hello #{name},
+-- 
+-- this is your personal digest.
+-- 
+-- #{digest}
+-- ]]
+
+
+-- Configuration of password hashing algorithm (defaults to "crypt_sha512")
+-- ------------------------------------------------------------------------
+-- config.password_hash_algorithm = "crypt_sha512"
+-- config.password_hash_algorithm = "crypt_sha256"
+-- config.password_hash_algorithm = "crypt_md5"
+
+
+-- Number of rounds for crypt_sha* algorithms, minimum and maximum
+-- (defaults to minimum 10000 and maximum 20000)
+-- ------------------------------------------------------------------------
+-- config.password_hash_min_rounds = 10000
+-- config.password_hash_max_rounds = 20000
+
+
+-- Supply custom url for avatar/photo delivery
+-- ------------------------------------------------------------------------
+-- config.fastpath_url_func = nil
+
+
+-- Local directory for database dumps offered for download
+-- ------------------------------------------------------------------------
+-- config.download_dir = nil
+
+
+-- Special use terms for database dump download
+-- ------------------------------------------------------------------------
+-- config.download_use_terms = "=== Download use terms ===\n"
+
+
+-- Use custom image conversion, defaults to ImageMagick's convert
+-- ------------------------------------------------------------------------
+--config.member_image_content_type = "image/jpeg"
+--config.member_image_convert_func = {
+--  avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
+--  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
+--}
+
+
+-- Display a html formatted public message of the day
+-- ------------------------------------------------------------------------
+-- config.motd_public = "<h1>Message of the day (public)</h1><p>The MOTD is formatted with HTML</p>"
+
+
+-- Display a html formatted internal message of the day
+-- ------------------------------------------------------------------------
+-- config.motd_intern = "<h1>Message of the day (intern)</h1><p>The MOTD is formatted with HTML</p>"
+
+
+-- Integration of Etherpad, disabled by default
+-- ------------------------------------------------------------------------
+--config.etherpad = {
+--  base_url = "http://example.com:9001/",
+--  api_base = "http://localhost:9001/",
+--  api_key = "mysecretapikey",
+--  group_id = "mygroupname",
+--  cookie_path = "/"
+--}
+
+
+-- Free timings
+-- ------------------------------------------------------------------------
+-- This example expects a date string entered in the free timing field
+-- by the user creating a poll, interpreting it as target date for then
+-- poll and splits the remaining time at the ratio of 4:1:2
+-- Please note, polling policies never have an admission phase
+-- The available_func is optional, if not set any target date is allowed
+
+--[[
+config.free_timing = {
+  calculate_func = function(policy, timing_string)
+    local function interval_by_seconds(secs)
+      local secs_per_day = 60 * 60 * 24
+      local days
+      days = math.floor(secs / secs_per_day)
+      secs = secs - days * secs_per_day
+      return days .. " days " .. secs .. " seconds"
+    end
+    local target_date = parse.date(timing_string, atom.date)
+    if not target_date then
+      return false
+    end
+    local target_timestamp = target_date.midday
+    local now = atom.timestamp:get_current()
+    trace.debug(target_timestamp, now)
+    local duration = target_timestamp - now
+    if duration < 0 then
+      return false
+    end
+    return {
+      discussion = interval_by_seconds(duration / 7 * 4),
+      verification = interval_by_seconds(duration / 7 * 1),
+      voting = interval_by_seconds(duration / 7 * 2)
+    }
+  end,
+  available_func = function(policy)
+    return { 
+      { name = "End of 2013", id = '2013-12-31' },
+      { name = "End of 2014", id = '2014-12-31' },
+      { name = "End of 2015", id = '2015-12-31' }
+    }
+  end
+}
+--]]
+
+-- Configuration of lf4rcs
+-- ------------------------------------------------------------------------
+-- config.lf4rc = {}
+
+-- Example configuration for controlling a Git repository
+--[[
+config.lf4rcs.git = {
+  
+  render_draft_reference = function(url, draft)
+    if not draft.external_reference then return end
+    ui.tag{ content = _"Changeset:" }
+    slot.put(" ")
+    ui.link{
+      text = draft.external_reference,
+      external = url .. ";a=commit;h=" .. draft.external_reference
+    }
+  end,
+  
+  get_remote_user = function()
+    return os.getenv("REMOTE_USER")
+  end,
+  
+  get_branches = function(path, exec)
+    local branches = {}
+    for line in io.lines() do
+      local oldrev, newrev, branch = string.match(line, "([^ ]+) ([^ ]+) refs/heads/(.+)")
+      if not branch then
+        return nil, "unexpected format from git hook environment"
+      end
+      branches[branch] = { newrev }
+    end
+    return branches
+  end,
+  
+  commit = function(path, exec, branch, target_node_id, close_message, merge_message)
+    if merge_message then
+      exec("git", "-C", path, "checkout", "-f", "master")
+      exec("git", "-C", path, "merge", target_node_id, "-m", merge_message)
+      exec("git", "-C", path, "push", "origin", "master")
+    end
+  end
+
+}
+
+-- Example configuration for controlling a Mercurial repository
+config.lf4rcs.hg = {
+
+  working_branch_name = "work",
+
+  render_draft_reference = function(url, draft)
+    if not draft.external_reference then return end
+    ui.tag{ content = _"Changeset graph:" }
+    slot.put(" ")
+    ui.link{
+      text = draft.external_reference,
+      external = url .. "/graph/" .. draft.external_reference
+    }
+  end,
+  
+  get_remote_user = function()
+    return os.getenv("REMOTE_USER")
+  end,
+  
+  get_branches = function(path, exec)
+    local first_node_id = os.getenv("HG_NODE")
+    if not first_node_id then
+      return nil, "internal error, no first node ID available"
+    end
+    local hg_log = exec(
+      "hg", "log", "-R", path, "-r", first_node_id .. ":", "--template", "{branches}\n"
+    )
+    local branches = {}
+    for branch in hg_log:gmatch("(.-)\n") do
+      if branch == "" then branch = "default" end
+      if not branches[branch] then
+        branches[branch] = {}
+        local head_lines = exec(
+          "hg", "heads", "-R", path, "--template", "{node}\n", branch
+        )
+        for node_id in string.gmatch(head_lines, "[^\n]+") do
+          table.insert(branches[branch], node_id)
+        end
+      end
+    end
+    return branches
+  end,
+
+  extra_checks = function(path, exec)
+    local result = exec("hg", "heads", "-t", "-c")
+    for branch in string.gmatch(result, "[^\n]+") do
+      if branch == lf4rcs.config.hg.working_branch_name then
+        return nil, "open head found for branch " .. lf4rcs.config.hg.working_branch_name
+      end
+    end
+    return true
+  end,
+
+  commit = function(path, exec, branch, target_node_id, close_message, merge_message)
+    exec("hg", "up", "-R", path, "-C", "-r", target_node_id)
+    exec("hg", "commit", "-R", path, "--close-branch", "-m", close_message)
+    if merge_message then
+      exec("hg", "up", "-R", path, "-C", "-r", "default")
+      exec("hg", "merge", "-R", path, "-r", "tip")
+      exec("hg", "commit", "-R", path, "-m", merge_message)
+    end
+  end
+  
+}
+
+-- Grace period after creating an initiative for pushing changes during verification phase
+-- disabled by default (nil), use PostgreSQL interval notation
+-- config.lf4rcs.push_grace_period = nil
+
+lf4rcs.init()
+--]]
+
+-- External references
+-- ------------------------------------------------------------------------
+-- Rendering of external references
+
+--[[
+config.render_external_reference = {
+  draft = function(draft, wrapper)
+    wrapper(function()
+      ui.tag{ content = draft.external_reference)
+    end)
+  end,
+  initiative = function(initiative, wrapper)
+    wrapper(function()
+      ui.tag{ content = initiative.external_reference)
+    end)
+  end
+end
+--]]
+
+-- Admin logger
+-- ------------------------------------------------------------------------
+-- Logging administrative activities
+-- disabled by default
+
+--[[
+config.admin_logger = function(params)
+
+  local adminid = app.session.member_id
+  local adminname = app.session.member.name
+  local url = params._webmcp_path
+  
+  -- do something (e.g. calling 'logger' via extos.pfilter)
+
+end
+--]]
+
+
+-- Network interface to bind to
+-- ------------------------------------------------------------------------
+-- Available options:
+-- true: bind to localhost (default)
+-- false: bind to all interface
+-- ------------------------------------------------------------------------
+-- config.localhost = true
+
+
+-- Network port to bind to
+-- ------------------------------------------------------------------------
+-- config.port = 8080
+
+
+-- Serving content via IPV6
+-- ------------------------------------------------------------------------
+-- Available options:
+-- nil or false: do not serve via IPv6 (default)
+-- true: serve via IPv6
+-- ------------------------------------------------------------------------
+-- config.ipv6 = false
+
+
+-- Application server fork configuration
+-- ------------------------------------------------------------------------
+-- config.fork = {
+--   pre = 2,            -- desired number of spare (idle) processes
+--   min = 4,            -- minimum number of processes
+--   max = 128,          -- maximum number of processes (hard limit)
+--   delay = 0.125,      -- delay (seconds) between creation of spare processes
+--   error_delay = 2,    -- delay (seconds) before retry of failed process creation
+--   exit_delay = 2,     -- delay (seconds) between destruction of excessive spare processes
+--   idle_timeout = 900, -- idle time (seconds) after a fork gets terminated (0 for no timeout)
+--   memory_limit = 0,   -- maximum memory consumption (bytes) before process gets terminated
+--   min_requests = 50,  -- minimum count of requests handled before fork is terminated
+--   max_requests = 100  -- maximum count of requests handled before fork is terminated
+-- }
+
+
+-- HTTP server options
+-- ------------------------------------------------------------------------
+-- http_options = {
+--   static_headers            = {}            -- string or table of static headers to be returned with every request
+--   request_header_size_limit = 1024*1024,    -- maximum size of request body sent by client
+--   request_body_size_limit   = 64*1024*1024, -- maximum size of request body sent by client
+--   idle_timeout              = 65,           -- maximum time until receiving the first byte of the request headera
+--   stall_timeout             = 60,           -- maximum time a client connection may be stalled
+--   request_header_timeout    = 120,          -- maximum time until receiving the remaining bytes of the request header
+--   response_timeout          = 3600,         -- time in which request body and response must be sent
+--   maximum_input_chunk_size  = 16384         -- tweaks behavior of request-body parser
+--   minimum_output_chunk_size = 1024          -- chunk size for chunked-transfer-encoding
+-- }
+
+
+-- WebMCP accelerator
+-- ------------------------------------------------------------------------
+-- uncomment the following line to use C implementations of chosen
+-- functions:
+-- ------------------------------------------------------------------------
+-- require 'webmcp_accelerator'
+
+
+-- Trace debug
+-- ------------------------------------------------------------------------
+-- uncomment the following line to enable debug trace
+-- ------------------------------------------------------------------------
+-- config.enable_debug_trace = true
+
diff --git a/www-apps/liquid_feedback_frontend/files/myconfig.lua b/www-apps/liquid_feedback_frontend/files/myconfig.lua
deleted file mode 100644
index 19c259cd7cbd..000000000000
--- a/www-apps/liquid_feedback_frontend/files/myconfig.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-config.absolute_base_url = "https://lqfb.example.com/lf"
-config.instance_name = "lf"
-config.database = { engine='postgresql', dbname='liquid_feedback', user='liquid_feedback', password='xxx'}
-config.enable_debug_trace = true
-
-execute.config("init")
-
-config.formatting_engine_executeables = {
-  rocketwiki= "rocketwiki-lqfb",
-  compat = "rocketwiki-lqfb-compat"
-}
-
--- Checkbox(es) the user has to accept while registering
---
---
-----
---------------------------------------------------------------------------
-config.use_terms_checkboxes = {
-  {
-    name = "terms_of_use_v1",
-    html = "I accept the terms of use.",
-    not_accepted_error = "You have to accept the terms of use to be able to regi ster."
-  },
--- {
---    name = "extra_terms_of_use_v1",
---    html = "I accept the extra terms of use.",
---    not_accepted_error = "You have to accept the extra terms of use to be able  to register."
---  }
-} 
diff --git a/www-apps/liquid_feedback_frontend/files/postinstall-en.txt b/www-apps/liquid_feedback_frontend/files/postinstall-en.txt
deleted file mode 100644
index 80758792d817..000000000000
--- a/www-apps/liquid_feedback_frontend/files/postinstall-en.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-0. DATABASE SETUP
-
-To use Liquid Feedback you have to follow these
-simple steps, which have to be done as the postgres system user (or
-which ever is the database superuser):
-
-$ createuser liquid_feedback
-and answer the following
-Shall the new role be a superuser? (y/n) n
-Shall the new role be allowed to create databases? (y/n) y
-Shall the new role be allowed to create more new roles? (y/n) n
-
-$ psql 
-postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password';
-
-$ createdb -U liquid_feedback liquid_feedback
-$ psql -U liquid_feedback liquid_feedback
-liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/core.sql
-liquid_feedback=# \i ${MY_INSTALLDIR}/liquid_feedback_core/init.sql
-INSERT INTO system_setting (member_ttl) VALUES ('1 year');
-INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 hour', 20, 6);
-INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
-INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
-INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
-INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
-
-cd /var/lib/liquid_feedback_frontend
-/usr/lib/webmcp/framework/bin/webmcp_shell myconfig
-Lua 5.1.5  Copyright (C) 1994-2012 Lua.org, PUC-Rio
-> member = Member:by_id(1)
-> member:set_password("type-password-here")
-> member:save()
-> os.exit()
-
-Ensure that "lf_update dbname=liquid_feedback" and
-"lf_update_suggestion_order dbname=liquid_feedback" are called
-regularly! It is required to run these commands regularly
-(i.e. every 5 minutes via cron) to update cached supporter counts,
-to change the state of issues when neccessary, to calculate the
-result of votings, etc.  If you wish, copy the created lf_update
-and lf_update_suggestion_order files to /usr/local/bin or a
-similar directory.
-
-It is possible to run these two commands in parallel, if a setup
-requires splitting the load to multiple processor cores. In other
-cases it is recommended to run "lf_update" first, and then
-"lf_update_suggestion_order".
-
-To create an export file, which is containing all but private data,
-you may use the lf_export shell-script:
-$ lf_export liquid_feedback export.sql.gz
-
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
deleted file mode 100644
index ebbd3863ae79..000000000000
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit estack eutils toolchain-funcs
-
-PN_F=${PN}
-PV_F=v${PV}
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="https://www.public-software-group.org/liquid_feedback"
-SRC_URI="https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
-l10n_it? ( mirror://gentoo/${PN}-italian-${PV}.tar.gz )"
-
-LICENSE="HPND CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="l10n_de l10n_el l10n_en l10n_eo l10n_it"
-
-RDEPEND=">=www-apps/liquid_feedback_core-2.2.6"
-DEPEND="www-apps/rocketwiki-lqfb
-	www-servers/apache
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	for lang in zh-Hans zh-TW ; do
-		rm -f locale/help/*.${lang}.txt
-	done
-	for lang in de el en eo it ; do
-		if ! use l10n_${lang}; then
-			rm -f locale/help/*.${lang}.txt
-		fi
-	done
-	default
-}
-
-src_compile() {
-	emake -C locale
-}
-
-src_install() {
-	dodoc README
-	dodoc "${FILESDIR}"/lqfb.example.com.conf
-	dodoc "${FILESDIR}"/postinstall-en.txt
-
-	insinto /var/lib/${PN}
-	doins -r app db env model static tmp utils
-	insinto /var/lib/${PN}/locale
-	doins locale/*.lua
-	insinto /var/lib/${PN}/locale/help
-	eshopts_push -s nullglob
-	for helpFile in locale/help/*.html ; do
-		doins $helpFile
-	done
-	eshopts_pop
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/myconfig.lua config/*
-	dosym ../../../etc/${PN} /var/lib/${PN}/config
-
-	insinto /usr/share/${PN}
-	doins "${FILESDIR}"/lqfb-apache.conf
-
-	fowners apache:apache /var/lib/${PN}/tmp
-}
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.2.1.ebuild
index cd858e7dd524..bf8c01b3b881 100644
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
+++ b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 PN_F=${PN}
 PV_F=v${PV}
@@ -18,29 +18,29 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=www-apps/liquid_feedback_core-3.0.4"
-DEPEND="www-apps/rocketwiki-lqfb
-	www-servers/apache
-	>=www-apps/webmcp-1.2.6
-	${RDEPEND}"
+RDEPEND="~www-apps/liquid_feedback_core-3.2.2
+	~www-servers/moonbridge-1.0.1
+	>=www-apps/webmcp-2.1.0
+	acct-user/apache"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( INSTALL.html INSTALL.mkd )
 
 src_install() {
-	dodoc "${FILESDIR}"/lqfb.example.com.conf
-	dodoc "${FILESDIR}"/postinstall-en.txt
+	default
 
 	insinto /var/lib/${PN}
-	doins -r app db env model static tmp
-	insinto /var/lib/${PN}/locale
-	doins locale/*.lua
+	doins -r app db env fastpath lib locale model static tmp
+	fowners apache:apache /var/lib/${PN}/tmp
+	dodir /var/log/liquid_feedback
+	keepdir /var/log/liquid_feedback
+	fowners apache:apache /var/log/liquid_feedback
 
 	insinto /etc/${PN}
-	doins "${FILESDIR}"/myconfig.lua config/*
+	doins "${FILESDIR}"/myconfig-3.lua config/*
 	dosym ../../../etc/${PN} /var/lib/${PN}/config
 
-	insinto /usr/share/${PN}
-	doins "${FILESDIR}"/lqfb-apache.conf
-
-	fowners apache:apache /var/lib/${PN}/tmp
+	newinitd "${FILESDIR}"/liquid_feedback.initd liquid_feedback
 }