fixed missing LDFLAGS, #352714, cleanup

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 16 insertions, 52 deletions

diff --git a/app-misc/graphlcd-base/ChangeLog b/app-misc/graphlcd-base/ChangeLog
index 492d8a27954b..57d01b96464c 100644
--- a/app-misc/graphlcd-base/ChangeLog
+++ b/app-misc/graphlcd-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/graphlcd-base
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.24 2010/12/03 14:31:31 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/ChangeLog,v 1.25 2011/01/25 19:02:16 hd_brummy Exp $
+
+  25 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -graphlcd-base-0.1.5.ebuild, graphlcd-base-0.1.7.ebuild:
+  fixed missing LDFLAGS, #352714, cleanup
 
 *graphlcd-base-0.1.7 (03 Dec 2010)
 
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 21c35e33953d..22a4e53ea102 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -9,15 +9,14 @@ DIST graphlcd-base-0.1.5_utf8.diff.tgz 5040 RMD160 6d9bd62e6d0fe253095599eb1ef10
 DIST graphlcd-base-0.1.7.tgz 381410 RMD160 4c5ee66dd89ad2786db5119e9e32cfd966b72beb SHA1 2053695ecd42fe93ab941a3d12c965f9061c242d SHA256 72630184073671c415a13a57c1789e3a06af05d6c62db8c48a6e03b4e41c2d3c
 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
-EBUILD graphlcd-base-0.1.7.ebuild 765 RMD160 ce700e01211e6aa54a474f12adb2d7879a3ec92c SHA1 040aba6508f7e5d8d1492bc312a5456c757f7c69 SHA256 e39f162b7dc0644bbd6125b98a04307687ec6504a541a25e3644a3668f1061d1
-MISC ChangeLog 4163 RMD160 172948fce30ea51a33376441e9b8f14f19e3194a SHA1 8e53bcf414fe280ef717647cf7956e75fa6e385c SHA256 027ca2bf33c725f1f3043f70aa421bbe85ea1ceaab432fb18701b0f0f847614c
+EBUILD graphlcd-base-0.1.7.ebuild 944 RMD160 0c4b5eae4dd3f400aae9be260a3650a281ae0882 SHA1 3836eac0713517b8fe3bd2f264ef578110d1f20a SHA256 0e90a02d2d616df48e772f63a835380d5b093ac068d2954c414a63f27c055c94
+MISC ChangeLog 4320 RMD160 e3e4100f11b7fc004864ef045cf2ec70af57d68f SHA1 46ace51e9c5923a79e665bcaa9e7bf31bd7f6863 SHA256 e272f532f5bfe7ca1beb035e5e80a7d79a1d708735b32ff04845290dda664cdd
 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
 
-iD8DBQFM+P9adn07HTTCgIoRAioaAJ9qFl/VVkYbbw4pZIis+SlwxIBpgQCfWczX
-Uz/AJiNmvuAgTckqzKc+Ws4=
-=LSWd
+iD8DBQFNPx5Wdn07HTTCgIoRAm9+AKCGoDNflUMFevZ7zxwdviCBJfSiywCbBWMF
+sJUVntwK8pSksbcRZUPTbE4=
+=mdui
 -----END PGP SIGNATURE-----
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.5.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.5.ebuild
deleted file mode 100644
index 45a6ec86c7af..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.6 2008/10/14 13:32:11 rbu Exp $
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Graphical LCD Driver"
-HOMEPAGE="http://graphlcd.berlios.de/"
-SRC_URI="mirror://berlios/graphlcd/${P}.tgz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="truetype g15"
-
-DEPEND=""
-
-RDEPEND="truetype? ( media-libs/freetype
-		media-fonts/corefonts )
-		g15? ( app-misc/g15daemon )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-
-	use !truetype && 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/*
-}
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.7.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.7.ebuild
index aebaa1847f73..f3d7139fee7c 100644
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.7.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/app-misc/graphlcd-base/graphlcd-base-0.1.7.ebuild,v 1.2 2011/01/25 19:02:16 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils flag-o-matic multilib
 
@@ -23,6 +23,8 @@ src_prepare() {
 
 	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
 	epatch "${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+
+	sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
 }
 
 src_install() {