gentoo resync : 13.06.2020

3 files changed, 25 insertions, 1 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9895a5a68591..e9cd73aa4724 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -3,12 +3,13 @@ AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
 AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
+AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.2.13-source.tar.gz 10410121 BLAKE2B 662ad7fe95a9cb82748a6035cf61bad8a823656522259fc8eafe4426cc57541beb29da9116174f9d6750ec207eacb83ab4e314021506d6a342577f03ff25b0cd SHA512 dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d
 DIST cups-2.3.1-source.tar.gz 8135891 BLAKE2B fab46dfeb8a1846c4d8c8a1c166b465e72928ecc5b52dedd9d6a6328619f6eda822a85da9545c405b7bc7375acd2f2677497b94ab00735979487417537438831 SHA512 e3f3ad9e78c1c723d46cc2276957ac67495483882f639421203d9dad227eacbb1259717a92489e710995fdc89e2d575202e4b43117aff08ff1230dcf06674376
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
 EBUILD cups-2.2.13.ebuild 9729 BLAKE2B 9c0b6e15bbdcff31c35fc709d4369f97bdff7f18d7f3359bf99936244eeb1056333df7e197c9140cc20e59080bf893f49941121950fba44b7313c7cec06acc56 SHA512 abef436477e2b0e34f63dad132981bf9b4313c7467168efb1221b31fbe4cc2d1e133b8e2308663f6ffeed1cf19ef0bee15e2ca33cdf6966f5f43b938f6f8dffd
 EBUILD cups-2.3.1.ebuild 9585 BLAKE2B eeccc3d3fc828c6ee3309ece3ddfe954918f86eb16d967b7c375bf36a49b3c5be91313d56bec685a5e6ac0e92085e5f2befd6eb5f03fc9b5ae5c23b7c918068a SHA512 be02a3f144dd90f98f490351b4a8eac0fc1ea674fce9d02b0e66a6aefdcce718b58dc21ec2094bc07e8370e6e9fda0e03b0fb2df75aa17e43928266417cdbec3
-EBUILD cups-2.3.3-r1.ebuild 9655 BLAKE2B 781570cf1150bcc493f86828c957be147d972ffcf33e57f28a776ef633477ee485264c8000a099cb7a01ab873934e85ec9f4959846086dea0e68d8155aae9275 SHA512 fda8380d075bff3d4d780529f450c9147f422b13cf0430c59fbe525599d5b0e9c08fd87900c2f2922d643f397c18b37608561cd7002216882f44f07eb78d1c06
+EBUILD cups-2.3.3-r1.ebuild 9696 BLAKE2B be6872be11afdc719a4ee13efb4cec474619dc59026e16d79fb10b4be1676e1ed305e8ddc0489d869fd80b4d889244fbbe9befdf6147d5ef29deab7fce1d0250 SHA512 d138812de75eb478d7c62a5366536ad5ca4df3b5eaee6a667396880fbdb1ead2f4d94cb58d40bff01b5fe0bf7a3a5ac7732770ca4a92276c3a19153f563e711f
 EBUILD cups-9999.ebuild 9664 BLAKE2B aa9f35685c07be11e4baa3cdc7157d6ce1a4799cea68d5d4bb9169001b31ec8f188ee18535354573080c03ee268ecadbe69f9176f5d174fdfbf4af9c1d5f125d SHA512 69e8888d217f1c9b17eb709ba7e0f6c4e2764c567d187d89c16ba1ab81a96921057cde1630612749d6889bb0d7fbfcd4ac855d93069444d8cee3f1505adacebe
 MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild
index 4ff03c7a6d4a..805de00b9089 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+	"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.3.3-user-AR.patch b/net-print/cups/files/cups-2.3.3-user-AR.patch
new file mode 100644
index 000000000000..0e52adb567d7
--- /dev/null
+++ b/net-print/cups/files/cups-2.3.3-user-AR.patch
@@ -0,0 +1,22 @@
+AC_PATH_PROG does not search tuple prefixes.
+--- a/config-scripts/cups-common.m4
++++ b/config-scripts/cups-common.m4
+@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc)
+ AC_PROG_CPP
+ AC_PROG_CXX(clang++ c++ g++)
+ AC_PROG_RANLIB
+-AC_PATH_PROG(AR,ar)
++AC_CHECK_TOOL(AR,ar)
+ AC_PATH_PROG(CHMOD,chmod)
+ AC_PATH_PROG(GZIPPROG,gzip)
+ AC_MSG_CHECKING(for install-sh script)
+ INSTALL="`pwd`/install-sh"
+ AC_SUBST(INSTALL)
+ AC_MSG_RESULT(using $INSTALL)
+-AC_PATH_PROG(LD,ld)
+-AC_PATH_PROG(LN,ln)
++AC_CHECK_TOOL(LD,ld)
++AC_CHECK_TOOL(LN,ln)
+ AC_PATH_PROG(MKDIR,mkdir)
+ AC_PATH_PROG(MV,mv)
+ AC_PATH_PROG(RM,rm)