commit:     433856b93366defbd2ef42e55bf474c6d7f25ecf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 02:32:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 11 02:32:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433856b9

dev-db/postgresql: drop old Perl workaround

The code being removed here can't work with modern Perl:
```
$ perl -e 'use utf8; use re; package utf8; require "utf8_heavy.pl";';
Can't locate utf8_heavy.pl in @INC ( <AT> INC entries checked: /etc/perl 
/usr/local/lib64/perl5/5.38/x86_64-linux /usr/local/lib64/perl5/5.38 
/usr/lib64/perl5/vendor_perl/5.38/x86_64-linux 
/usr/lib64/perl5/vendor_perl/5.38 /usr/lib64/perl5/5.38/x86_64-linux 
/usr/lib64/perl5/5.38) at -e line 1.
```

The original reporter of the bug it was added for (bug #518522) was Chris Mayo
who can't reproduce the original problem. Given it now actively causes an issue,
let's drop it, and not worry about replacing it with something else right now -
it's unclear anything is needed now.

This still leaves pollution in postgresql.conf - which I leave to the pgsql
maintainers to resolve, but at least we're not adding it for new installs now.

Note that it's likely https://bugs.gentoo.org/518522#c6 was still an issue
and this will be resolved now too.

Bug: https://bugs.gentoo.org/518522
Bug: https://bugs.gentoo.org/792537
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/postgresql/postgresql-12.18.ebuild    | 7 -------
 dev-db/postgresql/postgresql-12.19-r1.ebuild | 7 -------
 dev-db/postgresql/postgresql-13.14.ebuild    | 7 -------
 dev-db/postgresql/postgresql-13.15-r1.ebuild | 7 -------
 dev-db/postgresql/postgresql-14.11.ebuild    | 7 -------
 dev-db/postgresql/postgresql-14.12-r1.ebuild | 7 -------
 dev-db/postgresql/postgresql-15.6.ebuild     | 7 -------
 dev-db/postgresql/postgresql-15.7-r1.ebuild  | 7 -------
 dev-db/postgresql/postgresql-16.2.ebuild     | 7 -------
 dev-db/postgresql/postgresql-16.3-r1.ebuild  | 7 -------
 dev-db/postgresql/postgresql-9999.ebuild     | 7 -------
 11 files changed, 77 deletions(-)

diff --git a/dev-db/postgresql/postgresql-12.18.ebuild 
b/dev-db/postgresql/postgresql-12.18.ebuild
index 8365c8725242..115a0eb86e44 100644
--- a/dev-db/postgresql/postgresql-12.18.ebuild
+++ b/dev-db/postgresql/postgresql-12.18.ebuild
@@ -398,13 +398,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-12.19-r1.ebuild 
b/dev-db/postgresql/postgresql-12.19-r1.ebuild
index 3acab1435329..7f5912e856fc 100644
--- a/dev-db/postgresql/postgresql-12.19-r1.ebuild
+++ b/dev-db/postgresql/postgresql-12.19-r1.ebuild
@@ -398,13 +398,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-13.14.ebuild 
b/dev-db/postgresql/postgresql-13.14.ebuild
index 60d28d2d7d08..0926b6f003a2 100644
--- a/dev-db/postgresql/postgresql-13.14.ebuild
+++ b/dev-db/postgresql/postgresql-13.14.ebuild
@@ -406,13 +406,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-13.15-r1.ebuild 
b/dev-db/postgresql/postgresql-13.15-r1.ebuild
index 7487827923dd..90f874bd8b38 100644
--- a/dev-db/postgresql/postgresql-13.15-r1.ebuild
+++ b/dev-db/postgresql/postgresql-13.15-r1.ebuild
@@ -406,13 +406,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-14.11.ebuild 
b/dev-db/postgresql/postgresql-14.11.ebuild
index db34b02f91bd..7c2f8c1e11fd 100644
--- a/dev-db/postgresql/postgresql-14.11.ebuild
+++ b/dev-db/postgresql/postgresql-14.11.ebuild
@@ -406,13 +406,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-14.12-r1.ebuild 
b/dev-db/postgresql/postgresql-14.12-r1.ebuild
index 5361f9a28c86..e64f40d3a785 100644
--- a/dev-db/postgresql/postgresql-14.12-r1.ebuild
+++ b/dev-db/postgresql/postgresql-14.12-r1.ebuild
@@ -406,13 +406,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-15.6.ebuild 
b/dev-db/postgresql/postgresql-15.6.ebuild
index aaea88b1abe6..179418fe1cd3 100644
--- a/dev-db/postgresql/postgresql-15.6.ebuild
+++ b/dev-db/postgresql/postgresql-15.6.ebuild
@@ -408,13 +408,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-15.7-r1.ebuild 
b/dev-db/postgresql/postgresql-15.7-r1.ebuild
index ed5a9d761fec..cd8e67f96a6d 100644
--- a/dev-db/postgresql/postgresql-15.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-15.7-r1.ebuild
@@ -408,13 +408,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-16.2.ebuild 
b/dev-db/postgresql/postgresql-16.2.ebuild
index 520395881338..d5542fbc20b1 100644
--- a/dev-db/postgresql/postgresql-16.2.ebuild
+++ b/dev-db/postgresql/postgresql-16.2.ebuild
@@ -409,13 +409,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-16.3-r1.ebuild 
b/dev-db/postgresql/postgresql-16.3-r1.ebuild
index 4a487c8112d0..ce239953cf5b 100644
--- a/dev-db/postgresql/postgresql-16.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-16.3-r1.ebuild
@@ -409,13 +409,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

diff --git a/dev-db/postgresql/postgresql-9999.ebuild 
b/dev-db/postgresql/postgresql-9999.ebuild
index 1fa775af92f2..7933efb78c75 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -388,13 +388,6 @@ pkg_config() {
        # overridden in the initscript
        sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
 
-       cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-               # This is here because of 
https://bugs.gentoo.org/show_bug.cgi?id=518522
-               # On the off-chance that you might need to work with UTF-8 
encoded
-               # characters in PL/Perl
-               plperl.on_init = 'use utf8; use re; package utf8; require 
"utf8_heavy.pl";'
-       EOF
-
        einfo "The autovacuum function, which was in contrib, has been moved to 
the main"
        einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is 
now enabled"
        einfo "by default. You can disable it in the cluster's:"

Reply via email to