gentoo resync : 16.09.2020

3 files changed, 32 insertions, 15 deletions

diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index a199e6985e84..cc3476fb1624 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -1,4 +1,4 @@
-AUX vncsnapshot-1.2a-amd64grey.patch 408 BLAKE2B 4d48218067db7ebba1c9effecc0a1328dd6d49f2dcb3f5b666c27a7a3986a425d18a9abbec8abc24b446d1f3be66bdb4198d77083f98f921875f1cf9d0630bdd SHA512 b5a90a5917c71f5d30608bfa8316ac052b377e024d871754fefc7f1fa13e29eb49be587b5c99d65e9058c65a914120c646194bb25ad114220a439642f3e24ea9
+AUX vncsnapshot-1.2a-amd64grey.patch 312 BLAKE2B 573ec5b25b6829f3702c3f6e1c26160c89edf043ffa59e90e6d4664d51e124dfe688a282ab252f112a55e9eb5df31a2c1e205b7287bc0e8805f005288f29588c SHA512 73065578ac7cc52dbee7043feeea9bab3ec37ed4b0264232fcc531247a685feb41891588141863f861881b982be25db957d0c65ff23775ebcdddeabeaace6d7a
 DIST vncsnapshot-1.2a-src.tar.bz2 70121 BLAKE2B 91e2d1e998f102707e00e5e83e9060fa88f1140b64029564977b93ac5b701be3408540ef76addf4ddf2cccfa973c59f94a127c74f44143c3683e38b0e9359c6d SHA512 2ae53a043c11d02bbb7ff6afc000eef268448643ba1db7b6c5a55fe3e25e65e1b22e64e855d33dfe55b1df04dc57f592e48c44918943642da19f7d06df77027c
-EBUILD vncsnapshot-1.2a.ebuild 1001 BLAKE2B 78e4da23b4742f6bb9514d5e61bc9f3b4fecede035c8d08196e3b8ecd3ccaeec4f602c38fdab7b571e3d973044a016a99b1925153c4baa4ec25bdea53fbefe61 SHA512 1c55e5b579eb00e45b0bf93b7b101f945b0b1b7df609cff5aedebd8671ca2df0e13b49a6fb3a86b2684240fd5fa1d7fb5fb84ab56584f8ec734716e97471d4fd
+EBUILD vncsnapshot-1.2a.ebuild 1231 BLAKE2B bdc88a19c6b5434da7460492d350a4fd765afaf786289f4b4d0d1678d14fdc22f774dddf499aaee08ab216366066ff149611c92c55e3141fb383486dbd3d4e4c SHA512 bd1adad07f345ac834c40f6ae9ac1bf7981783dd6cce9dd17a55d74038914d38035ace7458631e6658d67db6f13cc999d80dd8872a76a7529a68d07ff9be8d00
 MISC metadata.xml 248 BLAKE2B 28a5e2c7f4227ef05251fe01d656fded49975e8173cf4e1fafafcee38306fd6a79485b71cfa227fe92cac85267616cdf7f052ded4aa78c08bcce0a5d56c68524 SHA512 bbd64700d2397ca9fd98cd273404e7a3d744d7aea1e2c7237e5d157786966841c7156d716b47da9cb46dbc248c25e2aa9dcf1be44f0583e50cdc9c1b253de799
diff --git a/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch b/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch
index ee5807b58af9..ac8fdce76a84 100644
--- a/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch
+++ b/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch
@@ -1,6 +1,5 @@
-diff -aur vncsnapshot-1.2a-orig/rfb.h vncsnapshot-1.2a/rfb.h
---- vncsnapshot-1.2a-orig/rfb.h	2002-02-09 16:00:42.000000000 -0500
-+++ vncsnapshot-1.2a/rfb.h	2008-09-24 16:57:13.000000000 -0400
+--- a/rfb.h	2002-02-09 16:00:42.000000000 -0500
++++ b/rfb.h	2008-09-24 16:57:13.000000000 -0400
 @@ -34,7 +34,7 @@
  
  // Define the CARD* types as used in X11/Xmd.h
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 221b1344f245..91d250b58b94 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
 HOMEPAGE="http://vncsnapshot.sourceforge.net/"
@@ -12,32 +12,50 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
 DEPEND="
+	sys-libs/zlib
 	virtual/jpeg
-	>=sys-libs/zlib-1.1.4"
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-amd64grey.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-amd64grey.patch"
+	default
+
 	sed \
 		-e 's:-I/usr/local/include::g' \
 		-e 's:-L/usr/local/lib::g' \
 		-e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
 		-e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
 		-i Makefile || die
+
+	# Preserve make instance
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+
+	# Respect RANLIB
+	sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die
 }
 
 src_compile() {
-	#note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
-	#      we lost the INCLUDES in the makefile.
+	# We override CDEBUGFLAGS instead of CFLAGS because otherwise
+	# we lose the INCLUDES in the makefile. The same flags are used
+	# for both.
 	# bug #295741
-	emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	local args=(
+		AR="$(tc-getAR)"
+		CDEBUGFLAGS="${CXXFLAGS}"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${args[@]}"
 }
 
 src_install() {
 	dobin vncsnapshot
-	cp vncsnapshot.man1 vncsnapshot.1
-	doman vncsnapshot.1
+	newman vncsnapshot.man1 vncsnapshot.1
 }