From 12bb627384ddfd47382b9f1b6464481a58d01ebb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Aug 2018 20:19:23 +0100 Subject: gentoo resync : 29.08.2018 --- net-print/c2esp/Manifest | 6 +-- net-print/c2esp/c2esp-25c.ebuild | 52 ---------------------- net-print/c2esp/c2esp-27.ebuild | 29 ++++++++++++ .../files/0001-Fix-various-missing-includes.patch | 35 +++++++++++++++ .../c2esp/files/c2esp-25c-ldflags-cppflags.patch | 32 ------------- 5 files changed, 67 insertions(+), 87 deletions(-) delete mode 100644 net-print/c2esp/c2esp-25c.ebuild create mode 100644 net-print/c2esp/c2esp-27.ebuild create mode 100644 net-print/c2esp/files/0001-Fix-various-missing-includes.patch delete mode 100644 net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch (limited to 'net-print/c2esp') diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest index 448c3f29fbc5..a4594a86ed3d 100644 --- a/net-print/c2esp/Manifest +++ b/net-print/c2esp/Manifest @@ -1,7 +1,7 @@ -AUX c2esp-25c-ldflags-cppflags.patch 1049 BLAKE2B 0b193f6ee26dbcd261bf7166d139d0eafb3d35a325bd49d2875ea412b1fd7f40feb040e76f3939cede3edccc2c2de197bf580f660094326b27614848e8ef4268 SHA512 315d30b7aea8b89a23edba3bc15a018de72287f0025611c4fa137dad1f868cac3fe06cd6713e348ffb63ea8633caa3873b51a44d534c77c6ff8805183afab341 +AUX 0001-Fix-various-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de AUX c2esp-26-ldflags-cppflags.patch 1152 BLAKE2B dc5463e1574c0f8852cbcb567fd24a0bc7f29a537d3073f4b6835cdf54deed2d3d3595816ae0ba84e4f026edf66daa3dbe4ad66765b47284b9862765656afd2e SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4 -DIST c2esp25c.tar.gz 338047 BLAKE2B 645127bdd61f478d519a7d17a1f621357e0c80ac6b313832ddcaba6744cb7f4a62a592c1140293e78a3a63447ad7295bd3fcda0f6f18f0d33b1cca0cca162803 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12 +DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359 -EBUILD c2esp-25c.ebuild 1155 BLAKE2B f376e7480f30d0afae7900d12277e6cbf2c7d26b288bcaaac19df40ff019ce48612e8e45eb05edb3a6433ff9175481b3f196fe4148d05bdd3c9c5943673c0b35 SHA512 f902cad466f567e1c5fec97a5830e4a9303b697bc3877500aa4b4c4349485b094ad09eec8181032668f73f4cc249bb141212bbf59b2e071f4009cd47fbf0c97c EBUILD c2esp-26.ebuild 1159 BLAKE2B 81194a8775940beb806a456e1d013b7ab7d5b2373bae1c33fe373fcaddfd9a377630744b889a091e97d1a4f06cff91f4346705f2164f846a7d9a8b374e2aca8e SHA512 ef5855f0aae411da2ff6520e44cd0935ba33b524216bbab912c9474b1c1f2ea0b3acd05f5bc9f70bd3f1d16238fc022fe6d78f1cea4395da1ba5d56d803eface +EBUILD c2esp-27.ebuild 699 BLAKE2B 0d0be951c38fd455af0b511ed0f9b4c7949b41747240794700e31288ba1846d9c89717f012ed46f5c2fa4a16cceaee255d9de7be65f5dfa7df7add78dff09606 SHA512 c8062f8f6d66fc63b44361afd0544ee42ffe45b81dcb64e153e2b78ef69594f19527bd2e900c39e05e8d344d7b481a2e40a4d6adf106ea501d2007aed58d8819 MISC metadata.xml 354 BLAKE2B 125545bf6e8dbd21bb674f494585d22d2e293738a9409613fa91eb7d888f4d6c10028aaf3b55beab10e5f94e4cbaee34eb9fb3d8f24c9f64056b6085edf6319c SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7 diff --git a/net-print/c2esp/c2esp-25c.ebuild b/net-print/c2esp/c2esp-25c.ebuild deleted file mode 100644 index 8b27ec8952cf..000000000000 --- a/net-print/c2esp/c2esp-25c.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -MY_P=${PN}${PV} - -DESCRIPTION="A cups filter for Kodak ESP printers" -HOMEPAGE="http://cupsdriverkodak.sf.net/" -SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -S=${WORKDIR}/${MY_P} - -DEPEND=">=media-libs/jbigkit-2.0-r1 - >=net-print/cups-1.4" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch - - # Remove embedded media-libs/jbigkit - rm -f *jbig* || die - - # Remove the embedded jbig files from the Makefile's dependencies: - sed -i \ - -e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \ - -e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \ - -e '/\$(INSTALL).*COPYING/d' \ - Makefile || die - - # Use Gentoo-style cups paths - sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die -} - -src_compile() { - emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - FILTERBIN="${D}"/usr/libexec/cups/filter \ - DOCDIR="${ED}"/usr/share/doc/${PF} \ - install -} diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild new file mode 100644 index 000000000000..69e58fbb92f9 --- /dev/null +++ b/net-print/c2esp/c2esp-27.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A CUPS filter for Kodak ESP printers" +HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak" +SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND=">=media-libs/jbigkit-2.0-r1:= + >=net-print/cups-1.6 + sys-libs/zlib:=" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/0001-Fix-various-missing-includes.patch +) + +src_configure() { + # Don't trust cups-config in case ROOT!=/. + + econf \ + --with-cupsfilterdir="${EPREFIX}"/usr/libexec/cups/filter \ + --with-cupsdatadir="${EPREFIX}"/usr/share/cups +} diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch new file mode 100644 index 000000000000..bde86e666688 --- /dev/null +++ b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch @@ -0,0 +1,35 @@ +From 4341f243a34dbb8140800337d189345c370dc499 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Fri, 9 Feb 2018 17:23:25 +0100 +Subject: Fix various missing includes + +Last-Update: 2016-10-03 +--- + src/c2espcommon.h | 1 + + src/command2esp.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/c2espcommon.h b/src/c2espcommon.h +index 471f46a..088a2b8 100644 +--- a/src/c2espcommon.h ++++ b/src/c2espcommon.h +@@ -19,6 +19,7 @@ + */ + + #include //FlushBackChannel, and the side channel functions and constants ++#include // FILE + #include //files + #include //time functions used for debugging + +diff --git a/src/command2esp.c b/src/command2esp.c +index 529342c..e30357e 100644 +--- a/src/command2esp.c ++++ b/src/command2esp.c +@@ -44,6 +44,7 @@ Maintenance=003? + #include + #include //FlushBackChannel, and the side channel functions and constants + #include "string.h" ++#include "strings.h" // strncasecmp + #include + #include //files + #include //time functions used for debugging diff --git a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch deleted file mode 100644 index a551cc0f46ab..000000000000 --- a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -166,16 +166,16 @@ - @echo - - c2esp: c2esp.o c2espcommon.o $(LIBJBG85) -- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) - - c2espC: c2espC.o c2espcommon.o -- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz - - command2esp: command2esp.o c2espcommon.o -- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver - - myopldecode: myopldecode.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz - - # - # Installation rules -@@ -351,3 +326,8 @@ - command2esp.o: c2espcommon.h - c2espcommon.o: c2espcommon.h - -+ -+# Respect CPPFLAGS. -+.SUFFIXES: .c .o -+.c.o: -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<' -- cgit v1.2.3