gentoo resync : 22.01.2021

4 files changed, 51 insertions, 13 deletions

diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
index 720089bb2f92..930179263c04 100644
--- a/dev-util/pretrace/Manifest
+++ b/dev-util/pretrace/Manifest
@@ -1,5 +1,6 @@
 AUX pretrace-0.4--as-needed.diff 511 BLAKE2B 24e47775031a3a9070a4e4c27432572c5b941029659d08e7123847610af6e71bf7bd12e642e91522e4fe8eea68edbc011c24b06245b3b12fb62016bc935994ec SHA512 f12393152ac127e2edc32e51ae185517d053e9022537f69b0ffb74a95ea86551375b70423e8d661f5bed2c252f035023262da66b128750eb8809dfb4a0e8e8b3
-AUX pretrace-0.4-build.patch 315 BLAKE2B 2747739ef3fb6cc33b431d8b4ed65c72fe8073a324bc575fe4463c26f09796dc86b7baa1f2c497fd9954bd594f00fa53883a60aa2c8fb7259113dad3725dbe76 SHA512 282315443239ea2baa12e125d84c6a768010d57a2a7a5050c887ecb9d20b2df1fdf4f7901d80746b809a008cc83af53f20172a8fedf7bef43b1e4ece13f13b5c
-DIST libpretrace-0.4.tar.gz 7370 BLAKE2B 08fb2022433af807675ef089dcf1fbd642c165b353959f81547c2f65fd9e60c49b7494c661f81698c738bd27a3cdbd28d6a227589ef7a2906c5fa930d9709fc6 SHA512 64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8
-EBUILD pretrace-0.4-r1.ebuild 821 BLAKE2B 7c208871ffb91f64ab7aa944342693bb39b334a11ce00673b39e87bbecef6887f22acc12799a88765cdb720f04199980c0cfd5bfed4860bb1dbde9dd112ba080 SHA512 3a73362df6f543c43d776182d763254eb11d0f8aa522aae409a8709711434b5900cd53ad7fc22d66f9b27f5345ec91c2b8f9f1b9c8398691502eb9fac9ee0b3f
+AUX pretrace-0.4-build.patch 319 BLAKE2B f6850c72f697d56b9f2d788b94fffd325cacb6893191d1ed9d71e9d637270275bee7e659ca280a2e68011f634951f6b5cd61056fa8f33115315b8e57083e1509 SHA512 26ba187a59107f2954d8065aafd67d1aef8b2d178ab73d6226d25db4d2e004f12c07f4d6c8829cf76ecf983b517244d9446f6cae27333d9ea67ef7088e57c15d
+AUX pretrace-0.4-qa.patch 1330 BLAKE2B e8ecfc7ec5b50f87c4aa7e50d1d05f8c5eca4dd407c3d41e4687dfb04330fa64aa9302c240538fc13c32275a50f8497c6210877593b2835b26884585d19d554f SHA512 26e0b9611000eaa6147d6d2b5418a3a2edee0851e5d99f1129f7cd0056f7d616ea0a6afe3f729217f5d97335912f9b6b6824ef0ebc7afa144a0feb46f01410dd
+DIST pretrace-0.4.tar.xz 6988 BLAKE2B a9b05aa106142fa090e09bd6c07d2972be72453e1bfe5a15a0b67c8bb5c3a20c2e19ad03dc738f24b6bcbee5629ad47438cdf04b1eab8c1d757fe4d62ee59a9e SHA512 cdd70b9b06451c0142c79b50f2264c034bdc8d815edaaeb78bbde55127a31a68e49df7ba2d6599bd108f9161f768afca84e85a917ef7353b1ace9e2256be84ef
+EBUILD pretrace-0.4-r2.ebuild 823 BLAKE2B c141452f55e3c1143f8dedd3e0b772efd77e4eab6218b290050eb5c728b1e29120a6e29f22d7a235edbaf0d5e43d4e8aeaae76cee6182ea56bf62892aee9c766 SHA512 e641a7f300825607369eb2d43342b7041ba7d2f4052f4ea7a8c922ae9eb7b71346645117e4ed6775eb464be1f193be8675395ad3cfbeaea51485abc7b9fea5dc
 MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/pretrace/files/pretrace-0.4-build.patch b/dev-util/pretrace/files/pretrace-0.4-build.patch
