Improve build, install all needed files.

(Portage version: 2.1.10.44/hg/Linux x86_64, signed Manifest commit with key 0xF6A80E46)

3 files changed, 49 insertions, 22 deletions

diff --git a/net-print/epson-nx110-drivers/ChangeLog b/net-print/epson-nx110-drivers/ChangeLog
index 14bdaad..d0d9c9c 100644
--- a/net-print/epson-nx110-drivers/ChangeLog
+++ b/net-print/epson-nx110-drivers/ChangeLog
@@ -4,6 +4,10 @@
 
   11 Jan 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   epson-nx110-drivers-1.0.0.ebuild:
+  Improve build, install all needed files.
+
+  11 Jan 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  epson-nx110-drivers-1.0.0.ebuild:
   Use source RPM.
 
 *epson-nx110-drivers-1.0.0 (11 Jan 2012)
diff --git a/net-print/epson-nx110-drivers/Manifest b/net-print/epson-nx110-drivers/Manifest
index 1565919..b8a9ec3 100644
--- a/net-print/epson-nx110-drivers/Manifest
+++ b/net-print/epson-nx110-drivers/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA512
 
 DIST epson-inkjet-printer-stylus-nx110-series-1.0.0-1lsb3.2.src.rpm 2203949 RMD160 fd3c992891c10adf6010c65f816a2a1c12ec8f7b SHA1 4cbd04eb2c83426b175dc2ac1d26153e9002d881 SHA256 7b8bf011bb7190fef06f1fc3c9a34926318b5ef2305b198db52952722dde7128
-EBUILD epson-nx110-drivers-1.0.0.ebuild 1613 RMD160 d4b7b967f10703399a1c301bc68ac71030c3755f SHA1 ee9f3bc82eb119f8af37105bd934102fc06dc609 SHA256 87292f456ee0ca2a956e55e0c8115076223d18e770c76230016ce395b27cd10b
-MISC ChangeLog 430 RMD160 1df6c0ee6bc0216908451896e10f011203ef7c16 SHA1 83832b71c4cad49370e653b292d2eba808daa968 SHA256 eb9365ef4bc7d50c6224ce8b6d37ee1591bdbe98b5dc788e5369c22e8c6e719b
+EBUILD epson-nx110-drivers-1.0.0.ebuild 2414 RMD160 c8d0436843ae07da2781dac3f96986e7d77e229b SHA1 9ceebe2dacead2c6cfc47c0c0b4a2ddfb7e3333b SHA256 53fc339cf27823b006c897f655a1fa0823be2de6ec61a7ea8174013a266b4ba4
+MISC ChangeLog 564 RMD160 da144c22e6906e1f9c76f7c00a007b951e01f07b SHA1 97ebea49f28abf69dfccbd056c81282b0a172277 SHA256 3b9088f67905013b43cc892c23da7d207ea767eef53d56ff9dbe06dd5f825722
 MISC metadata.xml 205 RMD160 e987371be157660daac092207f697d0131df2861 SHA1 73785dc8ec827ff32d4388ac9824d4ea5fd349d3 SHA256 01b130f2def7aeb83c9977e02bedc8ba2ca4b3b0d2257a4711795ee50acf81d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPDeahAAoJEBZyv1r2qA5GgzgH/1T2EVrmDL0w0NSdkcgfDs3o
-mHnxNEYdVQ66c5WmB8U6pQxI5NtRsGnvp5/ldA7Dbq2B4BWuA9xtj+TSv/hWEzGc
-BSQ+J4zE+7CHCzdOY3BRwpCuucPYrivbhWyYeW3QSBTHcr6d9TcPN4s6j2QEsBCY
-lOBK2Qki0Mv/vt0MRqjejfLeuXVEYsaxqqSOIWWfUUdGMNKHIRZFkc6sfSLgupHR
-KFGCtigxGaRy2PIuaaTY/e7ubYH6DOkaPFfGSuJo9hjkNxjRPnqKNSCnlZyNRiiA
-qLbGryCI30fpgsqe23tp3msQsH7GENFPee5tYlVjQHLjWDSdOzjkhgVCpFrosZ8=
-=2Hu/
+iQEcBAEBCgAGBQJPDfatAAoJEBZyv1r2qA5GvqUH/AgTFCwVOpbsKwEyIptL/paL
+MLqdXbLUIxSaANX+nlEqhSz5GZR5YLa1Vgc/D/RZ2O+hgFmaVusvWkjt+og6lPP6
+pDqgbJDFr9OObDLwkGeMJVknawz/sJ02dJHoi+hFeVNL5gZXCntxbjmQ/A2Tc6ss
+N76zisQvimyA4+8b+R2/44aEd9aG7p2onO1/Cf9DpQMuRFZMCB0KXnpcpPlYVj2V
+UOp+FlXyq/PJ8jbSRg7ds0hsA+gqVVPcWpsyQ2wQu5jswiSANpwsTfQhinFS1pLs
+6IzkqN6EETzfVNOQb6YRcn74QOLeiw6nWUboyULVLAGu/5DBiOSVSF7w/FlS7K8=
+=kk16
 -----END PGP SIGNATURE-----
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
index 9d6ae82..d57e50f 100644
--- 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
@@ -5,7 +5,7 @@
 EAPI=4
 WANT_AUTOMAKE="1.10"
 
