gentoo resync : 17.02.2021

7 files changed, 106 insertions, 25 deletions

diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest
index 91fbb17ef4c1..06e411f9b71b 100644
--- a/net-print/mtink/Manifest
+++ b/net-print/mtink/Manifest
@@ -1,7 +1,9 @@
-AUX mtink-1.0.16-flags.patch 10583 BLAKE2B aeddc279ca436ccbefd182f4f1a27e2ac2e0a9f171fe90cd4c44a424ea6d6a9f4c9d200238d320e0b0e47252793e0fe30ffa7249bad53c59d080991dc7689c11 SHA512 a4a6767139e1bf0d0ab8efaf82a1cb7abfa084505a3ef6ecfe6ef43aa9fa813ebd8e81aeae5be0582ff1fb9938e8c3f72611c2b7a898c9290d6b98508a93201f
-AUX mtink-1.0.16-overflow.patch 421 BLAKE2B 6588f9d2025e866a3fda2eb518e19c4cabf5540eec503759a902d67f80b4bc148880042d2510d18b758d134abc63c64fe6f4afaa475734fbc2279e77b5b61a8b SHA512 801e7fa935b965398f2d2cb9b5384d5868485b09879636fb385c5d84be80a725b51a3fde8c94253749bc35e1dece4f879d1a292b4b557d592a26a3f7fc731159
+AUX mtink-1.0.16-flags.patch 10417 BLAKE2B 0dda45b5875baf2eeff920a01a70c12e00d6e0c2d3b132f6db4ca3a49c98ca823fb3c7da5d5e922a0cb9bd559c84df4157bc03d546c18319a47d1ead9776636c SHA512 89ec2300c62d0b5199f9132570c2add7ecbb9bb458cdc70fc4ecffa534a4a1c594c19f07320fb71653d5b9ef6dcf3e20b3c06679d05eb4d9a24549f7ec4e0a2d
+AUX mtink-1.0.16-fno-common.patch 503 BLAKE2B 0fc490e0d8841b14e325271f6c74ea9cc7f1d3a1458ce4e97818104203d2e0bd7ce46aef04c3643591bb6904068d0de070f57840dba184e7ea1fd0054ee77736 SHA512 985e6bd88f921f524c868c691dd0f22f176f7802f739595d8965e965973cba56b35effc7f4c7367d83db67e35ad160892f5f7e34e3ea0a37a22ecdb0ee5be009
+AUX mtink-1.0.16-motif.patch 1095 BLAKE2B aada78e3861cf32bcdb3059c1bf0983ea43df94033caf7ae5a411ff6e277363aab85ca84c4e859af976bf3085ccdc1db0b2e73a159a7603dcf0dfa81f011a943 SHA512 9e8bb6a7ed81afd9c2571ad45936637fcb7ed009ef057045d7272ee210c7420a203a18c9295e4101ad347e1ba899d9f8335e71db0f3b73b5db245afae3991379
+AUX mtink-1.0.16-overflow.patch 349 BLAKE2B 8c6e634f0b482ec6148a3ca6d75b783f34d444304a10967219b9b9ad77a1f56417c977a67005c25518d7950f16a58cb01acb99e4057c5f5507dcfcf91088ba56 SHA512 7cd6f508838d038e16838c1e6fef5810980521cd6d16e3a8c5c15b5fea534372b4d0763324724402f67f6378c5eb65d99aa8204a0cd718c18653ffe188426415
 AUX mtinkd.confd 383 BLAKE2B f407d4f3302d027f8bc2208554100ef427e9fa0735d488b75447b87a3fd0588978ff25425b384da33edfd38c02e0e66cb3e8433a9a7ef97d0e03042616bec8e5 SHA512 83bdc7aa3947c0f4f2161288fe634d355205a9e097cac6e82c2bc7f55afd6ae8bbee15c1871089ddf1c718b587a0f6929ad4be0590c601b7e3428c0ef79ed331
 AUX mtinkd.rc 332 BLAKE2B ba7902b7d2e2aa00530ba1466d78eb9f91311ea164c242e2980cf5139624e9fbd607d26e824925acfa4fa7c8a6f29c76435c05b5ad143268119aa5d1677f4e7d SHA512 764cf45bf56f2fa50b3b927422e2374e1142ac1b29022b0f44cd462618587fa568200b08f56d802d3754698928a6f65a39d05d3cfde51c32b57db3b85fbca034
 DIST mtink-1.0.16.tar.gz 916315 BLAKE2B 27ea1a44b1271530ea9537ee651c5e8006a68239fbc350292bb26bbab36c619263804122e2ac20d8c473ed3515e8d2d03bccd74fa98da70dfcf215433b74d326 SHA512 e760b09643e55d4dfa6367cad2da3695db1af3e9b2f0ff1ad4a72eedfb0393b797af507b0e02d7f17300824959f4224ec8cbd745cfa1c45c55f7ab0fab34dec4
