gentoo resync : 28.04.2021

4 files changed, 19 insertions, 15 deletions

diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 5d66c15f6100..8d5f48efe9d4 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,5 @@
-AUX picpuz-2.5-build.patch 5499 BLAKE2B cb568f817502eef15695e5f1cdaad837127e6004616b63596125b3538421c51e11edafc9421b173809cc22fb166d636eb47467d23ad12b5a7446a21638e5d9ea SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11
-AUX picpuz-2.5-pthread-underlinking.patch 842 BLAKE2B c347703e5b8d069872c34b7af776ea5e5e27967683db9fa7834c876482e22dd41e36d3c16b7da31235bd0e5f5228dccf1e279be80969757a69acc8bc1b215532 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658
+AUX picpuz-2.5-build.patch 5466 BLAKE2B c99edcd74cfdd606f10b8b579ab9daf718e43618a331251c5fbecd0e4166cc959e4eead0bc6a292c875b73126cb4602cf5f23fec75bdcbfe4c61d3d44cc00f8d SHA512 5029124dfc9ed9a338cbe8899831dff38bea28b44cee612bfc95cd1ea434a4f942d53a832a4769229e7f31244a278d6ceae27e499108d4fe3b9e7c7e3a518622
+AUX picpuz-2.5-pthread-underlinking.patch 785 BLAKE2B 6b25d10b1c545a96965667032fa0c39b892b634e069d13079c8993f3b0a3ba1e7d0c7ccf74ac40dd10aa3663f2d06fe017d8f6b7cb3241d5d7b16a0244699999 SHA512 d2dfc2c44599bd125124709f6ecbc24b02c24cf8d3129a54d5f4ad434044689953606e062c784ba8200f40bec3175d8fa8f4d1e3643a925884374ccca394c424
 DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1044 BLAKE2B eb75be02e73ea8f0c4d0faa9f062a3b8591ce1c6a388f7a92b661dd1d0274c59accc2d3c3183139554ec7e83e9538e98d18b1e7dcb0b079aa9945dd53ac0b654 SHA512 32bd76f61cd94c14bdb3f6c831896249f4b657522eff6d8a7cc7e42c05bc28584bd772d080f50c5555293dcd448068b17eef3f59d130393873a29ce9c5e1cf17
+EBUILD picpuz-2.5-r1.ebuild 1081 BLAKE2B 198d039674871dcbb37bdf217b9b3a45711d29b169c7de3667c561a09a141505b90f151ec53b16c47104beededba8b53da85056402f09195e86b0f0e28df1754 SHA512 aeb931c5a26d595cb475af3293cd4651e869ddf6e65982a6a840e32de23a9359a1985363be1fa8fce28ef87da4f6ea01851c3661ef7f074a7f0df047a2d256c0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
index dfec57fe6ec0..6ca26e178bbf 100644
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
@@ -1,8 +1,8 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sat Jul 21 17:03:11 UTC 2012
 
---- picpuz-2.5/Makefile
-+++ picpuz-2.5/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -11,24 +11,26 @@
  
  # target install directories
@@ -18,7 +18,7 @@ Date: Sat Jul 21 17:03:11 UTC 2012
  MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
  
 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
++CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
  LIBS = `pkg-config --libs gtk+-3.0`
  
  $(PROGRAM): $(PROGRAM).o zfuncs.o
@@ -46,8 +46,8 @@ Date: Sat Jul 21 17:03:11 UTC 2012
  	rm -R -f  $(DESTDIR)$(DOCDIR)
  	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
  	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- picpuz-2.5/zfuncs.cc
-+++ picpuz-2.5/zfuncs.cc
+--- a/zfuncs.cc
++++ b/zfuncs.cc
 @@ -3111,7 +3111,6 @@
           /prefix/share/appname/locales/         translations: appname-de.po  etc.
           /home/user/.appname/                   parameters etc. are copied here
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
index 652231f1d4ff..f11f95cbf72b 100644
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
@@ -3,16 +3,14 @@ Fix underlinking on recent binutils:
 > x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
 > /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
 > /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
-diff --git a/Makefile b/Makefile
-index 28638de..700b610 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
  MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
  
- CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+ CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
 -LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `pkg-config --libs gtk+-3.0`
++LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
  
  $(PROGRAM): $(PROGRAM).o zfuncs.o
  	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 5da7fe0df616..2b1863eb8bbe 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit desktop gnome2-utils
+
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="A jigsaw puzzle program"
 HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
@@ -11,7 +12,6 @@ SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
@@ -24,6 +24,8 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export CXX PKG_CONFIG
+
 	emake \
 		BINDIR="/usr/bin" \
 		DATADIR=/usr/share/${PN} \
@@ -32,11 +34,15 @@ src_compile() {
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r icons locales
+
 	doicon -s 48 icons/${PN}.png
 	make_desktop_entry ${PN} Picpuz
+
 	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+
 	dodoc doc/{changelog,README,translations}
 	newman doc/${PN}.man ${PN}.1
 }