-inherit autotools rpm
+inherit autotools rpm flag-o-matic
 
 DESCRIPTION="Driver (and PPDs) for Epson Stylus NX110, NX115, SX110, SX115, TX110, TX111, TX112, TX113, TX115, TX117 and TX119"
 HOMEPAGE="http://avasys.jp/eng/linux_driver/download/lsb/epson-inkjet/escp/"
@@ -30,12 +30,27 @@ src_unpack() {
 
 src_prepare() {
 	sed -i \
-		-e 's,CUPS_SERVER_DIR=.*$,CUPS_SERVER_DIR=/usr/libexec/cups,g' \
+		-e "s,CUPS_SERVER_DIR=.*$,CUPS_SERVER_DIR=/usr/libexec/cups,g" \
+		-e "s,CORE_RESOURCE_PATH=.*$,CORE_RESOURCE_PATH=/usr/share/${PN}/resource,g" \
 		configure.ac
 
 	eautoreconf
 
 	chmod +x ./configure
+
+	local DATA_DIR="${WORKDIR}/epson-inkjet-printer-stylus-nx110-series-${PV}"
+	cd "${DATA_DIR}/ppds"
+	sed -i \
+		-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" \
+		-e "s,/opt/epson-inkjet-printer-stylus-nx110-series,/usr/share/${PN},g" \
+		*.ppd
+}
+
+src_configure() {
+	# The filter *NEEDS* to link agains libstdc++ to succesfully load libraries
+	# at runtime, ugly.
+	append-ldflags $(no-as-needed)
+	econf
 }
 
 src_install() {
@@ -45,21 +60,29 @@ src_install() {
 
 	local DATA_DIR="${WORKDIR}/epson-inkjet-printer-stylus-nx110-series-${PV}"
 
-	dodir "/opt/${PN}/lib32"
-	insinto "/opt/${PN}/lib32"
-	doins "${DATA_DIR}/lib/"*
-
-	dodir "/opt/${PN}/lib64"
-	insinto "/opt/${PN}/lib64"
-	doins "${DATA_DIR}/lib64/"*
-
-	dodir "/etc/ld.so.conf.d/"
-	echo "/opt/${PN}/lib32" >> "${D}/etc/ld.so.conf.d/${PN}.conf"
-	echo "/opt/${PN}/lib64" >> "${D}/etc/ld.so.conf.d/${PN}.conf"
+	# Those precompiled libraries *NEED* to go to /usr/lib*, not anywhere else,
+	# filter checks for exact paths.
+	if use x86; then
+		dodir "/usr/lib"
+		insinto "/usr/lib"
+		doins "${DATA_DIR}/lib/"*
+	elif use amd64; then
+		dodir "/usr/lib64"
+		insinto "/usr/lib64"
+		doins "${DATA_DIR}/lib64/"*
+	fi
 
 	dodir "/usr/share/cups/model"
 	insinto "/usr/share/cups/model"
 	doins "${DATA_DIR}/ppds/"*.ppd
 
+	dodir "/usr/share/${PN}/watermark"
+	insinto "/usr/share/${PN}/watermark"
+	doins "${DATA_DIR}/watermark/"*.EID
+
+	dodir "/usr/share/${PN}/resource"
+	insinto "/usr/share/${PN}/resource"
+	doins "${DATA_DIR}/resource/"*.data
+
 	dodoc "${DATA_DIR}/AUTHORS" "${DATA_DIR}/README" "${DATA_DIR}/Manual.txt"
 }