net-print/lm1100 - use patch instead of sed

svn path=/sunrise/; revision=234

diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
index dcd9fac2d055b3a19c9ac67d4efd1e695a59534f..77307f075e29fae3dfa8c87e840f7556bf44b361 100644 (file)
--- a/net-print/lm1100/Manifest
+++ b/net-print/lm1100/Manifest
@@ -6,19 +6,19 @@ 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
-DIST lm1100.1.0.2a.tar.gz 64316
-EBUILD lm1100-1.0.2a.ebuild 720 RMD160 9ec5bb2270556e08f0933137eb3439dc71c5afd9 SHA1 e8ce3ada890f414f46c578f6510d75d2b98e5164 SHA256 8fcd6d1416479ab71d53ebc1fede4c1913d334623d34f18739f546446e466fa1
-MD5 45c54ceea73cde99758af956bb89bae2 lm1100-1.0.2a.ebuild 720
-RMD160 9ec5bb2270556e08f0933137eb3439dc71c5afd9 lm1100-1.0.2a.ebuild 720
-SHA256 8fcd6d1416479ab71d53ebc1fede4c1913d334623d34f18739f546446e466fa1 lm1100-1.0.2a.ebuild 720
+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
+DIST lm1100.1.0.2a.tar.gz 64316 RMD160 912440b251ca7a1cf31d7ae58e38d29d95dac682 SHA1 1a88be767f907b04df4f3b713abb6be6ede643eb SHA256 680da0b4a7decef197fa833a57b85e66aa2ec0d67fbcd4345c426fdaca6412fb
+EBUILD lm1100-1.0.2a.ebuild 729 RMD160 0e50225b8bb8143d50953505db919c72f9e98fdf SHA1 d5bed6e9b9c16223c460ad4606cb947731750bbc SHA256 38d1e5a35b26b33a4cc8d3a7e055b9f7caf1030753c48305264077d8c930c265
+MD5 0653cfbfd67a0d87a038261abbb326dd lm1100-1.0.2a.ebuild 729
+RMD160 0e50225b8bb8143d50953505db919c72f9e98fdf lm1100-1.0.2a.ebuild 729
+SHA256 38d1e5a35b26b33a4cc8d3a7e055b9f7caf1030753c48305264077d8c930c265 lm1100-1.0.2a.ebuild 729
 MISC ChangeLog 215 RMD160 386998bd2c02210f8d4b46c6f7221c55f724901b SHA1 313caf48aae84852ae501b2a7035eb42e245a3b5 SHA256 48e9bf60a57dfadbb6cccea2daaaa6ed3ca8d77b1d3f34b5de1c0c7455b252ac
 MD5 889575db32ffa2550d3f3b05aa262262 ChangeLog 215
 RMD160 386998bd2c02210f8d4b46c6f7221c55f724901b ChangeLog 215
 SHA256 48e9bf60a57dfadbb6cccea2daaaa6ed3ca8d77b1d3f34b5de1c0c7455b252ac ChangeLog 215
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
-SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 18092190170a867a3078d5ba394f80ad files/digest-lm1100-1.0.2a 64
-RMD160 20041f62182e86e037c92f063db80d737a3388c2 files/digest-lm1100-1.0.2a 64
-SHA256 7bb067857cd7e03c07fc3061e5a1fec55b8e09f67033f777f4e6fa3331a24b98 files/digest-lm1100-1.0.2a 64
+MD5 20b6ff264d5cddecadd1b2c89f8648fe files/digest-lm1100-1.0.2a 238
+RMD160 729f82167061de96aa172c1b18ee868b4557516c files/digest-lm1100-1.0.2a 238
+SHA256 8dae406de1924c9db36c7fe896d6b0b9d9e62bf4bdd4efd3b600a140ec5cd05a files/digest-lm1100-1.0.2a 238

diff --git a/net-print/lm1100/files/digest-lm1100-1.0.2a b/net-print/lm1100/files/digest-lm1100-1.0.2a
index 91c932c064ebf3383eb1b0440345d87124a44d15..ab5d86fc26ca33ef52bb74020d087c077442f77a 100644 (file)
--- a/net-print/lm1100/files/digest-lm1100-1.0.2a
+++ b/net-print/lm1100/files/digest-lm1100-1.0.2a
@@ -1 +1,3 @@
 MD5 2b96b75459f194eabd4321c55c90c797 lm1100.1.0.2a.tar.gz 64316
+RMD160 912440b251ca7a1cf31d7ae58e38d29d95dac682 lm1100.1.0.2a.tar.gz 64316
+SHA256 680da0b4a7decef197fa833a57b85e66aa2ec0d67fbcd4345c426fdaca6412fb lm1100.1.0.2a.tar.gz 64316

diff --git a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
new file mode 100644 (file)
index 0000000..73653c9
--- /dev/null
+++ b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
@@ -0,0 +1,37 @@
+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
+@@ -7,17 +7,19 @@
+ VERSION=lm1100.1.0.2a
+ TARFILES = $(FILES:%=$(VERSION)/%)
+ 
+-CC = g++ -O2
++CXX?=g++
++CXXFLAGS?= -O2
++#CC = g++ -O2
+ #CC = g++ -g
+ 
+ lm1100: $(OBJS)
+-      $(CC) -o lm1100 $(OBJS) $(LIBS)
++      $(CXX) $(CXXFLAGS) -o lm1100 $(OBJS) $(LIBS)
+ 
+ bufcat: SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o
+-      $(CC) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
++      $(CXX) $(CXXFLAGS) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
+ 
+ leak: $(OBJS)
+-      $(CC) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
++      $(CXX) $(CXXFLAGS) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
+ 
+ tarball: $(FILES)
+       rm $(VERSION);ln -s . $(VERSION);tar -cf - $(TARFILES) | gzip > $(VERSION).tar.gz
+@@ -27,7 +29,7 @@
+       rm *.o
+ 
+ %.o:  %.cc
+-      $(CC) $(DEFINES) -c $<
++      $(CXX) $(CXXFLAGS) $(DEFINES) -c $<
+ 
+ TAGS: $(SRCS)
+       etag $(SRCS)

diff --git a/net-print/lm1100/lm1100-1.0.2a.ebuild b/net-print/lm1100/lm1100-1.0.2a.ebuild
index b08ae1c97e67363b7e70bbd19b67d4e83a44a471..560b2a5a2944ef87db23d9ee8b6d0dbc43662e63 100644 (file)
--- a/net-print/lm1100/lm1100-1.0.2a.ebuild
+++ b/net-print/lm1100/lm1100-1.0.2a.ebuild
@@ -22,8 +22,7 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch"
        epatch "${FILESDIR}/${P}-class.patch"
-       sed -i -e "/^CC/s/=.*/= $(tc-getCXX) ${CXXFLAGS}/" \
-               "${S}/Makefile" || die "sed failed."
+       epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_install() {