-EBUILD mtink-1.0.16-r2.ebuild 1575 BLAKE2B 941f79d2a9526a24a6ccf49d543b8cf823c4b211cfc16f7247b04cfda0921bb9f21b05b0559f607e84afd550f763fa4a8d3f91f5dd6dacdc21aab0c2c5fc5a15 SHA512 6c7e76860c5e8a156e96683dc375297e5e24bf7ecd805f8f14357440c5f1f93c517a369e0f2b258f26d876c6bf1c61f5dca185500892deaf80a2c83ab943e498
-MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
+EBUILD mtink-1.0.16-r2.ebuild 1776 BLAKE2B bd8b35039c06bd7d280778facff7006ee7b939ccdac4ae6924d5c4a2b871abae5679bffc89cc56fda745e35740689b6c02a3a35952c197879ed7777f57f07fdb SHA512 06e2aa43335fe8efe7433d1e4d2b82f9338757e7a892565aef9379450264c748161074cb548e31bbe40d6fdfb6e8941efa386c9b0372e660352247ad584ac77b
+MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/mtink/files/mtink-1.0.16-flags.patch b/net-print/mtink/files/mtink-1.0.16-flags.patch
index bee6c339e3f8..f1c4fe680247 100644
--- a/net-print/mtink/files/mtink-1.0.16-flags.patch
+++ b/net-print/mtink/files/mtink-1.0.16-flags.patch
@@ -1,6 +1,5 @@
-diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG
---- mtink-1.0.16.orig/Makefile.ORG	2007-08-28 12:52:30.000000000 +0200
-+++ mtink-1.0.16/Makefile.ORG	2017-01-29 18:09:40.550182789 +0100
+--- a/Makefile.ORG
++++ b/Makefile.ORG
 @@ -4,7 +4,7 @@
  setUid=1
  gimpVersion=
