diff options
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/Manifest.gz | bin | 6256 -> 6253 bytes | |||
-rw-r--r-- | net-print/brlaser/Manifest | 2 | ||||
-rw-r--r-- | net-print/brlaser/brlaser-4.ebuild | 19 | ||||
-rw-r--r-- | net-print/cups-filters/Manifest | 2 | ||||
-rw-r--r-- | net-print/cups-filters/cups-filters-1.28.7.ebuild | 2 | ||||
-rw-r--r-- | net-print/cups-pdf/Manifest | 2 | ||||
-rw-r--r-- | net-print/cups-pdf/cups-pdf-3.0.1.ebuild | 4 | ||||
-rw-r--r-- | net-print/gtklp/Manifest | 2 | ||||
-rw-r--r-- | net-print/gtklp/gtklp-1.3.1.ebuild | 17 | ||||
-rw-r--r-- | net-print/mtink/Manifest | 10 | ||||
-rw-r--r-- | net-print/mtink/files/mtink-1.0.16-flags.patch | 5 | ||||
-rw-r--r-- | net-print/mtink/files/mtink-1.0.16-fno-common.patch | 20 | ||||
-rw-r--r-- | net-print/mtink/files/mtink-1.0.16-motif.patch | 49 | ||||
-rw-r--r-- | net-print/mtink/files/mtink-1.0.16-overflow.patch | 4 | ||||
-rw-r--r-- | net-print/mtink/metadata.xml | 8 | ||||
-rw-r--r-- | net-print/mtink/mtink-1.0.16-r2.ebuild | 35 |
16 files changed, 121 insertions, 60 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz Binary files differindex f8357afc1077..637a44501bfe 100644 --- a/net-print/Manifest.gz +++ b/net-print/Manifest.gz diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest index 7280bc1ab7df..712f806a6645 100644 --- a/net-print/brlaser/Manifest +++ b/net-print/brlaser/Manifest @@ -1,5 +1,3 @@ -DIST brlaser-4.tar.gz 21963 BLAKE2B 03d5e16ff9b6a6838c82b197bec4a868e6be5752ad9a1df393b646b35642da8f2e1528031b10ece3b0cd7c6c426ff76d1df83c73a51bcac7abac803cd0a66535 SHA512 1e08091adc371a35f75c245fd86f132aae7811a00bd7e9d194c47038dc9aa29296fbf8769cef6b8ea42d82467857195ba8024a9d6de8048174ecc44e0bb76067 DIST brlaser-6.tar.gz 22807 BLAKE2B be8041c1b6ddb8c4e5055fa35edc2c764562b2b4e52cad17aa968a51886621264d6bf289bd7bb5af0148098bb72aa96adea603091b38c3a245068d60737e80fc SHA512 d7e0e63b64be9ae7633381622c13ba0589e5fe58d277212bce4f5bb712a291ed0b0f2ac3d450dce61c7f9052c1ce7323fec66b5005c5cb3da1314b284d20f06f -EBUILD brlaser-4.ebuild 425 BLAKE2B 7f00a81d641549355c179df3a23aceda8123fbb03ba2c435998e348024eaee2bd7fd0d357f96c5c978ffa64f70bda794a6ddf12961c4c4777200643573c9c25d SHA512 7daf3afc30fb45d95d68706d6ffe5b13dea0041f4604ebc2b44ad7341e31be2800e1d9a7f8193237b0d215896493176ff56673187de7c6a0f9f9f672665d6cc4 EBUILD brlaser-6.ebuild 419 BLAKE2B 23e98fd74ce7454ac21a20d4015ebdc248c6927b1b93f13c1738689e83e6c35dc5cf6d83ad29e2db6a4fe3a815405425d4addb7f680b4437b2ee1b10adc7f16c SHA512 3ed6856e6b1acb2e86c3ed86dce634e005ed290feba8f6011a8eadc505e76ea2119a3cff0aa90dc71acc03b420c8b63995b41d47ab86291ddbf87543ec7c73c2 MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418 diff --git a/net-print/brlaser/brlaser-4.ebuild b/net-print/brlaser/brlaser-4.ebuild deleted file mode 100644 index e307a20fbeca..000000000000 --- a/net-print/brlaser/brlaser-4.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Brother laser printer driver" -HOMEPAGE="https://github.com/pdewacht/brlaser" -SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="net-print/cups" -RDEPEND=" - ${DEPEND} - app-text/ghostscript-gpl" diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 3c78502a74d5..b3a0feb94281 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -4,6 +4,6 @@ AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727 EBUILD cups-filters-1.28.3.ebuild 3588 BLAKE2B 13dd4b84406b23d346e49b578ece8ab0133c26df584bc2ba48154bccacaf1f3c8805056d5fdb60a5aa3ffa53a36c41e6ba6100be2dc5966f3acca8636c33ecc9 SHA512 e1f41da89145c942e974d57f9189baf68f3cb85ce6eea10619c6866f4346a99b1ab19c2f663c96525a8ae81701797f85fdc71faea01adb10aa708fec4dd3eb8d -EBUILD cups-filters-1.28.7.ebuild 3593 BLAKE2B 9dc8ef061c3ae11fc49197179ddc4f94c0796f6c46b8bf1aefc6b137d69742dbc3d4858336c34d79b9abef7b48332bbf28c916b8df003b0a6a5a1bf3ceaf6300 SHA512 a4699e6ad7ae5a3a738910d6e036e75afa1e85d200009ee3eb9bc9d109c37d24cfaef593f2aeda67fd3ff7e1acca05956e0a22321f19d469fdf6512a37b77a9a +EBUILD cups-filters-1.28.7.ebuild 3588 BLAKE2B 601a6ea999ac8bd23907e04916d73e954d06390bbe99d6ddc1d6c62b972ca9f825c34ab2de92f3a624547021ddc2d8ea145658119727dc0fac45522e6e29ffb9 SHA512 2a7fc38f520c166283c5dd0925c0caf76521e06042a3e9fc534b27ddb0ba3645cfc95f93e6c7ed02ae31b41c41c4a79cfac94832c74fed1575244a8d112cca0c EBUILD cups-filters-9999.ebuild 3526 BLAKE2B c38824b7d039513ce3cdf39881193df39a36f2a3f1884fd88579e4a32600b5ada64024a689aad3b801eaf73322b7ce2509391997d77175a5e92e2509912df936 SHA512 4102b01ea57450437a4e6f594f137c8bf82dade5275e4719b546983a49f1a725bb209a1c88d89b18b9e5dd813395afd8865999c1e3158d77c32b50f675d143c5 MISC metadata.xml 512 BLAKE2B 2dd3dbff375248f63add04f7cd136e0de7fbee885f359ee546de2060b4e0d965655e9c93b4f31c4cece89e1f750037766752f4b74d4f6216213e2dcd374e163f SHA512 9678f63f3ef2164ef837220914ce57111c118df556755e2c802d1476726312dc6d47baacc4d977e35e6a44ca1d5af8f0841a41323fdbd9a6471dea2c87103d32 diff --git a/net-print/cups-filters/cups-filters-1.28.7.ebuild b/net-print/cups-filters/cups-filters-1.28.7.ebuild index b0018c462499..37b780aabfce 100644 --- a/net-print/cups-filters/cups-filters-1.28.7.ebuild +++ b/net-print/cups-filters/cups-filters-1.28.7.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" else SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" fi DESCRIPTION="Cups filters" HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest index 114335135a46..682980d9e8e1 100644 --- a/net-print/cups-pdf/Manifest +++ b/net-print/cups-pdf/Manifest @@ -1,3 +1,3 @@ DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818 -EBUILD cups-pdf-3.0.1.ebuild 887 BLAKE2B b48e41fea1577d3a768243f6ade288d9f58f2a2d1cb2ce67b8e81bbe1bf496bac1c83af992043aaeae05b41948c568cdaf294bf81022e615d7e3bf0768add305 SHA512 453f117686e6761900a3e86a3eda8efe354aee7f03538434ceaafff3d43f9f5d465737ee4726aa2027019fafbb9ca6140cb25b5c4e0d2256d15ec54afd7ae67e +EBUILD cups-pdf-3.0.1.ebuild 894 BLAKE2B eb8a6cef7ed2789e863a28bae90bea9ffec5edd48425d639e10cc2a5df19fe51eded95c2aa9060046e1cd8cb6b3b240c33d6116e310e5b05d90dbceb8e8e824a SHA512 7eeca7e60f19c0d072b5ebeab3b7c49faf34cfd1893b48cd2f16d92c28e9e32d9787652fa7c5f690ec35a2b78e954abbd50246d0369b3772e8731e16ecb290fd MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 diff --git a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild index cd78862b5dec..c2856b42381b 100644 --- a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild +++ b/net-print/cups-pdf/cups-pdf-3.0.1.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=6 @@ -11,7 +11,7 @@ SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" +KEYWORDS="amd64 ~arm ppc ~ppc64 x86" IUSE="+ppds" RDEPEND=" diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest index d17ce0561666..8d57085c4c32 100644 --- a/net-print/gtklp/Manifest +++ b/net-print/gtklp/Manifest @@ -1,5 +1,5 @@ AUX gtklp-1.3.1-formatsec.patch 2063 BLAKE2B 1c8d8c6843741a788a750f998b8c84a8e234fef9a0e95d5616391b318f53ab36496ae4d3069bf14d8438066d201ad9234924adb87f1a1ba9e2f9480d317be92f SHA512 31a1bb8f81748a23d614adfb05e97816285707b92ca6077e588ba91687aca4785b74f765ae63ee13c7aec779c8011a78df69fc894f3a4a951b9cae98c43defc0 DIST gtklp-1.3.1.src.tar.gz 641805 BLAKE2B fe5406dc9e95d6faa1335ce44c5e2cf9c0cf2db711c68962f64d88a403e18ac4da2c640467c62f6af256ca73370a3ef6db305ce75a4b7fcc9918d2c8825ffaaf SHA512 22d8e519d5d767add9d786bb9d4e288fffad929e8cac5b0125f654f520e1a466cf0d32bb2f6fbc0804085748403436adc5850b805531dbc971b91eb05627ae70 DIST gtklp-logo.xpm.gz 2254 BLAKE2B 6ba85919472c0018cb77c89b6d5058e68845d94c2baa941d43d55a9a58b33f9347cdd8e3449afc3f692ae0b4d1bcb73fb0159b372b641537420e7131fcd9d703 SHA512 24fd320bb1fd533d5f539ad5aa22661a2c923c4d6012b7d908a7a8311dcd179f2c7f02a88d52289d659ad89ce63ab40956725051b7dbe14ed23eb3a62e6c9240 -EBUILD gtklp-1.3.1.ebuild 1199 BLAKE2B 95392da8a795a0ad11fc1b10ebbc63e125057f6f8053fe7b3a440076dee5f5b2feca697f2f65607a9cc3473a1d2baa53f6e2706b4a6ef0170b438b8d5a28634a SHA512 57f8bb602412d00650045249647f73483695e16710a485dd959e99e6cbdecbbd6b690f6372deb4a938ae5e93559e3b8bab29df233cd611e95cc6b27a546a4e8d +EBUILD gtklp-1.3.1.ebuild 1212 BLAKE2B 910802d38be47a47c5f27144cf346c40c176b8bbeddeed2fd5679cc7e6de4c06a429b93eb4cad6131f76ce8d8e6b3a24ad2ca7efdf1aa4aee1613e6d6b440df4 SHA512 4434f8ad5e55ea8dd1c6b7edfc5d562c823509d8504125926bbde7d1fcf03991bd2f87391a1ff3ffb776b99a2955660d58592c25dc73f3ddb4c9691c5ae509ab MISC metadata.xml 627 BLAKE2B 2c68ba73c29ce2f62328ae42342e3303c163c84f0a5b35e9c848e59ab525d6a5058af69c4c1e8f1c6c3f8e22e7737da3e77238de3ad68409cadc7a6f00cdf3d9 SHA512 e0167dc4f64a5dbbd305bff9e40aa7deff39495215fdc1b590f32ad28af2d64eacbbc6929d4803b91ebf1acec94b7cfb2b4d139114d6779714a6ab7931204319 diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild index b1eb8322df2e..6b98fb7e5f39 100644 --- a/net-print/gtklp/gtklp-1.3.1.ebuild +++ b/net-print/gtklp/gtklp-1.3.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils +inherit autotools desktop flag-o-matic DESCRIPTION="A GUI for cupsd" HOMEPAGE="https://gtklp.sirtobi.com/" @@ -15,14 +15,13 @@ SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" IUSE="nls ssl" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" net-print/cups + x11-libs/gtk+:2 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="AUTHORS BUGS ChangeLog README TODO USAGE" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-formatsec.patch" ) @@ -35,6 +34,7 @@ src_prepare() { } src_configure() { + append-cflags -fcommon econf \ $(use_enable nls) \ $(use_enable ssl) \ @@ -44,6 +44,7 @@ src_configure() { src_install() { default + dodoc USAGE doicon "${WORKDIR}"/gtklp-logo.xpm make_desktop_entry 'gtklp -i' "Print files via CUPS" gtklp-logo 'System;HardwareSettings;Settings;Printing' make_desktop_entry gtklpq "CUPS queue manager" gtklp-logo 'System;HardwareSettings;Settings;Printing' 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() { |