[gentoo-commits] repo/gentoo:master commit in: app-misc/graphlcd-base/files/, app-misc/graphlcd-base/

[Joonas Niilola]

commit:     36f99ce2c239354aa1ea31e3b2e9a3406a0e2b24
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Thu Oct 24 20:09:57 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 14:12:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f99ce2

app-misc/graphlcd-base: drop old version

Closes: https://bugs.gentoo.org/669000
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/13418
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-misc/graphlcd-base/Manifest                    |  1 -
 .../files/graphlcd-base-0.1.5-nostrip.patch        | 75 ----------------------
 .../graphlcd-base-0.1.9-freetype_pkgconfig.patch   | 30 ---------
 app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild  | 50 ---------------
 4 files changed, 156 deletions(-)

diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 867e251f6b3..3fee79c4368 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,2 +1 @@
-DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca

diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
deleted file mode 100644
index 9973394f150..00000000000
--- a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-remove strip -s in makefile
-
-Joerg Bornkessel <hd_brummy@g.o> 06 April 2007
-diff -Naur graphlcd-base-0.1.5.orig/tools/convpic/Makefile graphlcd-base-0.1.5/tools/convpic/Makefile
---- graphlcd-base-0.1.5.orig/tools/convpic/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/convpic/Makefile	2007-04-06 20:35:17.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/crtfont/Makefile graphlcd-base-0.1.5/tools/crtfont/Makefile
---- graphlcd-base-0.1.5.orig/tools/crtfont/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/crtfont/Makefile	2007-04-06 20:35:32.000000000 +0200
-@@ -35,7 +35,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/genfont/Makefile graphlcd-base-0.1.5/tools/genfont/Makefile
---- graphlcd-base-0.1.5.orig/tools/genfont/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/genfont/Makefile	2007-04-06 20:35:43.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 	
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile
---- graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile	2007-04-06 20:35:57.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/showpic/Makefile graphlcd-base-0.1.5/tools/showpic/Makefile
---- graphlcd-base-0.1.5.orig/tools/showpic/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/showpic/Makefile	2007-04-06 20:36:09.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/showtext/Makefile graphlcd-base-0.1.5/tools/showtext/Makefile
---- graphlcd-base-0.1.5.orig/tools/showtext/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/showtext/Makefile	2007-04-06 20:36:21.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)

diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
deleted file mode 100644
index cbdaf1ceb59..00000000000
--- a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- graphlcd-base-0.1.9/glcdgraphics/Makefile
-+++ graphlcd-base-0.1.9/glcdgraphics/Makefile
-@@ -33,9 +33,9 @@
- -include $(DEPFILE)
- 
- ifdef HAVE_FREETYPE2
--	ifneq ($(shell which freetype-config),)
--		INCLUDES += $(shell freetype-config --cflags)
--		LIBS += $(shell freetype-config --libs)
-+	ifneq ($(shell which pkg-config),)
-+		INCLUDES += $(shell pkg-config --cflags freetype2)
-+		LIBS += $(shell pkg-config --libs freetype2)
- 	else
- 		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
- 		LIBS += -lfreetype
---- graphlcd-base-0.1.9/tools/genfont/Makefile
-+++ graphlcd-base-0.1.9/tools/genfont/Makefile
-@@ -9,10 +9,10 @@
- OBJS = genfont.o
- 
- INCLUDES += -I../../
--INCLUDES += `freetype-config --cflags`
-+INCLUDES += `pkg-config --cflags freetype2`
- 
- LIBDIRS += -L../../glcdgraphics/
--LIBS += `freetype-config --libs`
-+LIBS += `pkg-config --libs freetype2`
- 
- all: $(PRGNAME)
- .PHONY: all

diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
deleted file mode 100644
index 7c3f216d977..00000000000
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib
-
-VERSION="501" #every bump, new version
-
-DESCRIPTION="Graphical LCD Driver"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="g15"
-
-CDEPEND="media-libs/freetype"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	g15? ( app-misc/g15daemon )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.5-nostrip.patch"
-	"${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch"
-)
-
-src_prepare() {
-	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-
-	default
-
-	sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
-
-	#gcc-6 fix
-	sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:"
-}
-
-src_install() {
-	emake DESTDIR="${D}"/usr LIBDIR="${D}"/usr/$(get_libdir) install
-
-	insinto /etc
-	doins graphlcd.conf
-
-	local DOCS=( HISTORY README docs/* )
-
-	einstalldocs
-}