From bcec778fe190845b5bfa79a3979306c537d0b6fa Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sun, 6 Dec 2020 22:49:31 +0100 Subject: [PATCH] net-proxy/haproxy: introduce subslots While we still don't support installing multiple net-proxy/haproxy versions simultaneously, we need slots to support proper targeting in GLSAs. Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann Closes: https://github.com/gentoo/gentoo/pull/18540 Signed-off-by: Thomas Deutschmann --- .../haproxy/{haproxy-1.8.27.ebuild => haproxy-1.8.27-r1.ebuild} | 2 +- .../{haproxy-2.1.4-r1.ebuild => haproxy-2.0.14-r2.ebuild} | 2 +- .../haproxy/{haproxy-2.0.19.ebuild => haproxy-2.0.19-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.0.9999.ebuild | 2 +- .../haproxy/{haproxy-2.1.10.ebuild => haproxy-2.1.10-r1.ebuild} | 2 +- .../{haproxy-2.0.14-r1.ebuild => haproxy-2.1.4-r2.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.1.9999.ebuild | 2 +- .../haproxy/{haproxy-2.2.5.ebuild => haproxy-2.2.5-r1.ebuild} | 2 +- .../haproxy/{haproxy-2.2.6.ebuild => haproxy-2.2.6-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.2.9999.ebuild | 2 +- .../haproxy/{haproxy-2.3.2.ebuild => haproxy-2.3.2-r1.ebuild} | 2 +- net-proxy/haproxy/haproxy-2.3.9999.ebuild | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename net-proxy/haproxy/{haproxy-1.8.27.ebuild => haproxy-1.8.27-r1.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.1.4-r1.ebuild => haproxy-2.0.14-r2.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.0.19.ebuild => haproxy-2.0.19-r1.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.1.10.ebuild => haproxy-2.1.10-r1.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.0.14-r1.ebuild => haproxy-2.1.4-r2.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.2.5.ebuild => haproxy-2.2.5-r1.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.2.6.ebuild => haproxy-2.2.6-r1.ebuild} (99%) rename net-proxy/haproxy/{haproxy-2.3.2.ebuild => haproxy-2.3.2-r1.ebuild} (99%) diff --git a/net-proxy/haproxy/haproxy-1.8.27.ebuild b/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-1.8.27.ebuild rename to net-proxy/haproxy/haproxy-1.8.27-r1.ebuild index 2c5c63d0d07cc..598b9437c2a33 100644 --- a/net-proxy/haproxy/haproxy-1.8.27.ebuild +++ b/net-proxy/haproxy/haproxy-1.8.27-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.1.4-r1.ebuild rename to net-proxy/haproxy/haproxy-2.0.14-r2.ebuild index 17aa93cde0631..6670f6b38cb9b 100644 --- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.0.19.ebuild b/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.0.19.ebuild rename to net-proxy/haproxy/haproxy-2.0.19-r1.ebuild index d1c45681b5608..ff5a7fefefdaf 100644 --- a/net-proxy/haproxy/haproxy-2.0.19.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.19-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild index 7e2cb38725c68..5b03cdb50b54d 100644 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.1.10.ebuild b/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.1.10.ebuild rename to net-proxy/haproxy/haproxy-2.1.10-r1.ebuild index d1c45681b5608..ff5a7fefefdaf 100644 --- a/net-proxy/haproxy/haproxy-2.1.10.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.10-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.0.14-r1.ebuild rename to net-proxy/haproxy/haproxy-2.1.4-r2.ebuild index 17aa93cde0631..6670f6b38cb9b 100644 --- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.1.9999.ebuild index d1c45681b5608..ff5a7fefefdaf 100644 --- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.2.5.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.2.5.ebuild rename to net-proxy/haproxy/haproxy-2.2.5-r1.ebuild index b27af8aada934..4fc50cbc0ed12 100644 --- a/net-proxy/haproxy/haproxy-2.2.5.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.2.6.ebuild b/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.2.6.ebuild rename to net-proxy/haproxy/haproxy-2.2.6-r1.ebuild index 1518b1d4e9ffe..f03a40b4b36d8 100644 --- a/net-proxy/haproxy/haproxy-2.2.6.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.6-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild index d1c45681b5608..ff5a7fefefdaf 100644 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.3.2.ebuild b/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild similarity index 99% rename from net-proxy/haproxy/haproxy-2.3.2.ebuild rename to net-proxy/haproxy/haproxy-2.3.2-r1.ebuild index c9b5545fd783d..60358d7195064 100644 --- a/net-proxy/haproxy/haproxy-2.3.2.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.2-r1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild index d1c45681b5608..ff5a7fefefdaf 100644 --- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre )