commit: b5678f9452dff2c54da4a50cad1ff81ce097fddf Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sun Jun 6 17:21:57 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jun 6 17:21:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5678f94
dev-perl/PortageXS: Remove last-rited pkg Closes: https://github.com/gentoo/gentoo/pull/21103 Closes: https://bugs.gentoo.org/264680 Closes: https://bugs.gentoo.org/289524 Closes: https://bugs.gentoo.org/332611 Closes: https://bugs.gentoo.org/473394 Closes: https://bugs.gentoo.org/613114 Closes: https://bugs.gentoo.org/625536 Closes: https://bugs.gentoo.org/671244 Closes: https://bugs.gentoo.org/688238 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-perl/PortageXS/Manifest | 2 - dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild | 54 ------ dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild | 60 ------- dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild | 63 ------- .../files/0.02.12/PortageXS-0.02.12-prefix.patch | 198 --------------------- .../files/PortageXS-0.02.10-portage_path_fix.patch | 86 --------- .../PortageXS/files/PortageXS-0.02.10-prefix.patch | 137 -------------- dev-perl/PortageXS/metadata.xml | 17 -- profiles/package.mask | 11 -- 9 files changed, 628 deletions(-) diff --git a/dev-perl/PortageXS/Manifest b/dev-perl/PortageXS/Manifest deleted file mode 100644 index f20a1e12f53..00000000000 --- a/dev-perl/PortageXS/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST PortageXS-0.02.10.tar.gz 28890 BLAKE2B 66686516b975ff0da641c75dec63c3c6afe9d5bf7762ffb1f4a81c31550e601601f6190fdb992fce0a6e694bed46d4c95f599cf7a20bf0c069493a1e07dec499 SHA512 8f5a6cf8fa415e13401fd7901c81fef42e0cee81b7a9c1f276cce9582c705ac7e2004ec213033fce065f965445342ed0140d8b752d2e857dd40c620ed4af6b1b -DIST PortageXS-0.2.12.tar.gz 41772 BLAKE2B 81583e73189908cd3b1588e74d5b291d1955995ff1d283682c245264feac7ed9eef4cfcd2ef4497c229f3d007ebd0a8b275d7c7c0e64ea3059dda3bc01eb66d7 SHA512 e833c8dab25ed6fcfad999e4b0bb803d69523ff57fbcd86ea0c29c671889a66c81f0081d6242039788a73d090e3245776d12a8286114b77f72d39514dfe425bf diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild deleted file mode 100644 index 7525eca6f51..00000000000 --- a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module epatch prefix - -DESCRIPTION="Portage abstraction layer for perl" -HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"; -SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="minimal" -SRC_TEST="do" - -DEPEND="virtual/perl-Term-ANSIColor - dev-perl/Shell-EnvImporter - !minimal? ( dev-perl/IO-Socket-SSL - virtual/perl-Sys-Syslog )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch - epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch - - eprefixify \ - lib/PortageXS/Core.pm \ - lib/PortageXS.pm \ - usr/bin/portagexs_client \ - usr/sbin/portagexsd - - if use minimal ; then - rm -r "${S}"/usr || die - rm -r "${S}"/etc/init.d || die - rm -r "${S}"/etc/pxs/certs || die - rm "${S}"/etc/pxs/portagexsd.conf || die - rm -r "${S}"/lib/PortageXS/examples || die - fi -} - -pkg_preinst() { - if use !minimal ; then - cp -r "${S}"/usr "${D}${EPREFIX}" || die - fi - cp -r "${S}"/etc "${D}${EPREFIX}" || die -} - -pkg_postinst() { - if [ -d "${EPREFIX}"/etc/portagexs ]; then - elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience. It is safe" - elog "to delete old ${EPREFIX}/etc/portagexs directories." - fi -} diff --git a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild b/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild deleted file mode 100644 index 137c3757d25..00000000000 --- a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -MODULE_VERSION=0.02.10 -inherit perl-module epatch prefix - -DESCRIPTION="Portage abstraction layer for perl" -HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"; -SRC_URI="http://download.mpsna.de/opensource/PortageXS/${PN}-${MODULE_VERSION}.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="minimal" -SRC_TEST="do" - -DEPEND=" - virtual/perl-Term-ANSIColor - dev-perl/Shell-EnvImporter - !minimal? ( - dev-perl/IO-Socket-SSL - virtual/perl-Sys-Syslog - ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch - epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch - - eprefixify \ - lib/PortageXS/Core.pm \ - lib/PortageXS.pm \ - usr/bin/portagexs_client \ - usr/sbin/portagexsd - - if use minimal ; then - rm -r "${S}"/usr || die - rm -r "${S}"/etc/init.d || die - rm -r "${S}"/etc/pxs/certs || die - rm "${S}"/etc/pxs/portagexsd.conf || die - rm -r "${S}"/lib/PortageXS/examples || die - fi -} - -src_install() { - perl-module_src_install - if use !minimal ; then - cp -r "${S}"/usr "${D}${EPREFIX}" || die - fi - cp -r "${S}"/etc "${D}${EPREFIX}" || die -} - -pkg_postinst() { - if [ -d "${EPREFIX}"/etc/portagexs ]; then - elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience. It is safe" - elog "to delete old ${EPREFIX}/etc/portagexs directories." - fi -} diff --git a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild b/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild deleted file mode 100644 index 798620b905f..00000000000 --- a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=KENTNL -MODULE_VERSION=0.2.12 -inherit perl-module epatch prefix - -DESCRIPTION="Portage abstraction layer for perl" -HOMEPAGE="http://search.cpan.org/~kentnl/PortageXS"; - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="minimal" - -DEPEND=" - dev-perl/Module-Build - virtual/perl-Term-ANSIColor - dev-perl/Shell-EnvImporter - !minimal? ( - dev-perl/IO-Socket-SSL - virtual/perl-Sys-Syslog - ) -" - -src_prepare() { - epatch "${FILESDIR}"/0.02.12/${PN}-0.02.12-prefix.patch - - eprefixify \ - lib/PortageXS/examples/getParamFromFile.pl \ - lib/PortageXS/Core.pm \ - lib/PortageXS.pm \ - usr/bin/portagexs_client \ - usr/sbin/portagexsd \ - t/01_Core.t - - if use minimal ; then - rm -r "${S}"/usr || die - rm -r "${S}"/etc/init.d || die - rm -r "${S}"/etc/pxs/certs || die - rm "${S}"/etc/pxs/portagexsd.conf || die - rm -r "${S}"/lib/PortageXS/examples || die - fi -} - -src_install() { - perl-module_src_install - if use !minimal ; then - cp -r "${S}"/usr "${D}${EPREFIX}" || die - fi - cp -r "${S}"/etc "${D}${EPREFIX}" || die -} - -pkg_postinst() { - if [ -d "${EPREFIX}"/etc/portagexs ]; then - elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience. It is safe" - elog "to delete old ${EPREFIX}/etc/portagexs directories." - fi -} - -SRC_TEST="do parallel" diff --git a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch b/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch deleted file mode 100644 index df1881118c9..00000000000 --- a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch +++ /dev/null @@ -1,198 +0,0 @@ - lib/PortageXS.pm | 16 ++++++++-------- - lib/PortageXS/Core.pm | 8 ++++---- - lib/PortageXS/examples/getParamFromFile.pl | 2 +- - t/01_Core.t | 12 ++++++------ - usr/bin/portagexs_client | 8 ++++---- - usr/sbin/portagexsd | 12 ++++++------ - 6 files changed, 29 insertions(+), 29 deletions(-) - -diff --git a/lib/PortageXS.pm b/lib/PortageXS.pm -index db57a25..6cec46e 100644 ---- a/lib/PortageXS.pm -+++ b/lib/PortageXS.pm -@@ -71,8 +71,8 @@ sub new { - $pxs->{'VERSION'} = $PortageXS::VERSION; - - $pxs->{'PORTDIR'} = $pxs->getPortdir(); -- $pxs->{'PKG_DB_DIR'} = '/var/db/pkg/'; -- $pxs->{'PATH_TO_WORLDFILE'} = '/var/lib/portage/world'; -+ $pxs->{'PKG_DB_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/'; -+ $pxs->{'PATH_TO_WORLDFILE'} = '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world'; - $pxs->{'IS_INITIALIZED'} = 1; - - $pxs->{'EXCLUDE_DIRS'}{'.'} = 1; -@@ -85,17 +85,17 @@ sub new { - $pxs->{'EXCLUDE_DIRS'}{'CVS'} = 1; - $pxs->{'EXCLUDE_DIRS'}{'.cache'} = 1; - -- $pxs->{'PORTAGEXS_ETC_DIR'} = '/etc/pxs/'; -- $pxs->{'ETC_DIR'} = '/etc/'; -+ $pxs->{'PORTAGEXS_ETC_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/'; -+ $pxs->{'ETC_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/etc/'; - - $pxs->{'MAKE_PROFILE_PATHS'} = [ -- '/etc/make.profile', -- '/etc/portage/make.profile' -+ '@GENTOO_PORTAGE_EPREFIX@/etc/make.profile', -+ '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile' - ]; - - $pxs->{'MAKE_CONF_PATHS'} = [ -- '/etc/make.conf', -- '/etc/portage/make.conf' -+ '@GENTOO_PORTAGE_EPREFIX@/etc/make.conf', -+ '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf' - ]; - - for my $path ( @{ $pxs->{'MAKE_PROFILE_PATHS'} } ) { -diff --git a/lib/PortageXS/Core.pm b/lib/PortageXS/Core.pm -index 5d51023..3dd0b84 100644 ---- a/lib/PortageXS/Core.pm -+++ b/lib/PortageXS/Core.pm -@@ -122,7 +122,7 @@ sub getPortageMakeParam { - my $self = shift; - my $param = shift; - my @files = (); -- my @etcfiles = qw(/usr/share/portage/config/make.globals /etc/make.conf); -+ my @etcfiles = qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/make.conf); - my $v = ''; - my $parent = ''; - my $curPath; -@@ -166,7 +166,7 @@ sub getPortageMakeParam { - - # - Defaults > - if ($param eq 'PORTDIR' && !$v) { -- $v='/usr/portage'; -+ $v='@GENTOO_PORTAGE_EPREFIX@/usr/portage'; - } - - return $v; -@@ -193,7 +193,7 @@ sub getPortdir { - return $self->{'PORTDIR'}; - } - else { -- $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen'); -+ $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen'); - return $self->{'PORTDIR'}; - } - } -@@ -210,7 +210,7 @@ sub getPortdirOverlay { - my $self = shift; - my $forcereload = shift; - -- return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen')); -+ return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'PORTDIR_OVERLAY','lastseen')); - } - - # Description: -diff --git a/lib/PortageXS/examples/getParamFromFile.pl b/lib/PortageXS/examples/getParamFromFile.pl -index 416b1be..9ea88bb 100755 ---- a/lib/PortageXS/examples/getParamFromFile.pl -+++ b/lib/PortageXS/examples/getParamFromFile.pl -@@ -8,4 +8,4 @@ use PortageXS; - - my $pxs=PortageXS->new(); - print "CFLAGS are set to: "; --print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n"; -+print join(' ',$pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.globals').$pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'CFLAGS','lastseen'))."\n"; -diff --git a/t/01_Core.t b/t/01_Core.t -index d01dc31..6daba99 100644 ---- a/t/01_Core.t -+++ b/t/01_Core.t -@@ -14,8 +14,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir()); - - # - getFileContents > - { -- my $content = $pxs->getFileContents('/etc/portage/make.conf'); -- ok($content ne '','getFileContents of /etc/portage/make.conf'); -+ my $content = $pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'); -+ ok($content ne '','getFileContents of @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'); - } - - # - searchInstalledPackage > -@@ -26,8 +26,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir()); - - # - getParamFromFile > - { -- my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'); -- ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param); -+ my $param = $pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'CFLAGS','lastseen'); -+ ok($param ne '','getParamFromFile @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf - CFLAGS: '.$param); - } - - # - getUseSettingsOfInstalledPackage > -@@ -65,8 +65,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir()); - - # - fileBelongsToPackage > - { -- my @packages = $pxs->fileBelongsToPackage('/etc/gentoo-release'); -- ok($#packages==0,'fileBelongsToPackage - /etc/gentoo-release: '.$packages[0]); -+ my @packages = $pxs->fileBelongsToPackage('@GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release'); -+ ok($#packages==0,'fileBelongsToPackage - @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release: '.$packages[0]); - } - ok(!$pxs->fileBelongsToPackage('/this/path/most/likely/does/not/exist'),'fileBelongsToPackage bogus test'); - -diff --git a/usr/bin/portagexs_client b/usr/bin/portagexs_client -index 598d05a..688cb97 100755 ---- a/usr/bin/portagexs_client -+++ b/usr/bin/portagexs_client -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl - - # ----------------------------------------------------------------------------- - # -@@ -54,9 +54,9 @@ if(!($sock = IO::Socket::SSL->new( PeerAddr => $remote_addr, - SSL_use_cert => 1, - SSL_verify_mode => 0x01, - SSL_passwd_cb => sub { return "" }, -- SSL_key_file => '/etc/pxs/certs/client-key.pem', -- SSL_cert_file => '/etc/pxs/certs/client-cert.pem', -- SSL_ca_file => '/etc/pxs/certs/my-ca.pem' -+ SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem', -+ SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem', -+ SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem' - ))) { - $pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n"); - $pxs->print_err("Server down?\n"); -diff --git a/usr/sbin/portagexsd b/usr/sbin/portagexsd -index 638f662..e93bdfa 100755 ---- a/usr/sbin/portagexsd -+++ b/usr/sbin/portagexsd -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -t -+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t - - # ----------------------------------------------------------------------------- - # -@@ -50,7 +50,7 @@ else { - sub main { - # - Parse config > - my %config = (); -- $config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf"); -+ $config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf"); - $config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen"); - $config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen"); - $config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen"); -@@ -60,7 +60,7 @@ sub main { - $config{'cfgfiledata'} = undef; - - if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) { -- syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)'); -+ syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)'); - exit(0); - } - -@@ -70,9 +70,9 @@ sub main { - Reuse => 1, - SSL_verify_mode => 0x01, - SSL_passwd_cb => sub {return $config{'SSLpasswd'}}, -- SSL_key_file => '/etc/pxs/certs/server-key.pem', -- SSL_cert_file => '/etc/pxs/certs/server-cert.pem', -- SSL_ca_file => '/etc/pxs/certs/my-ca.pem' -+ SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem', -+ SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem', -+ SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem' - )) ) { - syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr); - exit(0); diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch deleted file mode 100644 index a9968cd7e79..00000000000 --- a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/PortageXS/Core.pm ---- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm 2013-01-03 09:32:10.477597366 +0100 -+++ PortageXS-0.02.10/lib/PortageXS/Core.pm 2013-01-03 09:32:12.707534858 +0100 -@@ -94,7 +94,7 @@ - my $self = shift; - my $param = shift; - my @files = (); -- my @etcfiles = qw(/etc/make.globals /etc/make.conf); -+ my @etcfiles = qw(/usr/share/portage/config/make.globals /etc/portage/make.conf); - my @profilefiles = (); - my $v = ''; - my $parent = ''; -@@ -166,7 +166,7 @@ - return $self->{'PORTDIR'}; - } - else { -- $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR','lastseen'); -+ $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen'); - return $self->{'PORTDIR'}; - } - } -@@ -183,7 +183,7 @@ - my $self = shift; - my $forcereload = shift; - -- return split(/ /,$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen')); -+ return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen')); - } - - # Description: -diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl ---- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl 2013-01-03 09:32:10.477597366 +0100 -+++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl 2013-01-03 09:32:12.707534858 +0100 -@@ -8,4 +8,5 @@ - - my $pxs=PortageXS->new(); - print "CFLAGS are set to: "; --print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n"; -+print join(' -+',$pxs->getParamFromFile($pxs->getFileContents('/usr/share/portage/config/make.globals').$pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'))."\n"; -diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS.pm ---- PortageXS-0.02.10.orig/lib/PortageXS.pm 2013-01-03 09:32:10.478597338 +0100 -+++ PortageXS-0.02.10/lib/PortageXS.pm 2013-01-03 09:32:29.710057966 +0100 -@@ -77,7 +77,7 @@ - - $self->{'PORTAGEXS_ETC_DIR'} = '/etc/pxs/'; - $self->{'ETC_DIR'} = '/etc/'; -- $self->{'MAKE_PROFILE_PATH'} = '/etc/make.profile'; -+ $self->{'MAKE_PROFILE_PATH'} = '/etc/portage/make.profile'; - - # - init colors > - $self->{'COLORS'}{'YELLOW'} = color('bold yellow'); -@@ -89,7 +89,7 @@ - $self->{'COLORS'}{'BLUE'} = color('bold blue'); - $self->{'COLORS'}{'RESET'} = color('reset'); - -- if (lc($self->getParamFromFile($self->getFileContents('/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') { -+ if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') { - $self->{'COLORS'}{'YELLOW'} = ''; - $self->{'COLORS'}{'GREEN'} = ''; - $self->{'COLORS'}{'LIGHTGREEN'} = ''; -diff -ur PortageXS-0.02.10.orig/t/01_Core.t PortageXS-0.02.10/t/01_Core.t ---- PortageXS-0.02.10.orig/t/01_Core.t 2013-01-03 09:32:10.476597394 +0100 -+++ PortageXS-0.02.10/t/01_Core.t 2013-01-03 09:32:12.707534858 +0100 -@@ -14,8 +14,8 @@ - - # - getFileContents > - { -- my $content = $pxs->getFileContents('/etc/make.conf'); -- ok($content ne '','getFileContents of /etc/make.conf'); -+ my $content = $pxs->getFileContents('/etc/portage/make.conf'); -+ ok($content ne '','getFileContents of /etc/portage/make.conf'); - } - - # - searchInstalledPackage > -@@ -26,8 +26,8 @@ - - # - getParamFromFile > - { -- my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'); -- ok($param ne '','getParamFromFile /etc/make.conf - CFLAGS: '.$param); -+ my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'); -+ ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param); - } - - # - getUseSettingsOfInstalledPackage > diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch deleted file mode 100644 index 755bb13bb50..00000000000 --- a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -ur PortageXS-0.02.09.orig/lib/PortageXS/Core.pm PortageXS-0.02.09/lib/PortageXS/Core.pm ---- PortageXS-0.02.09.orig/lib/PortageXS/Core.pm 2008-12-01 21:30:50 +0100 -+++ PortageXS-0.02.09/lib/PortageXS/Core.pm 2009-03-18 20:56:20 +0100 -@@ -94,7 +94,7 @@ - my $self = shift; - my $param = shift; - my @files = (); -- my @etcfiles = qw(/usr/share/portage/config/make.globals /etc/portage/make.conf); -+ my @etcfiles = qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf); - my @profilefiles = (); - my $v = ''; - my $parent = ''; -@@ -139,7 +139,7 @@ - - # - Defaults > - if ($param eq 'PORTDIR' && !$v) { -- $v='/usr/portage'; -+ $v='@GENTOO_PORTAGE_EPREFIX@/usr/portage'; - } - - return $v; -@@ -166,7 +166,7 @@ - return $self->{'PORTDIR'}; - } - else { -- $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen'); -+ $self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen'); - return $self->{'PORTDIR'}; - } - } -@@ -183,7 +183,7 @@ - my $self = shift; - my $forcereload = shift; - -- return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen')); -+ return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen')); - } - - # Description: -diff -ur PortageXS-0.02.09.orig/lib/PortageXS.pm PortageXS-0.02.09/lib/PortageXS.pm ---- PortageXS-0.02.09.orig/lib/PortageXS.pm 2008-12-01 21:30:50 +0100 -+++ PortageXS-0.02.09/lib/PortageXS.pm 2009-03-18 20:52:29 +0100 -@@ -61,8 +61,8 @@ - $self->{'VERSION'} = $VERSION; - - $self->{'PORTDIR'} = $self->getPortdir(); -- $self->{'PKG_DB_DIR'} = '/var/db/pkg/'; -- $self->{'PATH_TO_WORLDFILE'} = '/var/lib/portage/world'; -+ $self->{'PKG_DB_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/'; -+ $self->{'PATH_TO_WORLDFILE'} = '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world'; - $self->{'IS_INITIALIZED'} = 1; - - $self->{'EXCLUDE_DIRS'}{'.'} = 1; -@@ -75,9 +75,9 @@ - $self->{'EXCLUDE_DIRS'}{'CVS'} = 1; - $self->{'EXCLUDE_DIRS'}{'.cache'} = 1; - -- $self->{'PORTAGEXS_ETC_DIR'} = '/etc/pxs/'; -- $self->{'ETC_DIR'} = '/etc/'; -- $self->{'MAKE_PROFILE_PATH'} = '/etc/portage/make.profile'; -+ $self->{'PORTAGEXS_ETC_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/'; -+ $self->{'ETC_DIR'} = '@GENTOO_PORTAGE_EPREFIX@/etc/'; -+ $self->{'MAKE_PROFILE_PATH'} = '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile'; - - # - init colors > - $self->{'COLORS'}{'YELLOW'} = color('bold yellow'); -@@ -89,7 +89,7 @@ - $self->{'COLORS'}{'BLUE'} = color('bold blue'); - $self->{'COLORS'}{'RESET'} = color('reset'); - -- if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') { -+ if (lc($self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') { - $self->{'COLORS'}{'YELLOW'} = ''; - $self->{'COLORS'}{'GREEN'} = ''; - $self->{'COLORS'}{'LIGHTGREEN'} = ''; -diff -ur PortageXS-0.02.09.orig/usr/bin/portagexs_client PortageXS-0.02.09/usr/bin/portagexs_client ---- PortageXS-0.02.09.orig/usr/bin/portagexs_client 2008-12-01 21:30:50 +0100 -+++ PortageXS-0.02.09/usr/bin/portagexs_client 2009-03-18 20:52:29 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl - - # ----------------------------------------------------------------------------- - # -@@ -54,9 +54,9 @@ - SSL_use_cert => 1, - SSL_verify_mode => 0x01, - SSL_passwd_cb => sub { return "" }, -- SSL_key_file => '/etc/pxs/certs/client-key.pem', -- SSL_cert_file => '/etc/pxs/certs/client-cert.pem', -- SSL_ca_file => '/etc/pxs/certs/my-ca.pem' -+ SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem', -+ SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem', -+ SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem' - ))) { - $pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n"); - $pxs->print_err("Server down?\n"); -diff -ur PortageXS-0.02.09.orig/usr/sbin/portagexsd PortageXS-0.02.09/usr/sbin/portagexsd ---- PortageXS-0.02.09.orig/usr/sbin/portagexsd 2008-12-01 21:30:50 +0100 -+++ PortageXS-0.02.09/usr/sbin/portagexsd 2009-03-18 20:52:29 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -t -+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t - - # ----------------------------------------------------------------------------- - # -@@ -50,7 +50,7 @@ - sub main { - # - Parse config > - my %config = (); -- $config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf"); -+ $config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf"); - $config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen"); - $config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen"); - $config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen"); -@@ -60,7 +60,7 @@ - $config{'cfgfiledata'} = undef; - - if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) { -- syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)'); -+ syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)'); - exit(0); - } - -@@ -70,9 +71,9 @@ - Reuse => 1, - SSL_verify_mode => 0x01, - SSL_passwd_cb => sub {return $config{'SSLpasswd'}}, -- SSL_key_file => '/etc/pxs/certs/server-key.pem', -- SSL_cert_file => '/etc/pxs/certs/server-cert.pem', -- SSL_ca_file => '/etc/pxs/certs/my-ca.pem' -+ SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem', -+ SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem', -+ SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem' - )) ) { - syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr); - exit(0); diff --git a/dev-perl/PortageXS/metadata.xml b/dev-perl/PortageXS/metadata.xml deleted file mode 100644 index 799ea06246f..00000000000 --- a/dev-perl/PortageXS/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Perl Project</name> - </maintainer> - <upstream> - <remote-id type="cpan">PortageXS</remote-id> - <remote-id type="cpan">PortageXS::Core</remote-id> - <remote-id type="cpan">PortageXS::System</remote-id> - <remote-id type="cpan">PortageXS::UI::Console</remote-id> - <remote-id type="cpan">PortageXS::UI::Spinner</remote-id> - <remote-id type="cpan">PortageXS::Useflags</remote-id> - <remote-id type="cpan">PortageXS::Version</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 868ffebe4cc..ec8a44dd13c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -362,13 +362,6 @@ sci-libs/fftw:2.1 # ago, dead upstream. Bug #779421, removal in 30 days. media-sound/gramofile -# Andreas K. Hüttel <[email protected]> (2021-05-09) -# PortageXS saw its last release in 2016 and would need -# a new upstream maintainer. Multiple bugs, e.g., -# 688238, 625536, 613114, 473394, 332611, 289524, 264680 -# Masked for removal in 30 days, including reverse deps. -dev-perl/PortageXS - # Sam James <[email protected]> (2021-05-09) # Not working properly with cmake.eclass port # bug #788448 @@ -620,10 +613,6 @@ app-admin/amazon-ec2-init =sys-libs/db-6.2* =sys-libs/db-18.1* -# Mikle Kolyada <[email protected]> (2014-06-27) -# Masked for proper testing. (Major updates in the code). -~dev-perl/PortageXS-0.2.12 - # Mike Gilbert <[email protected]> (2014-03-04) # Dev channel releases are only for people who are developers or want more # experimental features and accept a more unstable release.
