diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-print/cups | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/Manifest | 5 | ||||
| -rw-r--r-- | net-print/cups/cups-2.3.3-r2.ebuild (renamed from net-print/cups/cups-2.3.3-r1.ebuild) | 8 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 7 | ||||
| -rw-r--r-- | net-print/cups/files/cups-2.3.3-no-libtool.patch | 25 |
4 files changed, 37 insertions, 8 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 5f5f5907ed48..318426afac99 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -2,9 +2,10 @@ AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b4869693 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf +AUX cups-2.3.3-no-libtool.patch 912 BLAKE2B 14c19e8a215e2a56af387c6cf904a6a2a11de41a730d4a272a30d37ec98ee031be5e24458ad9a82c221dc76c71a4550055fedd877455752a1b7e925eb684f4cb SHA512 a12be37b290e2e2d875d20d1aec426ce0bfec4980ffa321a4232a3c8ffe5c8c7360c2882915b370236133168b54abfcdb729acdfb5ef2d08f706f981bf7c1214 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.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d -EBUILD cups-2.3.3-r1.ebuild 9629 BLAKE2B f83ca00c94024c5408d55cc554b9ad699a367547fb6e4d459516e1067146a85509a83aa88195a6a59840b51bc2e505a8f16098f0d34706e6fd53e383b818da4e SHA512 a2f7adbe4e4157c7d286f0d1e71251bf42b26e2cb3e9fd49e6724fdfecfd4a09fa96038f6fa4e105aae73781baa42930c1134e142120bc0797c89b6fc4c39322 -EBUILD cups-9999.ebuild 9597 BLAKE2B 4a46b5511be9431aa6248f59e6135f1e4b3f186b6abb48592d4e775b30b81c7e857e09e683a5ddbdaf506b2582e232d94caed8473bbf4ea712bde96c25eec08a SHA512 11055964ee76fa4cb3548de994ff0c7394e3076f54fdf5633a29c0cf02fd025e521d90e1dfce7776385dc7c2d21c060bd8ede40842652b0ce90e3605abc7ff92 +EBUILD cups-2.3.3-r2.ebuild 9670 BLAKE2B b9c176cbbd4f2a608a818112dc84be693941e84b454d1620fc430b6afc20799354a5b10df321c1bbb0c018378b5257db7f36fcb2003f2ef947416cd0710bc9c4 SHA512 46901ac1b2d5cb561ed99f2383d70dcfe8faadf674d08dfb54e0195e8f964210ae3533985407fb56153f9fa279b86273f141eb55468bff956de10d47e0380df8 +EBUILD cups-9999.ebuild 9594 BLAKE2B e7f43aeed561ba4eae3938b3739845286d3ff80ddd19140361d39a80992697eaaad2c5d845970a6d9c53124064ad986f3e5fe4d9a7e2f88ca949ebb46dc8719d SHA512 4f9a3bd84f529de97f25c3c400148ad28a17517cbed402aa1f1a1107c9321f9071eef04dd9c6e173d88f64b44e0c9a840b54667a43e214505ee9557de2c0762a MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild index 1e397ff741c7..a367e9deed5b 100644 --- a/net-print/cups/cups-2.3.3-r1.ebuild +++ b/net-print/cups/cups-2.3.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -80,6 +80,7 @@ PATCHES=( "${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" + "${FILESDIR}/${PN}-2.3.3-no-libtool.patch" ) MULTILIB_CHOST_TOOLS=( @@ -252,8 +253,9 @@ multilib_src_install_all() { "${T}"/cupsd || die doinitd "${T}"/cupsd - # install our pam script - pamd_mimic_system cups auth account + if use pam; then + pamd_mimic_system cups auth account + fi if use xinetd ; then # correct path diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index dd20b85bf923..7fecb1e8f2ee 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -251,8 +251,9 @@ multilib_src_install_all() { "${T}"/cupsd || die doinitd "${T}"/cupsd - # install our pam script - pamd_mimic_system cups auth account + if use pam; then + pamd_mimic_system cups auth account + fi if use xinetd ; then # correct path diff --git a/net-print/cups/files/cups-2.3.3-no-libtool.patch b/net-print/cups/files/cups-2.3.3-no-libtool.patch new file mode 100644 index 000000000000..cf8911294183 --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-no-libtool.patch @@ -0,0 +1,25 @@ +This is not needed and causes problems with more strict +implementations of libtool. + +With slibtool it fails. + +--- a/backend/Makefile ++++ b/backend/Makefile +@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC) + echo Installing backends in $(SERVERBIN)/backend + $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend + for file in $(RBACKENDS); do \ +- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \ ++ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \ + done + for file in $(UBACKENDS); do \ + $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \ +@@ -142,7 +142,7 @@ install-exec: $(INSTALLXPC) + install-xpc: ipp + echo Installing XPC backends in $(SERVERBIN)/apple + $(INSTALL_DIR) -m 755 $(SERVERBIN)/apple +- $(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple ++ $(INSTALL_BIN) ipp $(SERVERBIN)/apple + for file in $(IPPALIASES); do \ + $(RM) $(SERVERBIN)/apple/$$file; \ + $(LN) ipp $(SERVERBIN)/apple/$$file; \ |