net-print/lm1100: fix maint path, fix CXX and add LDFLAGS

svn path=/sunrise/; revision=1663

4 files changed, 23 insertions, 21 deletions

diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
index fd36ba3ae..7d1a206f9 100644
--- a/net-print/lm1100/Manifest
+++ b/net-print/lm1100/Manifest
@@ -6,20 +6,20 @@ AUX lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866 RMD160 8b3576c26dd1c5b92f30b2bfd
 MD5 1745c18b44d2c9673e415d9661b90529 files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866
 RMD160 8b3576c26dd1c5b92f30b2bfd46f1f08afc3c38b files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866
 SHA256 4a7ab49fe2157b1c53e9d7a81a9f929d570e8d255eb2f226aa44c334aa93e076 files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866
-AUX lm1100-1.0.2a-makefile.patch 1096 RMD160 fb52cbaec2bf195589ee5081d33728d7e955aa6b SHA1 51aeaf5ab358cc362717435af94d1677abf8f3e7 SHA256 1570ebb2a94d6e45712e46a9242aaa1d2f682551b83c6d1996361ab30b1bc138
-MD5 070e2db617e5e9f3226305951836e1a3 files/lm1100-1.0.2a-makefile.patch 1096
-RMD160 fb52cbaec2bf195589ee5081d33728d7e955aa6b files/lm1100-1.0.2a-makefile.patch 1096
-SHA256 1570ebb2a94d6e45712e46a9242aaa1d2f682551b83c6d1996361ab30b1bc138 files/lm1100-1.0.2a-makefile.patch 1096
-AUX lm1100maint-firmware.patch 654 RMD160 4ee68947cf77ba013d392a144977d40d0e36f4bb SHA1 ac96705b14039e80590bc7947a09ae411c09ca0d SHA256 18e36cd974b8f1f2dea1b6032e1d2f3f9ca40e78d1d8d217416b872695107a0b
-MD5 59703b67562042262351df2f84eba010 files/lm1100maint-firmware.patch 654
-RMD160 4ee68947cf77ba013d392a144977d40d0e36f4bb files/lm1100maint-firmware.patch 654
-SHA256 18e36cd974b8f1f2dea1b6032e1d2f3f9ca40e78d1d8d217416b872695107a0b files/lm1100maint-firmware.patch 654
+AUX lm1100-1.0.2a-makefile.patch 1021 RMD160 b639bac7bbf3d82eb85cb2f4e37f109dbff2435f SHA1 a83417c878e178a59b03bbe24b0e49735969244c SHA256 f56ed7c14cfc27fb2a26c480d51ee4bb2497c5c813bf502604bd22006fcafa65
+MD5 b42ffb73a87fbcf6f79ece47d8f02160 files/lm1100-1.0.2a-makefile.patch 1021
+RMD160 b639bac7bbf3d82eb85cb2f4e37f109dbff2435f files/lm1100-1.0.2a-makefile.patch 1021
+SHA256 f56ed7c14cfc27fb2a26c480d51ee4bb2497c5c813bf502604bd22006fcafa65 files/lm1100-1.0.2a-makefile.patch 1021
+AUX lm1100maint-firmware.patch 638 RMD160 93b9d716e6231ef39057e74b0f64e7541adca35e SHA1 7cb24d6214c16f13dc64e15bb0b238c723da68ff SHA256 15448ea5604cdd7ff1baa04a5831477432bdfdf4219916cc5fcd90e8342ceaf6
+MD5 1acd57fe5fd1dcef0535e0c4c624a107 files/lm1100maint-firmware.patch 638
+RMD160 93b9d716e6231ef39057e74b0f64e7541adca35e files/lm1100maint-firmware.patch 638
+SHA256 15448ea5604cdd7ff1baa04a5831477432bdfdf4219916cc5fcd90e8342ceaf6 files/lm1100maint-firmware.patch 638
 DIST lm1100.1.0.2a.tar.gz 64316 RMD160 912440b251ca7a1cf31d7ae58e38d29d95dac682 SHA1 1a88be767f907b04df4f3b713abb6be6ede643eb SHA256 680da0b4a7decef197fa833a57b85e66aa2ec0d67fbcd4345c426fdaca6412fb
 DIST lm1100maint.tar.gz 708 RMD160 a02888b3c253c08a4c03f1130866a11dad87e477 SHA1 0b2b1683fd1a1d547b97ac4adf04cd59ea9cb886 SHA256 832586bd028e2516f62651bb8e23ced87ea2714831156b1a069231a34971281d
