From 409286287abb39eaaa730ef66fbea9875a8d452f Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Krier?= Date: Sat, 2 Dec 2006 19:03:57 +0000 Subject: [PATCH] New Ebuild for bug #73441 Package-Manager: portage-2.1.1-r2 --- net-print/lm1100/ChangeLog | 14 ++++ net-print/lm1100/Manifest | 37 ++++++++++ net-print/lm1100/files/digest-lm1100-1.0.2a | 6 ++ .../lm1100/files/lm1100-1.0.2a-class.patch | 24 ++++++ .../lm1100-1.0.2a-fix-compile-gcc-3.4.patch | 22 ++++++ .../lm1100-1.0.2a-fix-compile-gcc-4.1.patch | 73 +++++++++++++++++++ .../lm1100/files/lm1100-1.0.2a-makefile.patch | 35 +++++++++ .../lm1100/files/lm1100maint-firmware.patch | 14 ++++ net-print/lm1100/lm1100-1.0.2a.ebuild | 47 ++++++++++++ net-print/lm1100/metadata.xml | 9 +++ 10 files changed, 281 insertions(+) create mode 100644 net-print/lm1100/ChangeLog create mode 100644 net-print/lm1100/Manifest create mode 100644 net-print/lm1100/files/digest-lm1100-1.0.2a create mode 100644 net-print/lm1100/files/lm1100-1.0.2a-class.patch create mode 100644 net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch create mode 100644 net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch create mode 100644 net-print/lm1100/files/lm1100-1.0.2a-makefile.patch create mode 100644 net-print/lm1100/files/lm1100maint-firmware.patch create mode 100644 net-print/lm1100/lm1100-1.0.2a.ebuild create mode 100644 net-print/lm1100/metadata.xml diff --git a/net-print/lm1100/ChangeLog b/net-print/lm1100/ChangeLog new file mode 100644 index 000000000000..b4b0cb152b87 --- /dev/null +++ b/net-print/lm1100/ChangeLog @@ -0,0 +1,14 @@ +# ChangeLog for net-print/lm1100 +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/lm1100/ChangeLog,v 1.1 2006/12/02 19:03:57 cedk Exp $ + +*lm1100-1.0.2a (02 Dec 2006) + + 02 Dec 2006; Cedric Krier + +files/lm1100-1.0.2a-class.patch, + +files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch, + +files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch, + +files/lm1100maint-firmware.patch, +files/lm1100-1.0.2a-makefile.patch, + +metadata.xml, +lm1100-1.0.2a.ebuild: + New Ebuild for bug #73441 + diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest new file mode 100644 index 000000000000..1fa8609b7ade --- /dev/null +++ b/net-print/lm1100/Manifest @@ -0,0 +1,37 @@ +AUX lm1100-1.0.2a-class.patch 709 RMD160 c17ea9e9f322784471a9f0802ebd80fee35bff5e SHA1 88f2d5781e515e6635fe982d830b85f2fc46c0e6 SHA256 5c1543a644e22c38fac3190bea7e344640c9fe335aafe2b3137df8d952d1aced +MD5 ca3ce790ea4e3094a12b80382a4a6447 files/lm1100-1.0.2a-class.patch 709 +RMD160 c17ea9e9f322784471a9f0802ebd80fee35bff5e files/lm1100-1.0.2a-class.patch 709 +SHA256 5c1543a644e22c38fac3190bea7e344640c9fe335aafe2b3137df8d952d1aced files/lm1100-1.0.2a-class.patch 709 +AUX lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866 RMD160 8b3576c26dd1c5b92f30b2bfd46f1f08afc3c38b SHA1 ca600b6eaae2edc16a4ab07db6e302a50a24a584 SHA256 4a7ab49fe2157b1c53e9d7a81a9f929d570e8d255eb2f226aa44c334aa93e076 +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-fix-compile-gcc-4.1.patch 2453 RMD160 7cce91817f3cc64e24658d1a0af0ed2b9bc131ac SHA1 28981321ccb40dbb40143b861afaa1cec0256375 SHA256 6d733e754b5e4f8011c2d009fbac9bd6c102fc205adee8983a88341487d7ea6e +MD5 9344049f940ff9bfa640eb7f316e6b2d files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2453 +RMD160 7cce91817f3cc64e24658d1a0af0ed2b9bc131ac files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2453 +SHA256 6d733e754b5e4f8011c2d009fbac9bd6c102fc205adee8983a88341487d7ea6e files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2453 +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 1284 RMD160 2e7eedb6c6f52cfc8813a89de039bb6ef02de753 SHA1 f7238a961a0cb81bb08dab99b803dca5ed660bb7 SHA256 cb32c00aaf828ac5171ec775959cdc969c97c3bf08eb24c054f30f559134079b +MD5 cb97f8f94d1ea5e545b4bddc5443860b lm1100-1.0.2a.ebuild 1284 +RMD160 2e7eedb6c6f52cfc8813a89de039bb6ef02de753 lm1100-1.0.2a.ebuild 1284 +SHA256 cb32c00aaf828ac5171ec775959cdc969c97c3bf08eb24c054f30f559134079b lm1100-1.0.2a.ebuild 1284 +MISC ChangeLog 558 RMD160 a06aff35d68ed24f7d56f8fe9dbd1acdeb08d5a5 SHA1 0c74a675332ec00cc93141f77ebb8acdfb2f00b8 SHA256 1d821aa4b7817789a68f6e2e2315573f83b0667e4fced21d8d50c2edab126d4e +MD5 ec0f93bf21fccaca37cbe95d20d667b1 ChangeLog 558 +RMD160 a06aff35d68ed24f7d56f8fe9dbd1acdeb08d5a5 ChangeLog 558 +SHA256 1d821aa4b7817789a68f6e2e2315573f83b0667e4fced21d8d50c2edab126d4e ChangeLog 558 +MISC metadata.xml 292 RMD160 75aa5cd3984a11555129fd8dd20001557ac20657 SHA1 f87ae47c38f668c250d63c66c5a9787a78aeff2f SHA256 c94cfaba37a6056219723e09acfdc90c7609059ae9fed8232eb5123972da5ebd +MD5 f871d85ca5cb7e6bd0a1f48142299f35 metadata.xml 292 +RMD160 75aa5cd3984a11555129fd8dd20001557ac20657 metadata.xml 292 +SHA256 c94cfaba37a6056219723e09acfdc90c7609059ae9fed8232eb5123972da5ebd metadata.xml 292 +MD5 e41f04b0841896d0bd71468e8437b667 files/digest-lm1100-1.0.2a 464 +RMD160 3c3d5b48d3e41dd9692f83c366c567a5acbfe8c3 files/digest-lm1100-1.0.2a 464 +SHA256 6af1a3a12ca2bbbb8817128618d897fa1b8260cbe7cef05facdc31ca8e2c3b73 files/digest-lm1100-1.0.2a 464 diff --git a/net-print/lm1100/files/digest-lm1100-1.0.2a b/net-print/lm1100/files/digest-lm1100-1.0.2a new file mode 100644 index 000000000000..0be39e89681b --- /dev/null +++ b/net-print/lm1100/files/digest-lm1100-1.0.2a @@ -0,0 +1,6 @@ +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 +MD5 49c8a6a7af2e4b6cef68593bccd48496 lm1100maint.tar.gz 708 +RMD160 a02888b3c253c08a4c03f1130866a11dad87e477 lm1100maint.tar.gz 708 +SHA256 832586bd028e2516f62651bb8e23ced87ea2714831156b1a069231a34971281d lm1100maint.tar.gz 708 diff --git a/net-print/lm1100/files/lm1100-1.0.2a-class.patch b/net-print/lm1100/files/lm1100-1.0.2a-class.patch new file mode 100644 index 000000000000..b771e1bf1449 --- /dev/null +++ b/net-print/lm1100/files/lm1100-1.0.2a-class.patch @@ -0,0 +1,24 @@ +diff -ur lm1100.1.0.2a~/PaintLine300c.h lm1100.1.0.2a/PaintLine300c.h +--- lm1100.1.0.2a~/PaintLine300c.h 2006-06-22 15:14:36.000000000 +0200 ++++ lm1100.1.0.2a/PaintLine300c.h 2006-06-22 15:14:55.000000000 +0200 +@@ -32,7 +32,7 @@ + int size; + int x,y; + +- friend LexmarkProtocol300c; ++ friend class LexmarkProtocol300c; + + public: + void pad(int pad_amount); +diff -ur lm1100.1.0.2a~/PaintLineBW.h lm1100.1.0.2a/PaintLineBW.h +--- lm1100.1.0.2a~/PaintLineBW.h 2006-06-22 15:14:36.000000000 +0200 ++++ lm1100.1.0.2a/PaintLineBW.h 2006-06-22 15:14:55.000000000 +0200 +@@ -33,7 +33,7 @@ + int size; + int x,y; + +- friend LexmarkProtocolBW; ++ friend class LexmarkProtocolBW; + + public: + void pad(int pad_amount); diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch new file mode 100644 index 000000000000..60e1b5c2e7a3 --- /dev/null +++ b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch @@ -0,0 +1,22 @@ +--- LexmarkProtocol300c.cc.orig 2000-11-21 09:06:22.000000000 +0100 ++++ LexmarkProtocol300c.cc 2004-06-16 13:28:04.397060286 +0200 +@@ -69,7 +69,7 @@ + Jet **LexmarkProtocol300c::createJets(int *numJets, Map *imageMap) + { + *numJets = 6; +- class Jet **jets = new (Jet *)[6]; ++ class Jet **jets = new Jet*[6]; + jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,8); + jets[1] = new Jet(1,0,0,imageMap,RIGHT_JET,0,8); + jets[2] = new Jet(2,-9,20,imageMap,LEFT_JET,1,8); +--- LexmarkProtocolBW.cc.orig 2000-11-21 09:06:22.000000000 +0100 ++++ LexmarkProtocolBW.cc 2004-06-16 13:32:51.291509280 +0200 +@@ -68,7 +68,7 @@ + Jet **LexmarkProtocolBW::createJets(int *numJets, Map *imageMap) + { + *numJets = 2; +- class Jet **jets = new (Jet *)[2]; ++ class Jet **jets = new Jet*[2]; + jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,28); + jets[1] = new Jet(0,0,0,imageMap,RIGHT_JET,0,28); + diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch new file mode 100644 index 000000000000..bc797a09a44b --- /dev/null +++ b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch @@ -0,0 +1,73 @@ +diff -ru lm1100.1.0.2a~/Jet.h lm1100.1.0.2a/Jet.h +--- lm1100.1.0.2a~/Jet.h 2006-12-02 18:48:16.000000000 +0100 ++++ lm1100.1.0.2a/Jet.h 2006-12-02 18:49:54.000000000 +0100 +@@ -45,7 +45,7 @@ + Coord imageStart; // start of image from edge of paper + + bool insideImage(int x, int y); +- bool Jet::needsPainting(int ix, int iy, int bit); ++ bool needsPainting(int ix, int iy, int bit); + + public: + /* Range of paper jet covers when head is at 0,0 */ +@@ -54,7 +54,7 @@ + /* Range of paper jet needs to cover to get the entire image */ + void getImageRange(Rect *dest); + Coord *getPreferredImageStart(Coord *start); +- int Jet::getPreferredEnd(); ++ int getPreferredEnd(); + bool finished(); + void setImageStart(Coord *imageStart); + void paint(int startX, int endX, int y, class LexmarkProtocol *protocol); +diff -ru lm1100.1.0.2a~/LinkedList.h lm1100.1.0.2a/LinkedList.h +--- lm1100.1.0.2a~/LinkedList.h 2006-12-02 18:48:16.000000000 +0100 ++++ lm1100.1.0.2a/LinkedList.h 2006-12-02 18:49:54.000000000 +0100 +@@ -26,8 +26,8 @@ + void *object; + LinkedList *next; + +- LinkedList::LinkedList(); +- LinkedList::LinkedList(void * object); ++ LinkedList(); ++ LinkedList(void * object); + }; + + #endif +diff -ru lm1100.1.0.2a~/Map.h lm1100.1.0.2a/Map.h +--- lm1100.1.0.2a~/Map.h 2006-12-02 18:48:16.000000000 +0100 ++++ lm1100.1.0.2a/Map.h 2006-12-02 18:49:54.000000000 +0100 +@@ -41,7 +41,7 @@ + int height; /* height of map in cells */ + + Map(int width, int height, int cellSize); +- Map::~Map(); ++ ~Map(); + + void cacheLines(int start, int len); + void addAlgorithm(MapAlgorithm *algorithm); +diff -ru lm1100.1.0.2a~/PPMRaw.h lm1100.1.0.2a/PPMRaw.h +--- lm1100.1.0.2a~/PPMRaw.h 2006-12-02 18:48:16.000000000 +0100 ++++ lm1100.1.0.2a/PPMRaw.h 2006-12-02 18:49:54.000000000 +0100 +@@ -32,7 +32,7 @@ + + public: + PPMRaw(Reader *reader,bool readMagic); +- static void PPMRaw::readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic); ++ static void readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic); + + virtual void getRGB(RGB *rgb, int x, int y); + +diff -ru lm1100.1.0.2a~/Rect.h lm1100.1.0.2a/Rect.h +--- lm1100.1.0.2a~/Rect.h 2006-12-02 18:48:16.000000000 +0100 ++++ lm1100.1.0.2a/Rect.h 2006-12-02 18:49:54.000000000 +0100 +@@ -23,8 +23,8 @@ + class Rect + { + public: +- Rect::Rect(); +- Rect::Rect(int x, int y, int width, int height); ++ Rect(); ++ Rect(int x, int y, int width, int height); + + int x,y,width,height; + 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 index 000000000000..b1f0a2ac4913 --- /dev/null +++ b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch @@ -0,0 +1,35 @@ +--- 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)/%) + +-CC = g++ -O2 ++CXX?=g++ ++CXXFLAGS?= -O2 ++#CC = g++ -O2 + #CC = g++ -g + + lm1100: $(OBJS) +- $(CC) -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 ++ $(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/files/lm1100maint-firmware.patch b/net-print/lm1100/files/lm1100maint-firmware.patch new file mode 100644 index 000000000000..5c3f4c92ea86 --- /dev/null +++ b/net-print/lm1100/files/lm1100maint-firmware.patch @@ -0,0 +1,14 @@ +diff -ur lm1100maint~/lm1100back lm1100maint/lm1100back +--- lm1100maint~/lm1100back 2006-06-26 19:48:51.000000000 +0200 ++++ lm1100maint/lm1100back 2006-06-26 19:50:41.000000000 +0200 +@@ -1,2 +1,2 @@ + #!/bin/sh +-dd if=/usr/share/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=/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 new file mode 100644 index 000000000000..082463372d74 --- /dev/null +++ b/net-print/lm1100/lm1100-1.0.2a.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/lm1100/lm1100-1.0.2a.ebuild,v 1.1 2006/12/02 19:03:57 cedk Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="The Tim Engler's Lexmark 1100 driver" +HOMEPAGE="http://www.linuxprinting.org/show_driver.cgi?driver=lm1100" +MY_P=${P/lm1100-/lm1100.} +SRC_URI="mirror://gentoo/${MY_P}.tar.gz + mirror://gentoo/${PN}maint.tar.gz" +#http://www.linuxprinting.org/download/printing/${PN}/${PN}maint.tar.gz +#http://www.linuxprinting.org/download/printing/${PN}/${MY_P}.tar.gz + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" +DEPEND="" +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch" + epatch "${FILESDIR}/${P}-fix-compile-gcc-4.1.patch" + epatch "${FILESDIR}/${P}-class.patch" + epatch "${FILESDIR}/${P}-makefile.patch" + + cd "${WORKDIR}/${PN}maint" + 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 "/usr/share/${PN}" + doins lexmarkback lexmarkchange + newdoc README README.maint +} diff --git a/net-print/lm1100/metadata.xml b/net-print/lm1100/metadata.xml new file mode 100644 index 000000000000..bc6756e27479 --- /dev/null +++ b/net-print/lm1100/metadata.xml @@ -0,0 +1,9 @@ + + + +no-herd + + cedk@gentoo.org + +The Tim Engler's Lexmark 1100 driver + -- 2.26.2