1 |
commit: 6187a8a72f11aa97a1af587b9ca412642117dc87 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 27 19:44:11 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 21:05:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6187a8a7 |
7 |
|
8 |
net-print/c2esp: Drop old 25c |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
net-print/c2esp/Manifest | 1 - |
13 |
net-print/c2esp/c2esp-25c.ebuild | 52 ---------------------- |
14 |
.../c2esp/files/c2esp-25c-ldflags-cppflags.patch | 32 ------------- |
15 |
3 files changed, 85 deletions(-) |
16 |
|
17 |
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest |
18 |
index c3a56a3241b..9fe17203207 100644 |
19 |
--- a/net-print/c2esp/Manifest |
20 |
+++ b/net-print/c2esp/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce |
23 |
-DIST c2esp25c.tar.gz 338047 BLAKE2B 645127bdd61f478d519a7d17a1f621357e0c80ac6b313832ddcaba6744cb7f4a62a592c1140293e78a3a63447ad7295bd3fcda0f6f18f0d33b1cca0cca162803 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12 |
24 |
DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359 |
25 |
|
26 |
diff --git a/net-print/c2esp/c2esp-25c.ebuild b/net-print/c2esp/c2esp-25c.ebuild |
27 |
deleted file mode 100644 |
28 |
index 8b27ec8952c..00000000000 |
29 |
--- a/net-print/c2esp/c2esp-25c.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,52 +0,0 @@ |
32 |
-# Copyright 1999-2012 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=4 |
36 |
- |
37 |
-inherit eutils toolchain-funcs |
38 |
- |
39 |
-MY_P=${PN}${PV} |
40 |
- |
41 |
-DESCRIPTION="A cups filter for Kodak ESP printers" |
42 |
-HOMEPAGE="http://cupsdriverkodak.sf.net/" |
43 |
-SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz" |
44 |
-LICENSE="GPL-2" |
45 |
- |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~x86" |
48 |
-IUSE="" |
49 |
- |
50 |
-S=${WORKDIR}/${MY_P} |
51 |
- |
52 |
-DEPEND=">=media-libs/jbigkit-2.0-r1 |
53 |
- >=net-print/cups-1.4" |
54 |
-RDEPEND="${DEPEND}" |
55 |
- |
56 |
-src_prepare() { |
57 |
- epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch |
58 |
- |
59 |
- # Remove embedded media-libs/jbigkit |
60 |
- rm -f *jbig* || die |
61 |
- |
62 |
- # Remove the embedded jbig files from the Makefile's dependencies: |
63 |
- sed -i \ |
64 |
- -e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \ |
65 |
- -e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \ |
66 |
- -e '/\$(INSTALL).*COPYING/d' \ |
67 |
- Makefile || die |
68 |
- |
69 |
- # Use Gentoo-style cups paths |
70 |
- sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die |
71 |
-} |
72 |
- |
73 |
-src_compile() { |
74 |
- emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85 |
75 |
-} |
76 |
- |
77 |
-src_install() { |
78 |
- emake \ |
79 |
- DESTDIR="${D}" \ |
80 |
- FILTERBIN="${D}"/usr/libexec/cups/filter \ |
81 |
- DOCDIR="${ED}"/usr/share/doc/${PF} \ |
82 |
- install |
83 |
-} |
84 |
|
85 |
diff --git a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch |
86 |
deleted file mode 100644 |
87 |
index a551cc0f46a..00000000000 |
88 |
--- a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch |
89 |
+++ /dev/null |
90 |
@@ -1,32 +0,0 @@ |
91 |
---- a/Makefile |
92 |
-+++ b/Makefile |
93 |
-@@ -166,16 +166,16 @@ |
94 |
- @echo |
95 |
- |
96 |
- c2esp: c2esp.o c2espcommon.o $(LIBJBG85) |
97 |
-- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) |
98 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) |
99 |
- |
100 |
- c2espC: c2espC.o c2espcommon.o |
101 |
-- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz |
102 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz |
103 |
- |
104 |
- command2esp: command2esp.o c2espcommon.o |
105 |
-- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver |
106 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver |
107 |
- |
108 |
- myopldecode: myopldecode.o $(LIBJBG) |
109 |
-- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz |
110 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz |
111 |
- |
112 |
- # |
113 |
- # Installation rules |
114 |
-@@ -351,3 +326,8 @@ |
115 |
- command2esp.o: c2espcommon.h |
116 |
- c2espcommon.o: c2espcommon.h |
117 |
- |
118 |
-+ |
119 |
-+# Respect CPPFLAGS. |
120 |
-+.SUFFIXES: .c .o |
121 |
-+.c.o: |
122 |
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<' |