-EBUILD lm1100-1.0.2a.ebuild 1115 RMD160 168fe489f9aab839dacd5317a526107ef1efe5a1 SHA1 8a78faff3ecc5c0e51534b031fbaa98e9819f883 SHA256 8ef2d4b85afdfed8af0696c047ad866666248aefd2045844ea6d9b734f97d07a
-MD5 86bf5a2187fcb2e46a9df4a07b299725 lm1100-1.0.2a.ebuild 1115
-RMD160 168fe489f9aab839dacd5317a526107ef1efe5a1 lm1100-1.0.2a.ebuild 1115
-SHA256 8ef2d4b85afdfed8af0696c047ad866666248aefd2045844ea6d9b734f97d07a lm1100-1.0.2a.ebuild 1115
+EBUILD lm1100-1.0.2a.ebuild 1190 RMD160 af05e1699b57165c6987e1bdc9a43ff45338a6d3 SHA1 934e63e2775a50dfc30994f37e2f3d63cd79a83a SHA256 26ccd8c761ebe2c171392486e5757a47f27b32f7fff730a48828d0874c6fd362
+MD5 8881080f338a87063cccf6ef5da335a2 lm1100-1.0.2a.ebuild 1190
+RMD160 af05e1699b57165c6987e1bdc9a43ff45338a6d3 lm1100-1.0.2a.ebuild 1190
+SHA256 26ccd8c761ebe2c171392486e5757a47f27b32f7fff730a48828d0874c6fd362 lm1100-1.0.2a.ebuild 1190
 MISC ChangeLog 215 RMD160 386998bd2c02210f8d4b46c6f7221c55f724901b SHA1 313caf48aae84852ae501b2a7035eb42e245a3b5 SHA256 48e9bf60a57dfadbb6cccea2daaaa6ed3ca8d77b1d3f34b5de1c0c7455b252ac
 MD5 889575db32ffa2550d3f3b05aa262262 ChangeLog 215
 RMD160 386998bd2c02210f8d4b46c6f7221c55f724901b ChangeLog 215
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
index 73653c969..b1f0a2ac4 100644
--- a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
+++ b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
@@ -1,7 +1,5 @@
-Only in lm1100.1.0.2a: lm1100
-diff -ur lm1100.1.0.2a~/Makefile lm1100.1.0.2a/Makefile
---- lm1100.1.0.2a~/Makefile	2006-06-24 14:08:56.000000000 +0200
-+++ lm1100.1.0.2a/Makefile	2006-06-24 14:07:13.000000000 +0200
+--- lm1100.1.0.2a~/Makefile	2001-02-26 01:40:16.000000000 +0100
++++ lm1100.1.0.2a/Makefile	2006-10-23 19:01:57.000000000 +0200
 @@ -7,17 +7,19 @@
  VERSION=lm1100.1.0.2a
  TARFILES = $(FILES:%=$(VERSION)/%)
@@ -14,7 +12,7 @@ diff -ur lm1100.1.0.2a~/Makefile lm1100.1.0.2a/Makefile
  
  lm1100: $(OBJS)
 -	$(CC) -o lm1100 $(OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) -o lm1100 $(OBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o lm1100 $(OBJS) $(LIBS)
  
  bufcat: SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o
 -	$(CC) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
diff --git a/net-print/lm1100/files/lm1100maint-firmware.patch b/net-print/lm1100/files/lm1100maint-firmware.patch
index 03660ba57..5c3f4c92e 100644
--- a/net-print/lm1100/files/lm1100maint-firmware.patch
+++ b/net-print/lm1100/files/lm1100maint-firmware.patch
@@ -4,11 +4,11 @@ diff -ur lm1100maint~/lm1100back lm1100maint/lm1100back
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -dd if=/usr/share/lm1100maint/lexmarkback of=/dev/lp0
-+dd if=/lib/firmware/lm1100maint/lexmarkback of=/dev/lp0
++dd if=/usr/share/lm1100/lexmarkback of=/dev/lp0
 diff -ur lm1100maint~/lm1100change lm1100maint/lm1100change
 --- lm1100maint~/lm1100change	2006-06-26 19:48:51.000000000 +0200
 +++ lm1100maint/lm1100change	2006-06-26 19:50:55.000000000 +0200
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -dd if=/usr/share/lm1100maint/lexmarkchange of=/dev/lp0
-+dd if=/lib/firmware/lm1100maint/lexmarkchange of=/dev/lp0
++dd if=/usr/share/lm1100/lexmarkchange of=/dev/lp0
diff --git a/net-print/lm1100/lm1100-1.0.2a.ebuild b/net-print/lm1100/lm1100-1.0.2a.ebuild
index b0576f10e..6bab7ca8e 100644
--- a/net-print/lm1100/lm1100-1.0.2a.ebuild
+++ b/net-print/lm1100/lm1100-1.0.2a.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="The Tim Engler's Lexmark 1100 driver"
 HOMEPAGE="http://www.linuxprinting.org/show_driver.cgi?driver=lm1100"
@@ -30,13 +30,17 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}maint-firmware.patch"
 }
 
+src_compile() {
+	emake CXX="$(tc-getCXX)" || die "emake failed"
+}
+
 src_install() {
 	dobin lm1100
 	dodoc README RELEASE.txt LICENSE
 
 	cd "${WORKDIR}/${PN}maint"
 	dobin lm1100back lm1100change
-	insinto "/lib/firmware/${PN}maint"
+	insinto "/usr/share/${PN}"
 	doins lexmarkback lexmarkchange
 	newdoc README README.maint
 }