gentoo auto-resync : 30:12:2023 - 17:41:14

4 files changed, 32 insertions, 11 deletions

diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest
index 9d0c39c22cd0..527b39e82b3e 100644
--- a/app-arch/pdv/Manifest
+++ b/app-arch/pdv/Manifest
@@ -1,8 +1,9 @@
 AUX pdv-1.5.1-default-args.patch 892 BLAKE2B 24fb0f0931ffd35e36eff66f0a0d8c09483b8f16b50e8db824a4313b650a4f2b8ba4db8a1fd985c647fea3b057a19c17acca9623e04f0901376a51d27c3532c1 SHA512 31f3b4f3331723e1bb99b16a9e9c80eb55d95dfce3bc3cbce7d3f629c1aadb16e5dc037bfa4a6157e1a85e889444d0c5c0b687022bf1e60d9a49acc8352e4f34
 AUX pdv-1.5.1-early-free.patch 512 BLAKE2B 085bb8891aacdaf8193dc70cdc009c845a87a53700b9d4100b6984fae7ee6afdd628a12b53b555a45c17400a0e62dbc3a5541556eb246f1bf708939494de3eb7 SHA512 52c921d80e33233e92c44948e9468f93b093bac4ae500e7e3a6b54b6e9b3d8d38c30ad776ea53e86e2000d634a0e7fb03e95b0df39b1fd88624831bb4f95e563
-AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19f7d965ae0e1f9af91f597dbaa91e2157b461d1492ff21704d5664dbe1583c13d4aa100b94592b31e13566efec SHA512 e45976aea1f0573ccd31379759c32e2504637b183a31451aca0ccf628ce12301760fb005376768c2f98d697dde59489768edad10c542d21a06a69d06b6c43b19
+AUX pdv-1.5.1-missing-prototype.patch 492 BLAKE2B ba5eede0f6f68fa4c01d00eeb43126b11428714308732ccc9dc3ef8c44cbb6f3c9a0db4e14e49bf204ff97905b4b0656b34573905f278810c9f3c1d110f7cdba SHA512 81ad740df65267870effe70309fbf22941b1bec7ecd1a6078f414261f29e65528674743f62f444543431f665dfc7eed23b579975d7af20bb54df63ffdb169296
+AUX pdv-1.5.1-no-strip.patch 290 BLAKE2B 28b9b590fd4f63deab7704f97d7113e212631a715350cad6204e3530b7d326b94cda1bb5d71ee9427601cffbce151e9e023d26a5a48fd3aa2e86a5a06a0c2124 SHA512 cdb378cade0391c186cbaf294187edbcac08f29cf6ac8ecf5510ab08d49f3bed658605284a2b3c089526b3979c70ae65c98363f3dfc41e0031ed0d4edccc0f64
 AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599
 AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6
 DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9
-EBUILD pdv-1.5.1-r4.ebuild 1333 BLAKE2B 70893c6d8c7e5b13133f169edf60e278b2b38f371c7bad2c6d6c9821eb95ae08b030f5bf648617b2f23a1e485504c12535ba5e17177bf03946c07e70451be036 SHA512 e7d221d9425b79f8419d861523da8f3d78d34d8cd80f252f8939def9d314fa33488e8ae24d0ba68b85c8e1f8695136776a6fdb259e3b83ec1040a42767a7c323
+EBUILD pdv-1.5.1-r5.ebuild 1478 BLAKE2B 81f0a8e0589606b96ff2438bec8d03e9e5e57cb9f9b63ce3f7352101a45e0313523bc9801f26f76e4745186ce5e7a64bb21d0e01cda95ca7f63aada8eabb5828 SHA512 1f05ed224fa3758bb093387d9203950484376af3ccecd71e6b3b31c89e68c24f381ed429b37cc43bc783808d56dc3e3f9c212de5c01ef1bf1a3c5427430102d8
 MISC metadata.xml 241 BLAKE2B 1e13023492f2426db80ee90a5464ecf1f693d957ef0542b2056dd1192034ac221274fd567c7670b855aee6f8627a4bbb48f2dd742d1e20b694d64fd49668c01f SHA512 d0c4ed2f7603606fa507fe29346d101d3dd07d59029067cdf65c63dc2859c99f72a56e56cd5f04e5e1bb9246ce68d6432fc38e991517ba484508e352f8637e01
diff --git a/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch
new file mode 100644
index 000000000000..d35ddedfda74
--- /dev/null
+++ b/app-arch/pdv/files/pdv-1.5.1-missing-prototype.patch
@@ -0,0 +1,19 @@
+Add missing prototype to a common header file.
+
+Bug: https://bugs.gentoo.org/882157
+
+diff --git a/X11/xmpdvmkpkg.h b/X11/xmpdvmkpkg.h
+index abaaa47..fd6c6f5 100644
+--- a/X11/xmpdvmkpkg.h
++++ b/X11/xmpdvmkpkg.h
+@@ -76,6 +76,7 @@ extern Widget g_statusw;
+ void spectowidgets(void);
+ void widgetstospec(struct pdvspec_st *spec);
+ int  cmpspecandwidgets(void);
++void statusmsg(char *fmt, ...);
+ void xu_SetMainTitle(const char *newtitle, const char *newprefix
+  , Widget topshell);
+ 
+-- 
+2.41.0
+
diff --git a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch
index 630bf5eb7c36..4beaeb1c4889 100644
--- a/app-arch/pdv/files/pdv-1.5.1-no-strip.patch
+++ b/app-arch/pdv/files/pdv-1.5.1-no-strip.patch
@@ -1,13 +1,12 @@
-diff -ur pdv-1.5.1-orig/pdv.c pdv-1.5.1/pdv.c
---- pdv-1.5.1-orig/Makefile.in	2008-12-06 23:17:46.000000000 -0800
-+++ pdv-1.5.1/Makefile.in	2008-12-06 23:18:37.000000000 -0800
-@@ -536,7 +536,8 @@
+diff --git a/extra.mk b/extra.mk
+index 65f6e72..e681adb 100644
+--- a/extra.mk
++++ b/extra.mk
+@@ -11,7 +11,6 @@ pdv_fixed.c : Makefile
  	touch $@
  
  pdv_fixed : pdv_fixed.c pdv
 -	$(STRIPBIN) pdv
-+	# let portage decide whether to strip binaries
-+	#$(STRIPBIN) pdv
  	printf "%-5.5s" $$VERSION >> pdv
  	printf "\000\000\000\000\000\000\000\000" >> pdv
  	sleep 1
diff --git a/app-arch/pdv/pdv-1.5.1-r4.ebuild b/app-arch/pdv/pdv-1.5.1-r5.ebuild
index b50f939fa91a..dc90318206d0 100644
--- a/app-arch/pdv/pdv-1.5.1-r4.ebuild
+++ b/app-arch/pdv/pdv-1.5.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools toolchain-funcs
 
 DESCRIPTION="build a self-extracting and self-installing binary package"
-HOMEPAGE="https://sourceforge.net/projects/pdv"
+HOMEPAGE="https://sourceforge.net/projects/pdv/"
 SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -34,13 +34,15 @@ PATCHES=(
 	"${FILESDIR}"/${P}-default-args.patch
 	# prevent pre-stripped binaries
 	"${FILESDIR}"/${P}-no-strip.patch
+	# missing function prototype, see bug #882157
+	"${FILESDIR}"/${P}-missing-prototype.patch
 )
 
 src_prepare() {
 	default
 
 	# re-build configure script since patch was applied to configure.in
-	cd X11 || die
+	# and to refresh old compiler checks, see bugs #880351 and #906002
 	eautoreconf
 }