[gentoo-commits] repo/gentoo:master commit in: profiles/, net-print/lm1100/files/, net-print/lm1100/

[Jakov Smolić]

commit:     3f5c5685cfca700e92ddd07aab784bd03abcce3b
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 13:16:48 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 13:16:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5c5685

net-print/lm1100: treeclean

Closes: https://bugs.gentoo.org/819264
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-print/lm1100/Manifest                          |  2 -
 net-print/lm1100/files/lm1100-1.0.2a-class.patch   | 24 -------
 .../files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch  | 22 -------
 .../files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch  | 73 ----------------------
 .../lm1100/files/lm1100-1.0.2a-makefile.patch      | 35 -----------
 net-print/lm1100/files/lm1100maint-firmware.patch  | 14 -----
 net-print/lm1100/lm1100-1.0.2a-r1.ebuild           | 43 -------------
 net-print/lm1100/metadata.xml                      |  5 --
 profiles/package.mask                              |  5 --
 9 files changed, 223 deletions(-)

diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
deleted file mode 100644
index ab3330db8889..000000000000
--- a/net-print/lm1100/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST lm1100.1.0.2a.tar.gz 64316 BLAKE2B b47fef489b16568e2e2b0097bd79f90b1c7acb80b7fd28d00fc74c5072f83b1c2f2d6bb75534e0c678d4ad9312d222e311bd9593206acad8eaa3a5166fbbebcf SHA512 3dda80602af99d93a570e066ca2a121afd93b28b5d28b6f49b52c2c90e288de7b87cefdd5e00bf4edd73439fb6088433fabe884b841befd24183f27a12fcbcb1
-DIST lm1100maint.tar.gz 708 BLAKE2B 69b29e477a5491f88bafe92eb94a3742fe8b6074116544cd0689a98273b9bd4eb3ee5e5b74acc4e68cff3eef1d9c177b6d041db64712dad2e6fb189f56e9c1cb SHA512 fe81351705c36dd30e01d402461820ed583d2a8222af8dd81f4dff35c6629592e09fb6dbc0740b9ba0f555de65aeae41c0cb953fbedd0c8620db29b37d797b02

diff --git a/net-print/lm1100/files/lm1100-1.0.2a-class.patch b/net-print/lm1100/files/lm1100-1.0.2a-class.patch
deleted file mode 100644
index b771e1bf1449..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-class.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 60e1b5c2e7a3..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index bc797a09a44b..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index b1f0a2ac4913..000000000000
--- a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
deleted file mode 100644
index 5c3f4c92ea86..000000000000
--- a/net-print/lm1100/files/lm1100maint-firmware.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-r1.ebuild b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
deleted file mode 100644
index 1521dc21c771..000000000000
--- a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch 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
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch"\
-		"${FILESDIR}/${P}-fix-compile-gcc-4.1.patch"\
-		"${FILESDIR}/${P}-class.patch"\
-		"${FILESDIR}/${P}-makefile.patch"
-	cd "${WORKDIR}/${PN}maint" || die
-	epatch "${FILESDIR}/${PN}maint-firmware.patch"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	dobin lm1100
-	dodoc README RELEASE.txt
-
-	cd "${WORKDIR}/${PN}maint" || die
-	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
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-print/lm1100/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 276163c7a028..87aa4c2534b9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -311,11 +311,6 @@ net-misc/pmsvn
 # Removal on 2021-11-23. Bug #819294.
 net-misc/gcap
 
-# Jakov Smolić <jsmolic@g.o> (2021-10-24)
-# No maintainer, EAPI 5, dead upstream.
-# Removal on 2021-11-23. Bug #819264.
-net-print/lm1100
-
 # Sam James <sam@g.o> (2021-10-10)
 # Needs upstream build system fixes (currently in progress).
 # Python toggles don't work correctly right now.