gentoo auto-resync : 29:07:2022 - 15:07:44

6 files changed, 4 insertions, 257 deletions

diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index b762d7fffea7..b8c13e4dbd52 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,11 +1,6 @@
-AUX chrpath-0.13-multilib.patch 4129 BLAKE2B d6a2405751bba1774bd62ad3244928e0243c24825e986ed9e1531d28bd7521fb67fd5523365e574bfed1f8b404002afb76b89ec3e855fb6f5eababe042b5e360 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3
-AUX chrpath-0.13-testsuite-1.patch 575 BLAKE2B 0fa870a459c564a48ec82a86af46ca25afd52b98e9342b4690b876fcac18357fabe996fdb638378128596271f2855219de48b651903ec655316a166b746921e7 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c
 AUX chrpath-0.16-multilib.patch 3814 BLAKE2B 354a0fdadc5e18a5e6736bf8a2796c91e82d90e6e7053d8a37080a7a1bc5e7893f28ee0bfe19d4f9dace032af91924bf6a3e63e74cb0e82cd51cac2faabf594a SHA512 db577ae0801f031bf4a143ed4f7770e087d1ee27520dff22948c90d97495d9bb73a48f47012b81deef71b863953e1bd6debbdfb3c5356eda6c4e5a91a8d830b1
 AUX chrpath-0.16-solaris.patch 349 BLAKE2B 5199c9800f649cc93b70eea782a41d26481ff64556c1348cc843b2a98a769d100bf50fb1af93f745a5021c28e65ba8b8832028df3e370c5910c1623e6af09ccc SHA512 7f6722c35fb95079ac2ef8f6973e1f719744b63eab9805d5ad6a0dfc9184e9a6527124cb1cb004e328eb7cc0b2ef881c2e1d4f471833049052f69ded9bce23e7
 AUX chrpath-0.16-testsuite-1.patch 547 BLAKE2B a6b579d54dff49736474afdcf8a7a069411c6f38d7fa370b247b26d0889787ae89d910f16124cb32f1a1e9e202c2f0422ea98fe751f9dc88eb31c97e46eb325e SHA512 197bf3d89da437dee8d8fac2c80fd683a5ed6d5310e8af87c0d89f4b5390a3b37fac7591d7df183ff6eef9502ccf0734502ad9d87fa0ebe38bee3543498e1eff
-AUX chrpath-keepgoing.patch 1041 BLAKE2B d5ec2b6d482fbd42b2d3cd04626984c1d6ea0c5ca35d5aa25160bb6781a0bd534c637d90e19f8c873e12ad477b2f0d17d57f066401afd95fc0d82c4e3319ff12 SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c
-DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
 DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
