[gentoo-commits] dev/nelchael:master commit in: net-print/epson-nx110-drivers/

[Krzysztof Pawlik]

commit:     e5e509c25b1e53a341208fd5972ad0fc95648091
Author:     Krzysztof Pawlik <none <AT> none>
AuthorDate: Wed Jan 11 19:44:33 2012 +0000
Commit:     Krzysztof Pawlik <nelchael <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 19:44:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/nelchael.git;a=commit;h=e5e509c2

Use source RPM.

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

---
 net-print/epson-nx110-drivers/ChangeLog            |    4 ++
 net-print/epson-nx110-drivers/Manifest             |   20 ++++----
 .../epson-nx110-drivers-1.0.0.ebuild               |   57 +++++++++++++-------
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/net-print/epson-nx110-drivers/ChangeLog b/net-print/epson-nx110-drivers/ChangeLog
index 6acd782..14bdaad 100644
--- a/net-print/epson-nx110-drivers/ChangeLog
+++ b/net-print/epson-nx110-drivers/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jan 2012; Krzysztof Pawlik <nelchael@g.o>
+  epson-nx110-drivers-1.0.0.ebuild:
+  Use source RPM.
+
 *epson-nx110-drivers-1.0.0 (11 Jan 2012)
 
   11 Jan 2012; Krzysztof Pawlik <nelchael@g.o>

diff --git a/net-print/epson-nx110-drivers/Manifest b/net-print/epson-nx110-drivers/Manifest
index 5c168e9..1565919 100644
--- a/net-print/epson-nx110-drivers/Manifest
+++ b/net-print/epson-nx110-drivers/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST epson-inkjet-printer-stylus-nx110-series-1.0.0-1lsb3.2.x86_64.rpm 1653062 RMD160 0c41e5d1ad455002580bdaf873a2b862659abaa3 SHA1 8736499096776a4794fdade7927495e193cbbbf7 SHA256 b309f45fa99e6f38b177d27b00098cbc47d6af756bccfe504c41e8478ebeb11c
-EBUILD epson-nx110-drivers-1.0.0.ebuild 1306 RMD160 6ff25dbd918ecafa0d593760620081e3921ec679 SHA1 327c6c99c027212bafbca1911708f380cce0a0e0 SHA256 41cf6dbd1ed8d6da5b8d41add5f30d893825cd065f38f903c6f4797b235f6054
-MISC ChangeLog 321 RMD160 95f366fa0a3e5f4d3d131f0028544f69bfd939fe SHA1 5bdc185480ff2def2e868f11643e48e86f196026 SHA256 6100ef5cfd66e2418877489fb0f4925af78715404d368a19dcfe846aa2dbc569
+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
 MISC metadata.xml 205 RMD160 e987371be157660daac092207f697d0131df2861 SHA1 73785dc8ec827ff32d4388ac9824d4ea5fd349d3 SHA256 01b130f2def7aeb83c9977e02bedc8ba2ca4b3b0d2257a4711795ee50acf81d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPDdO2AAoJEBZyv1r2qA5GIkwIAI+ZQTtdy553QQPIkgN1oUo0
-UJ0p5qWjcQRJPgtjDKhRsu8/qc4u/Z2/YhExel+nuG/mV0+EvWgSO+0rLC5nx+Eo
-BG0DRon6sibQ5uSA0ZPyASO5IaxBTEielNb6NsBhkd6UXWRM4cjysjHfsk9SdVQL
-DDSv4TBUO7/+/8flMSMWu8qTJSg165nyIMIP9LzwEc/sKWWZJVDZTldJt8KEMVWm
-nOkrQfZ7EEx7zL5FcdFfMJZRgZV0517HymEKwZPxUQ10ujrM++cbSUX0jcm0RpnT
-jDTfC2ntyeUoq0aUhaia6lsfAd0IMBD5XyV+1obagOc3R6yJ/5fLBTZHahCMInM=
-=6J3p
+iQEcBAEBCgAGBQJPDeahAAoJEBZyv1r2qA5GgzgH/1T2EVrmDL0w0NSdkcgfDs3o
+mHnxNEYdVQ66c5WmB8U6pQxI5NtRsGnvp5/ldA7Dbq2B4BWuA9xtj+TSv/hWEzGc
+BSQ+J4zE+7CHCzdOY3BRwpCuucPYrivbhWyYeW3QSBTHcr6d9TcPN4s6j2QEsBCY
+lOBK2Qki0Mv/vt0MRqjejfLeuXVEYsaxqqSOIWWfUUdGMNKHIRZFkc6sfSLgupHR
+KFGCtigxGaRy2PIuaaTY/e7ubYH6DOkaPFfGSuJo9hjkNxjRPnqKNSCnlZyNRiiA
+qLbGryCI30fpgsqe23tp3msQsH7GENFPee5tYlVjQHLjWDSdOzjkhgVCpFrosZ8=
+=2Hu/
 -----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 c53bdbf..9d6ae82 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
