1 |
commit: dbbe16dba4982b217a270446b331e5786932bd6d |
2 |
Author: Krzysztof Pawlik <none <AT> none> |
3 |
AuthorDate: Wed Jan 11 20:53:01 2012 +0000 |
4 |
Commit: Krzysztof Pawlik <nelchael <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 11 20:53:01 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/nelchael.git;a=commit;h=dbbe16db |
7 |
|
8 |
Improve build, install all needed files. |
9 |
|
10 |
(Portage version: 2.1.10.44/hg/Linux x86_64, signed Manifest commit with key 0xF6A80E46) |
11 |
|
12 |
--- |
13 |
net-print/epson-nx110-drivers/ChangeLog | 4 ++ |
14 |
net-print/epson-nx110-drivers/Manifest | 18 ++++---- |
15 |
.../epson-nx110-drivers-1.0.0.ebuild | 49 ++++++++++++++----- |
16 |
3 files changed, 49 insertions(+), 22 deletions(-) |
17 |
|
18 |
diff --git a/net-print/epson-nx110-drivers/ChangeLog b/net-print/epson-nx110-drivers/ChangeLog |
19 |
index 14bdaad..d0d9c9c 100644 |
20 |
--- a/net-print/epson-nx110-drivers/ChangeLog |
21 |
+++ b/net-print/epson-nx110-drivers/ChangeLog |
22 |
@@ -4,6 +4,10 @@ |
23 |
|
24 |
11 Jan 2012; Krzysztof Pawlik <nelchael@g.o> |
25 |
epson-nx110-drivers-1.0.0.ebuild: |
26 |
+ Improve build, install all needed files. |
27 |
+ |
28 |
+ 11 Jan 2012; Krzysztof Pawlik <nelchael@g.o> |
29 |
+ epson-nx110-drivers-1.0.0.ebuild: |
30 |
Use source RPM. |
31 |
|
32 |
*epson-nx110-drivers-1.0.0 (11 Jan 2012) |
33 |
|
34 |
diff --git a/net-print/epson-nx110-drivers/Manifest b/net-print/epson-nx110-drivers/Manifest |
35 |
index 1565919..b8a9ec3 100644 |
36 |
--- a/net-print/epson-nx110-drivers/Manifest |
37 |
+++ b/net-print/epson-nx110-drivers/Manifest |
38 |
@@ -2,17 +2,17 @@ |
39 |
Hash: SHA512 |
40 |
|
41 |
DIST epson-inkjet-printer-stylus-nx110-series-1.0.0-1lsb3.2.src.rpm 2203949 RMD160 fd3c992891c10adf6010c65f816a2a1c12ec8f7b SHA1 4cbd04eb2c83426b175dc2ac1d26153e9002d881 SHA256 7b8bf011bb7190fef06f1fc3c9a34926318b5ef2305b198db52952722dde7128 |
42 |
-EBUILD epson-nx110-drivers-1.0.0.ebuild 1613 RMD160 d4b7b967f10703399a1c301bc68ac71030c3755f SHA1 ee9f3bc82eb119f8af37105bd934102fc06dc609 SHA256 87292f456ee0ca2a956e55e0c8115076223d18e770c76230016ce395b27cd10b |
43 |
-MISC ChangeLog 430 RMD160 1df6c0ee6bc0216908451896e10f011203ef7c16 SHA1 83832b71c4cad49370e653b292d2eba808daa968 SHA256 eb9365ef4bc7d50c6224ce8b6d37ee1591bdbe98b5dc788e5369c22e8c6e719b |
44 |
+EBUILD epson-nx110-drivers-1.0.0.ebuild 2414 RMD160 c8d0436843ae07da2781dac3f96986e7d77e229b SHA1 9ceebe2dacead2c6cfc47c0c0b4a2ddfb7e3333b SHA256 53fc339cf27823b006c897f655a1fa0823be2de6ec61a7ea8174013a266b4ba4 |
45 |
+MISC ChangeLog 564 RMD160 da144c22e6906e1f9c76f7c00a007b951e01f07b SHA1 97ebea49f28abf69dfccbd056c81282b0a172277 SHA256 3b9088f67905013b43cc892c23da7d207ea767eef53d56ff9dbe06dd5f825722 |
46 |
MISC metadata.xml 205 RMD160 e987371be157660daac092207f697d0131df2861 SHA1 73785dc8ec827ff32d4388ac9824d4ea5fd349d3 SHA256 01b130f2def7aeb83c9977e02bedc8ba2ca4b3b0d2257a4711795ee50acf81d2 |
47 |
-----BEGIN PGP SIGNATURE----- |
48 |
Version: GnuPG v2.0.18 (GNU/Linux) |
49 |
|
50 |
-iQEcBAEBCgAGBQJPDeahAAoJEBZyv1r2qA5GgzgH/1T2EVrmDL0w0NSdkcgfDs3o |
51 |
-mHnxNEYdVQ66c5WmB8U6pQxI5NtRsGnvp5/ldA7Dbq2B4BWuA9xtj+TSv/hWEzGc |
52 |
-BSQ+J4zE+7CHCzdOY3BRwpCuucPYrivbhWyYeW3QSBTHcr6d9TcPN4s6j2QEsBCY |
53 |
-lOBK2Qki0Mv/vt0MRqjejfLeuXVEYsaxqqSOIWWfUUdGMNKHIRZFkc6sfSLgupHR |
54 |
-KFGCtigxGaRy2PIuaaTY/e7ubYH6DOkaPFfGSuJo9hjkNxjRPnqKNSCnlZyNRiiA |
55 |
-qLbGryCI30fpgsqe23tp3msQsH7GENFPee5tYlVjQHLjWDSdOzjkhgVCpFrosZ8= |
56 |
-=2Hu/ |
57 |
+iQEcBAEBCgAGBQJPDfatAAoJEBZyv1r2qA5GvqUH/AgTFCwVOpbsKwEyIptL/paL |
58 |
+MLqdXbLUIxSaANX+nlEqhSz5GZR5YLa1Vgc/D/RZ2O+hgFmaVusvWkjt+og6lPP6 |
59 |
+pDqgbJDFr9OObDLwkGeMJVknawz/sJ02dJHoi+hFeVNL5gZXCntxbjmQ/A2Tc6ss |
60 |
+N76zisQvimyA4+8b+R2/44aEd9aG7p2onO1/Cf9DpQMuRFZMCB0KXnpcpPlYVj2V |
61 |
+UOp+FlXyq/PJ8jbSRg7ds0hsA+gqVVPcWpsyQ2wQu5jswiSANpwsTfQhinFS1pLs |
62 |
+6IzkqN6EETzfVNOQb6YRcn74QOLeiw6nWUboyULVLAGu/5DBiOSVSF7w/FlS7K8= |
63 |
+=kk16 |
64 |
-----END PGP SIGNATURE----- |
65 |
|
66 |
diff --git a/net-print/epson-nx110-drivers/epson-nx110-drivers-1.0.0.ebuild b/net-print/epson-nx110-drivers/epson-nx110-drivers-1.0.0.ebuild |
67 |
index 9d6ae82..d57e50f 100644 |
68 |
--- a/net-print/epson-nx110-drivers/epson-nx110-drivers-1.0.0.ebuild |
69 |
+++ b/net-print/epson-nx110-drivers/epson-nx110-drivers-1.0.0.ebuild |
70 |
@@ -5,7 +5,7 @@ |
71 |
EAPI=4 |
72 |
WANT_AUTOMAKE="1.10" |
73 |
|
74 |
-inherit autotools rpm |
75 |
+inherit autotools rpm flag-o-matic |
76 |
|
77 |
DESCRIPTION="Driver (and PPDs) for Epson Stylus NX110, NX115, SX110, SX115, TX110, TX111, TX112, TX113, TX115, TX117 and TX119" |
78 |
HOMEPAGE="http://avasys.jp/eng/linux_driver/download/lsb/epson-inkjet/escp/" |
79 |
@@ -30,12 +30,27 @@ src_unpack() { |
80 |
|
81 |
src_prepare() { |
82 |
sed -i \ |
83 |
- -e 's,CUPS_SERVER_DIR=.*$,CUPS_SERVER_DIR=/usr/libexec/cups,g' \ |
84 |
+ -e "s,CUPS_SERVER_DIR=.*$,CUPS_SERVER_DIR=/usr/libexec/cups,g" \ |
85 |
+ -e "s,CORE_RESOURCE_PATH=.*$,CORE_RESOURCE_PATH=/usr/share/${PN}/resource,g" \ |
86 |
configure.ac |
87 |
|
88 |
eautoreconf |
89 |
|
90 |
chmod +x ./configure |
91 |
+ |
92 |
+ local DATA_DIR="${WORKDIR}/epson-inkjet-printer-stylus-nx110-series-${PV}" |
93 |
+ cd "${DATA_DIR}/ppds" |
94 |
+ sed -i \ |
95 |
+ -e "s,/opt/epson-inkjet-printer-stylus-nx110-series/cups/lib/filter/epson_inkjet_printer_filter,/usr/libexec/cups/filter/epson_inkjet_printer_filter,g" \ |
96 |
+ -e "s,/opt/epson-inkjet-printer-stylus-nx110-series,/usr/share/${PN},g" \ |
97 |
+ *.ppd |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ # The filter *NEEDS* to link agains libstdc++ to succesfully load libraries |
102 |
+ # at runtime, ugly. |
103 |
+ append-ldflags $(no-as-needed) |
104 |
+ econf |
105 |
} |
106 |
|
107 |
src_install() { |
108 |
@@ -45,21 +60,29 @@ src_install() { |
109 |
|
110 |
local DATA_DIR="${WORKDIR}/epson-inkjet-printer-stylus-nx110-series-${PV}" |
111 |
|
112 |
- dodir "/opt/${PN}/lib32" |
113 |
- insinto "/opt/${PN}/lib32" |
114 |
- doins "${DATA_DIR}/lib/"* |
115 |
- |
116 |
- dodir "/opt/${PN}/lib64" |
117 |
- insinto "/opt/${PN}/lib64" |
118 |
- doins "${DATA_DIR}/lib64/"* |
119 |
- |
120 |
- dodir "/etc/ld.so.conf.d/" |
121 |
- echo "/opt/${PN}/lib32" >> "${D}/etc/ld.so.conf.d/${PN}.conf" |
122 |
- echo "/opt/${PN}/lib64" >> "${D}/etc/ld.so.conf.d/${PN}.conf" |
123 |
+ # Those precompiled libraries *NEED* to go to /usr/lib*, not anywhere else, |
124 |
+ # filter checks for exact paths. |
125 |
+ if use x86; then |
126 |
+ dodir "/usr/lib" |
127 |
+ insinto "/usr/lib" |
128 |
+ doins "${DATA_DIR}/lib/"* |
129 |
+ elif use amd64; then |
130 |
+ dodir "/usr/lib64" |
131 |
+ insinto "/usr/lib64" |
132 |
+ doins "${DATA_DIR}/lib64/"* |
133 |
+ fi |
134 |
|
135 |
dodir "/usr/share/cups/model" |
136 |
insinto "/usr/share/cups/model" |
137 |
doins "${DATA_DIR}/ppds/"*.ppd |
138 |
|
139 |
+ dodir "/usr/share/${PN}/watermark" |
140 |
+ insinto "/usr/share/${PN}/watermark" |
141 |
+ doins "${DATA_DIR}/watermark/"*.EID |
142 |
+ |
143 |
+ dodir "/usr/share/${PN}/resource" |
144 |
+ insinto "/usr/share/${PN}/resource" |
145 |
+ doins "${DATA_DIR}/resource/"*.data |
146 |
+ |
147 |
dodoc "${DATA_DIR}/AUTHORS" "${DATA_DIR}/README" "${DATA_DIR}/Manual.txt" |
148 |
} |