-EBUILD chrpath-0.13-r2.ebuild 1109 BLAKE2B 1dcaff7b62d98ef82bdf7afb09428ddbba33b14c36eaa37a44799150f2e7b981a2ee9e769cbb25356d2531e0d321e449414edcdc213c2643f966b4d864a5c63a SHA512 2e22eb2ae3d951c4cbe283a0aeb4e4fb0582db6f2229c22037f75ac5bb90dc08b6df46e1092fb1892c8a3a11c81f3c3267a83dd7efe373bdd43f74e65634fdce
-EBUILD chrpath-0.16.ebuild 1050 BLAKE2B b18bf1c2123cae1f6d422e2d79186f95941fef87949685d646207c0b18a0bff746d019eb47a7b64a4e65e33a7d86c4b2062c1111782cb8be06873aac35c5b5e4 SHA512 b7c7b1bee6f9fb2139355bad7ee4973f0c862e9074be3ddd2bb0b5f9ddc1c65f5306392d3481a0cca6f6bd12f594af54395d4d72b27326ec7ba80971c83b6751
+EBUILD chrpath-0.16-r1.ebuild 937 BLAKE2B 546a1d52ba5ca94af50838be64b8b5bc940b7d8c290ab2cd1cf525978d72642e8515f1128882137f072333115fea0df4d49c4e9fac2266f847bad1d1e39e099c SHA512 21d25f62af238957a95df66153758f2d07e85885bf566d8b8e87080726d7fa983f36b115313979097d03600f0593970a5dd79d5e3a2bbe6c9dce7bd7d6015783
 MISC metadata.xml 327 BLAKE2B 666c7327826c5b52e20272cd33b5cbd984955ad06f87ff25431aa588c85dad5b8c2756b44046c51fb039df924c7f45c1b322dbcb4d42aa97894a175984e13356 SHA512 962e2bc7783c7e7b666956bc746691c295a41aa52720809b3c91afc2691d5a8fb8954fe993954112afd4ceb51af59b68564b52fbeeb9c86be480cf788c60d667
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
deleted file mode 100644
index 89d26b3b7e07..000000000000
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Chrpath can modify the rpath and runpath of ELF executables"
-HOMEPAGE="https://directory.fsf.org/wiki/Chrpath"
-# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${PN}-keepgoing.patch
-	"${FILESDIR}"/${P}-testsuite-1.patch
-)
-
-src_prepare() {
-	default
-	# disable installing redundant docs in the wrong dir
-	sed -i -e '/doc_DATA/d' Makefile.am || die
-	# fix for automake-1.13, #467538
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/app-admin/chrpath/chrpath-0.16.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild
index 70462428ff6c..287cacc4a7d6 100644
--- a/app-admin/chrpath/chrpath-0.16.ebuild
+++ b/app-admin/chrpath/chrpath-0.16-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,8 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
@@ -29,13 +28,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
deleted file mode 100644
index e7db0a124053..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-multilib.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: chrpath-0.13/Makefile.am
-===================================================================
---- chrpath-0.13.orig/Makefile.am
-+++ chrpath-0.13/Makefile.am
-@@ -12,12 +12,19 @@ debs:
- 	fakeroot debian/rules binary
- 
- chrpath_SOURCES = \
--	chrpath.c	\
--	killrpath.c	\
- 	main.c		\
--	elf.c		\
- 	protos.h
- 
-+chrpath_LDADD = $(LDLIBS)
-+
-+lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
-+libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4
-+libchrpath32_la_LDFLAGS = -avoid-version
-+libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8
-+libchrpath64_la_LDFLAGS = -avoid-version
-+
- EXTRA_DIST = ChangeLog.usermap $(man_MANS)
- 
- CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
-Index: chrpath-0.13/configure.ac
-===================================================================
---- chrpath-0.13.orig/configure.ac
-+++ chrpath-0.13/configure.ac
-@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- 
-@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_BIGENDIAN
--AC_CHECK_SIZEOF(void *)
- 
- dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt_long)
- 
-+dnl See if we need -ldl on this platform for dlopen
-+LDLIBS=
-+save_LIBS="$LIBS"
-+LIBS=
-+AC_SEARCH_LIBS([dlopen], [dl])
-+LDLIBS=${LIBS}
-+LIBS="${save_LIBS}"
-+AC_SUBST([LDLIBS])
-+
- if eval "test x$GCC = xyes"; then
-   for flag in \
-       -ansi \
-Index: chrpath-0.13/main.c
-===================================================================
---- chrpath-0.13.orig/main.c
-+++ chrpath-0.13/main.c
-@@ -12,13 +12,19 @@
- #  include "config.h"
- #endif
- 
-+#include <dlfcn.h>
-+#include <elf.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
--#include "protos.h"
-+
-+typedef int (*killrpath_t)(const char *filename);
-+typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert);
- 
- #ifdef HAVE_GETOPT_LONG
- #  define GETOPT_LONG getopt_long
-@@ -61,6 +67,30 @@ usage(char *progname)
-   printf("\n");
- }
- 
-+static unsigned
-+elf_class(const char *filename)
-+{
-+   Elf32_Ehdr ehdr;
-+   int fd;
-+
-+   fd = open(filename, O_RDONLY);
-+   if (fd == -1)
-+     return 0;
-+   if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
-+   {
-+     close(fd);
-+     return 0;
-+   }
-+   close(fd);
-+   if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
-+       || (ehdr.e_ident[EI_VERSION] != EV_CURRENT))
-+   {
-+     fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename);
-+     return 0;
-+   }
-+   return ehdr.e_ident[EI_CLASS];
-+}
-+
- int
- main(int argc, char * const argv[])
- {
-@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
- #ifdef HAVE_GETOPT_LONG
-   int option_index = 0;
- #endif /* HAVE_GETOPT_LONG */
-+  void* dll[2];
-+  killrpath_t killrpath[2];
-+  chrpath_t chrpath[2];
- 
-   if (argc < 2)
-     {
-@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
-       }
-   } while (-1 != opt);
- 
-+  dll[0] = dlopen("libchrpath32.so", RTLD_LAZY);
-+  killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath");
-+  chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath");
-+
-+  dll[1] = dlopen("libchrpath64.so", RTLD_LAZY);
-+  killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath");
-+  chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath");
-+
-   while (optind < argc && (!retval || keep_going))
-     {
-+      const char* program = argv[optind++];
-+      unsigned eclass = elf_class(program);
-+      if (!eclass)
-+      {
-+        retval = 1;
-+        continue;
-+      }
-       if (remove)
--        retval |= killrpath(argv[optind++]);
-+        retval |= killrpath[eclass - ELFCLASS32](program);
-       else
-         /* list by default, replace if path is set */
--        retval |= chrpath(argv[optind++], newpath, convert);
-+        retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert);
-     }
- 
-+  dlclose(dll[0]);
-+  dlclose(dll[1]);
-   return retval;
- }
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
deleted file mode 100644
index 1a30ce1eb94a..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
-Date: 2010-04-04
-Initial Package Version: 0.13
-Origin: me
-Upstream Status: unknown
-Description: make the testsuite run with the new mltilib design
- 
-diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
---- chrpath-0.13.orig/testsuite/runtest.sh	2010-04-04 09:02:21.859114159 +0000
-+++ chrpath-0.13/testsuite/runtest.sh	2010-04-04 09:42:08.762112560 +0000
-@@ -2,6 +2,8 @@
- 
- set -x
- 
-+export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
-+
- CHRPATH=../chrpath
- 
- retval=0
diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch
deleted file mode 100644
index d8f6965729ff..000000000000
--- a/app-admin/chrpath/files/chrpath-keepgoing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrpath-0.13/main.c.orig	2006-02-27 20:21:06.000000000 +0100
-+++ chrpath-0.13/main.c	2006-02-27 21:07:16.027641500 +0100
-@@ -57,6 +57,7 @@
-   printf("   -r <path>|--replace <path>  Replace current rpath/runpath setting\n");
-   printf("                               with the path given\n");
-   printf("   -l|--list                   List the current rpath/runpath (default)\n");
-+  printf("   -k|--keepgoing              Continue as much as possible after an error.\n");
-   printf("   -h|--help                   Show this usage information.\n");
- #ifndef HAVE_GETOPT_LONG
-   printf("\n *** The long options are not available on this platform");
---- chrpath-0.13/chrpath.1.orig	2004-09-19 10:35:44.000000000 +0200
-+++ chrpath-0.13/chrpath.1	2006-02-28 10:06:28.187060500 +0100
-@@ -22,6 +22,7 @@
- [ \fB-r\fP \fI<path>\fP |\  \fB--replace\fP \fI<path>\fP ]
- [ \fB-c\fP | \fB--convert\fP ]
- [ \fB-l\fP | \fB--list\fP ]
-+[ \fB-k\fP | \fB--keepgoing\fP ]
- [ \fB-h\fP | \fB--help\fP ]
- \fI<program>\fP [ \fI<program>\fP ... ]
- .SH DESCRIPTION