Apply patch from Peter Alfredsen <loki_val@gentoo.org> to respect LDFLAGS. Bug #227163

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 289 insertions, 14 deletions

diff --git a/app-misc/graphlcd-base/ChangeLog b/app-misc/graphlcd-base/ChangeLog
index 4c924f7d13f6..c3e1e6880e1f 100644
--- a/app-misc/graphlcd-base/ChangeLog
+++ b/app-misc/graphlcd-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/graphlcd-base
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.22 2009/02/01 22:03:34 hd_brummy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.23 2010/08/10 17:25:32 hwoarang Exp $
+
+*graphlcd-base-0.1.5-r2 (10 Aug 2010)
+
+  10 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +graphlcd-base-0.1.5-r2.ebuild, +files/graphlcd-base-0.1.5-ldflags.patch:
+  Apply patch from Peter Alfredsen <loki_val@gentoo.org> to respect LDFLAGS.
+  Bug #227163
 
   01 Feb 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   graphlcd-base-0.1.5-r1.ebuild:
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index e11d1232c0c0..95a80a7b09ef 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX graphlcd-base-0.1.5-gcc43.patch 10066 RMD160 a5f63b7b91c8ea371e1d7a5f0918cc6f4b94d14d SHA1 a57ce3ed3fe8f83ecb83204b9de88e214ac71f29 SHA256 6753e9a1804ae49ef367a97138e04d2e1fb69fa1a7517e4c0d5a9c462b4777d7
+AUX graphlcd-base-0.1.5-ldflags.patch 7428 RMD160 2723dc7d810353375d5e5c79f062aa488457f26c SHA1 3c707814ed62c5acdec0ea988812ffcf434db0e9 SHA256 7af33faf6cc3cef3d710450e0c03848482ca99efde32feabcd7013e35931e3a7
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 RMD160 36e1c9330eedcf76d7378c9f44932db8053e2a39 SHA1 37105756ab6c85f5d059feae4d0e0b96258b4c18 SHA256 5a59bc4ad1567d9898cf69e0152a350e980dcf027230fc442813a44a8c358d99
 DIST graphlcd-base-0.1.5.tgz 99863 RMD160 17fd2a0a0ef2362013843929df8944902f71c104 SHA1 b9ea611a37cb4fe4c47e1fc3b3bc5c8ae48c243c SHA256 7b11d1e68aa3f9b65ae437e9d6b5bd8bdaba86f7abf93e4ae5ee6b2427b5a47f
 DIST graphlcd-base-0.1.5_utf8.diff.tgz 5040 RMD160 6d9bd62e6d0fe253095599eb1ef10e8d6dfcf925 SHA1 6ec2373ad9c262da43f38c0d3c9322f5bf4a853d SHA256 02aeee8f7fcfacf927c86cb9bcb7a67fa5574ad43871938f1e99e618852fbfcb
 EBUILD graphlcd-base-0.1.5-r1.ebuild 1230 RMD160 2a3b8fde97b39e48791af7d9083280ca5b296339 SHA1 199866ede865021c036229536c20c33c3db7b21b SHA256 56ddb1b696e5cff5a62451c4424aed71f52d5d6a0646fc5d8d98efe77e3dd152
+EBUILD graphlcd-base-0.1.5-r2.ebuild 1257 RMD160 2483c76212eb841ed2a61bf16bb8289e0d80c3af SHA1 02998c46817dc275f352c07852e1f21dc107a09f SHA256 40334421708511b53acec039cd5e2e13d8cf7963cae2eaf4f21856c9cbb8f53d
 EBUILD graphlcd-base-0.1.5.ebuild 956 RMD160 0f003de2c70349af5b598859b59c49b16fd7ff20 SHA1 7063951b5d3a9456c18d924c768506ea868de983 SHA256 8e2328543cff417ead53e8e25d41496668c6bf88ead4d20cb6e699e559a51b94
-MISC ChangeLog 3734 RMD160 b9030b3b97e68b7b06064101941519f4c238944e SHA1 06645cb34f5b171119afec66113e7da8e78c9011 SHA256 7051b1979f1bacb58046a9a43af06a74bb6f19fa77d23fd0885d32464e843344
+MISC ChangeLog 3993 RMD160 43cad8b8a92f147670d9b2ef7f8928850767384b SHA1 405d21d16d012c230b04d853cd16d9b0fb38639b SHA256 5608cfffd06c93c3fd3b00cd43641a2c7abd2b7186b11c89e1d1febe3227f7e6
 MISC metadata.xml 560 RMD160 e42bd4647d65014a13b7a307df12032387a8e4c4 SHA1 dc147193f1935c2050ec3a6df83193eaa32ee565 SHA256 0e4acf32caa3eec8494b2a1cc713612a4f6f5b98a325338b193a2072f165ddca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFJhhxhdn07HTTCgIoRApiAAJ4gQ9OUucRp1G5s2Ygb6oBYRv1MKACgh2Br