index 4d7056fa83f7..9db1cb241e7b 100644
--- a/dev-util/pretrace/files/pretrace-0.4-build.patch
+++ b/dev-util/pretrace/files/pretrace-0.4-build.patch
@@ -2,8 +2,8 @@ fix building with newer glibc
 
 http://bugs.gentoo.org/227923
 
---- pretrace.h
-+++ pretrace.h
+--- a/pretrace.h
++++ b/pretrace.h
 @@ -20,3 +20,8 @@
  #include <sys/time.h>
  # define RANDOMIZE(x) { struct timeval tv; gettimeofday(&tv, NULL); x = tv.tv_usec; }
diff --git a/dev-util/pretrace/files/pretrace-0.4-qa.patch b/dev-util/pretrace/files/pretrace-0.4-qa.patch
new file mode 100644
index 000000000000..8cf40e796a12
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4-qa.patch
@@ -0,0 +1,39 @@
+--- pretrace-0.4/Makefile.orig	2021-01-14 13:31:45.950615134 +0300
++++ pretrace-0.4/Makefile	2021-01-14 13:32:04.940676578 +0300
+@@ -2,14 +2,14 @@
+ # $Id: Makefile,v 1.1 2005/07/27 07:45:37 taviso Exp $
+ #
+ 
+-VERSION=0.4
++VERSION?=0.4
+ PREFIX=/usr/local
+ DOCDIR=$(PREFIX)/share/doc/pretrace-$(VERSION)
+ LIBDIR=$(PREFIX)/lib
+ BINDIR=$(PREFIX)/bin
+ MANDIR=$(PREFIX)/share/man
+ 
+-all: libpretrace.so ptgenmap doc
++all: libpretrace.so ptgenmap
+ 	@echo 'libpretrace.so has been built, please see README for instructions.'
+ 	@echo 'type `make install` to install to $(PREFIX)'
+ 
+@@ -26,7 +26,7 @@
+ 	$(CC) $(CFLAGS) -Wall -g -fPIC -c trie.c
+ 
+ libpretrace.so: libpretrace.o trie.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -g -shared -o libpretrace.so libpretrace.o trie.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -g -shared -Wl,-soname,libpretrace.so -o libpretrace.so libpretrace.o trie.o
+ 
+ doc:
+ 	gzip -9c pretrace.3 > pretrace.3.gz
+@@ -38,8 +41,8 @@
+ 	install -m 0755 libpretrace.so $(LIBDIR)
+ 	install -m 0755 ptgenmap $(BINDIR)
+ 	install -m 0644 README pretrace.conf.example ChangeLog $(DOCDIR)
+-	install -m 0644 pretrace.3.gz $(MANDIR)/man3
+-	install -m 0644 ptgenmap.8.gz $(MANDIR)/man8
++	install -m 0644 pretrace.3 $(MANDIR)/man3
++	install -m 0644 ptgenmap.8 $(MANDIR)/man8
+ 
+ clean:
+ 	-rm -f libpretrace.so libpretrace.o trie.o ptgenmap.o ptgenmap *~
diff --git a/dev-util/pretrace/pretrace-0.4-r1.ebuild b/dev-util/pretrace/pretrace-0.4-r2.ebuild
index 998da63f1052..c6ff1edc5859 100644
--- a/dev-util/pretrace/pretrace-0.4-r1.ebuild
+++ b/dev-util/pretrace/pretrace-0.4-r2.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit readme.gentoo-r1
 
 DESCRIPTION="start dynamically linked applications under debugging environment"
-HOMEPAGE="http://dev.inversepath.com/trac/pretrace"
-SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz"
+HOMEPAGE="https://github.com/robholland/pretrace"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/lib${P}"
 
 DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
 
 PATCHES=(
 	"${FILESDIR}"/${P}--as-needed.diff
 	"${FILESDIR}"/${P}-build.patch #227923
+	"${FILESDIR}"/${P}-qa.patch
 )
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man3 /usr/share/man/man8
-	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" install
+	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" VERSION="${PVR}" install
 	readme.gentoo_create_doc
 }