diff --git a/net-print/mtink/files/mtink-1.0.16-fno-common.patch b/net-print/mtink/files/mtink-1.0.16-fno-common.patch
new file mode 100644
index 000000000000..289e2af1517c
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-fno-common.patch
@@ -0,0 +1,20 @@
+https://sources.debian.org/patches/mtink/1.0.16-11/gcc-10/
+Author: Graham Inggs <ginggs@debian.org>
+--- a/mainSrc/mtink.h
++++ b/mainSrc/mtink.h
+@@ -133,11 +133,11 @@
+ 
+ #endif
+ 
+-wConfig_data_t firstConfig;
+-wConfig_data_t newPrinter;
++extern wConfig_data_t firstConfig;
++extern wConfig_data_t newPrinter;
+ 
+-wConfig_data_t exchangeCartridge;
+-wConfig_data_t alignHead;
++extern wConfig_data_t exchangeCartridge;
++extern wConfig_data_t alignHead;
+ 
+ #if WITH_X
+ extern Widget createNoPrinterBox(char *);
diff --git a/net-print/mtink/files/mtink-1.0.16-motif.patch b/net-print/mtink/files/mtink-1.0.16-motif.patch
new file mode 100644
index 000000000000..ac66c450b056
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-motif.patch
@@ -0,0 +1,49 @@
+https://sources.debian.org/patches/mtink/1.0.16-11/lesstif-multiarch/
+--- a/Configure
++++ b/Configure
+@@ -127,6 +127,8 @@
+ /usr/openwin/lib
+ /usr/local/lib
+ /usr/dt/lib'
++LIBDIRS="$LIBDIRS `${CC-gcc} -print-search-dirs 2>/dev/null |
++                   awk '/^libraries:/{print $2}' | tr ':' ' '`"
+ 
+ # Add gimp-2.0 for fedora core 2
+ INCLDIRS='/usr/include/gimp-2.0/libgimp
+@@ -279,11 +281,6 @@
+       exit 1
+    fi
+ 
+-   case $OS in
+-      Linux) . ./checkMotifVersion.sh;;
+-      Darwin) . ./checkMotifVersion.sh;;
+-   esac
+-
+    if [ "$MotifLib" != "" ]
+    then
+       mlCmd="s@^MOLIB.*@MOLIB = $MotifLib@"
+@@ -297,24 +294,6 @@
+       miCmd=
+    fi
+ 
+-   # Check for the Xp libary, some Motif libraries need this
+-
+-   xplibFound=0
+-   for dir in $LIBDIRS
+-   do
+-      if [ "`ls -c $dir/libXp.* 2>/dev/null`" != "" ]
+-      then
+-         xplibFound=1
+-         break
+-      fi
+-   done
+-
+-   # but not for Solaris
+-   if [ `uname` = SunOS ]
+-   then
+-      xplibFound=0
+-   fi
+-
+    # Gimp part ################################################
+    # check for gimp
+    includeFileFound=0
diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch
index d57e2cd0139e..b0858485293e 100644
--- a/net-print/mtink/files/mtink-1.0.16-overflow.patch
+++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch
@@ -1,5 +1,5 @@
---- a/server/mtinkd.c	2012-01-15 13:03:41.000000000 +0000
-+++ b/server/mtinkd.c	2012-01-15 13:03:58.000000000 +0000
+--- a/server/mtinkd.c
++++ b/server/mtinkd.c
 @@ -244,7 +244,7 @@
           /* look for pid into /var/run/mtink(<fifo> */
           if ( (fp = fopen(runFile,"r")) )
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
index c439b06d8c84..8223018128a3 100644
--- a/net-print/mtink/metadata.xml
+++ b/net-print/mtink/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/mtink/mtink-1.0.16-r2.ebuild b/net-print/mtink/mtink-1.0.16-r2.ebuild
index 79e369b73084..8f231fa1e74e 100644
--- a/net-print/mtink/mtink-1.0.16-r2.ebuild
+++ b/net-print/mtink/mtink-1.0.16-r2.ebuild
@@ -1,7 +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
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
 HOMEPAGE="http://xwtools.automatix.de/"
@@ -12,19 +14,31 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="cups doc X"
 
-DEPEND="X? ( x11-libs/libX11
+DEPEND="
+	virtual/libusb:0
+	cups? ( net-print/cups )
+	X? (
+		x11-libs/libX11
 		x11-libs/libXpm
 		x11-libs/libXt
-		>=x11-libs/motif-2.3:0 )
+		x11-libs/motif:0
+	)
 	cups? ( net-print/cups )
 	virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-overflow.patch"
-	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-motif.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	sed -i -e "s/gcc/$(tc-getCC)/g" Makefile.ORG || die
+}
+
 src_configure() {
 	if use X ; then
 		./Configure || die
@@ -48,9 +62,7 @@ src_compile() {
 src_install() {
 	dobin ttink detect/askPrinter
 
-	if use X; then
-		dobin mtinkc mtink
-	fi
+	use X && dobin mtinkc mtink
 
 	dosbin mtinkd
 
@@ -62,9 +74,8 @@ src_install() {
 		doexe etc/mtink-cups
 	fi
 
-	dodoc README CHANGE.LOG
-	use doc && \
-		dohtml html/*.gif html/*.html
+	dodoc html/README CHANGE.LOG
+	use doc && dodoc -r html/*.{gif,html}
 }
 
 pkg_postinst() {