-wZqb5DxsmdyvDUBAXy1vXrg=
-=ZDxf
------END PGP SIGNATURE-----
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-ldflags.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-ldflags.patch
new file mode 100644
index 000000000000..25f90248bc3c
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-ldflags.patch
@@ -0,0 +1,232 @@
+diff -NrU5 graphlcd-base-0.1.5.orig/glcddrivers/Makefile graphlcd-base-0.1.5/glcddrivers/Makefile
+--- graphlcd-base-0.1.5.orig/glcddrivers/Makefile	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcddrivers/Makefile	2008-06-15 14:15:29.000000000 +0200
+@@ -20,11 +20,11 @@
+ 
+ 
+ ### Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = g++ -MM -MG
+ DEPFILE = .dependencies
+@@ -36,11 +36,11 @@
+ ### Targets:
+ 
+ all: $(LIBNAME)
+ 
+ $(LIBNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -ldl -lpthread -Wl,-soname="$(BASENAME).$(VERMAJOR)" -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -ldl -lpthread -Wl,-soname="$(BASENAME).$(VERMAJOR)" -o $@
+ 	ln -sf $(LIBNAME) $(BASENAME)
+ 
+ install: all
+ 	install -d $(LIBDIR)
+ 	install -m 755 $(LIBNAME) $(LIBDIR)/
+diff -NrU5 graphlcd-base-0.1.5.orig/glcdgraphics/Makefile graphlcd-base-0.1.5/glcdgraphics/Makefile
+--- graphlcd-base-0.1.5.orig/glcdgraphics/Makefile	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/glcdgraphics/Makefile	2008-06-15 14:16:07.000000000 +0200
+@@ -19,11 +19,11 @@
+ HEADERS = bitmap.h font.h glcd.h image.h imagefile.h pbm.h
+ 
+ ### Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = g++ -MM -MG
+ DEPFILE = .dependencies
+@@ -44,11 +44,11 @@
+ endif### Targets:
+ 
+ all: $(LIBNAME)
+ 
+ $(LIBNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(BASENAME).$(VERMAJOR)" -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(BASENAME).$(VERMAJOR)" -o $@
+ 	ln -sf $(LIBNAME) $(BASENAME)
+ 
+ install: all
+ 	install -d $(LIBDIR)
+ 	install -m 755 $(LIBNAME) $(LIBDIR)/
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/convpic/Makefile	2008-06-15 14:16:32.000000000 +0200
+@@ -16,11 +16,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -30,11 +30,11 @@
+ -include $(DEPFILE)
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/crtfont/Makefile	2008-06-15 14:18:28.000000000 +0200
+@@ -15,11 +15,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -40,11 +40,11 @@
+ endif### Targets:
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBDIRS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBDIRS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/genfont/Makefile	2008-06-15 14:18:46.000000000 +0200
+@@ -18,11 +18,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -32,11 +32,11 @@
+ -include $(DEPFILE)
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBDIRS) $(LIBS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBDIRS) $(LIBS) -lglcdgraphics -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 	
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile	2008-06-15 14:19:08.000000000 +0200
+@@ -16,11 +16,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -41,11 +41,11 @@
+ endif### Targets:
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/showpic/Makefile	2008-06-15 14:19:29.000000000 +0200
+@@ -16,11 +16,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -41,11 +41,11 @@
+ endif### Targets:
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 
+diff -NrU5 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	2008-06-15 13:47:31.000000000 +0200
++++ graphlcd-base-0.1.5/tools/showtext/Makefile	2008-06-15 14:23:52.000000000 +0200
+@@ -16,11 +16,11 @@
+ .PHONY: all
+ 
+ # Implicit rules:
+ 
+ %.o: %.c
+-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ 
+ # Dependencies:
+ 
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+@@ -41,11 +41,11 @@
+ endif### Targets:
+ 
+ # The main program:
+ 
+ $(PRGNAME): $(OBJS)
+-	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lstdc++ -o $(PRGNAME)
+ 
+ install: $(PRGNAME)
+ 	install -d $(BINDIR)
+ 	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
+ 
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.5-r2.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..e7852e3172fe
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.5-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/graphlcd-base-0.1.5-r2.ebuild,v 1.1 2010/08/10 17:25:32 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Graphical LCD Driver"
+HOMEPAGE="http://graphlcd.berlios.de/"
+SRC_URI="mirror://berlios/graphlcd/${P}.tgz
+		mirror://vdrfiles/${PN}/${P}_utf8.diff.tgz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="truetype unicode g15"
+
+DEPEND=""
+
+RDEPEND="truetype? ( media-libs/freetype media-fonts/corefonts )
+		unicode? ( media-libs/freetype media-fonts/corefonts )
+		g15? ( app-misc/g15daemon )"
+
+src_prepare() {
+	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	use !truetype && sed -i "s:HAVE_FREETYPE2:#HAVE_FREETYPE2:" Make.config
+
+	use unicode && epatch "${WORKDIR}/${P}_utf8.diff" && \
+	sed -i "s:#HAVE_FREETYPE2:HAVE_FREETYPE2:" Make.config
+}
+
+src_install() {
+
+	make DESTDIR="${D}"/usr LIBDIR="${D}"/usr/$(get_libdir) install || die "make install failed"
+
+	insinto /etc
+	doins graphlcd.conf
+
+	dodoc docs/*
+}