@@ -3,12 +3,13 @@
 # $Header: $
 
 EAPI=4
+WANT_AUTOMAKE="1.10"
 
-inherit rpm
+inherit autotools rpm
 
 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/"
-SRC_URI="http://linux.avasys.jp/drivers/lsb/epson-inkjet/stable/RPMS/x86_64/epson-inkjet-printer-stylus-nx110-series-1.0.0-1lsb3.2.x86_64.rpm"
+SRC_URI="http://linux.avasys.jp/drivers/lsb/epson-inkjet/stable/SRPMS/epson-inkjet-printer-stylus-nx110-series-1.0.0-1lsb3.2.src.rpm"
 
 LICENSE="Epson-Driver"
 SLOT="0"
@@ -18,29 +19,47 @@ IUSE=""
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/opt/epson-inkjet-printer-stylus-nx110-series"
+S="${WORKDIR}/epson-inkjet-printer-filter-${PV}"
+
+src_unpack() {
+	rpm_unpack ${A}
+
+	unpack "./epson-inkjet-printer-filter-${PV}.tar.gz"
+	unpack "./epson-inkjet-printer-stylus-nx110-series-${PV}.tar.gz"
+}
+
+src_prepare() {
+	sed -i \
+		-e 's,CUPS_SERVER_DIR=.*$,CUPS_SERVER_DIR=/usr/libexec/cups,g' \
+		configure.ac
+
+	eautoreconf
+
+	chmod +x ./configure
+}
 
 src_install() {
-	dodir "/opt/${PN}/lib64"
-	insinto "/opt/${PN}/lib64"
-	doins lib64/*.so.*
-	chmod 755 "${D}/opt/${PN}/lib64/lib"*
+	emake DESTDIR="${D}" install
 
-	dodir "/opt/${PN}/filter"
-	insinto "/opt/${PN}/filter"
-	doins cups/lib/filter/epson_inkjet_printer_filter
-	chmod 755 "${D}/opt/${PN}/filter/epson_inkjet_printer_filter"
+	rm -rf "${D}/usr/doc"
 
-	insinto "/usr/share/cups/model"
-	doins ppds/Epson/*.ppd.gz
+	local DATA_DIR="${WORKDIR}/epson-inkjet-printer-stylus-nx110-series-${PV}"
 
-	insinto "/usr/libexec/cups/filter"
-	dosym \
-		"/opt/${PN}/filter/epson_inkjet_printer_filter" \
-		"/usr/libexec/cups/filter/epson_inkjet_printer_filter"
+	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}/lib64" > "${D}/etc/ld.so.conf.d/${PN}"
+	echo "/opt/${PN}/lib32" >> "${D}/etc/ld.so.conf.d/${PN}.conf"
+	echo "/opt/${PN}/lib64" >> "${D}/etc/ld.so.conf.d/${PN}.conf"
+
+	dodir "/usr/share/cups/model"
+	insinto "/usr/share/cups/model"
+	doins "${DATA_DIR}/ppds/"*.ppd
 
-	dodoc doc/AUTHORS doc/README doc/Manual.txt
+	dodoc "${DATA_DIR}/AUTHORS" "${DATA_DIR}/README" "${DATA_DIR}/Manual.txt"
 }