Stable on x86. Removed old version.

(Portage version: 2.1.2.3)

5 files changed, 15 insertions, 57 deletions

diff --git a/app-misc/glcdprocdriver/ChangeLog b/app-misc/glcdprocdriver/ChangeLog
index 3f922d3a74c7..7adfed77caf7 100644
--- a/app-misc/glcdprocdriver/ChangeLog
+++ b/app-misc/glcdprocdriver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/glcdprocdriver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glcdprocdriver/ChangeLog,v 1.5 2007/04/07 19:48:27 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glcdprocdriver/ChangeLog,v 1.6 2007/04/08 12:50:26 tove Exp $
+
+  08 Apr 2007; Torsten Veller <tove@gentoo.org>
+  files/glcdprocdriver-0.0.3-makefile.patch,
+  -glcdprocdriver-0.0.3-r1.ebuild, glcdprocdriver-0.0.3-r2.ebuild:
+  Stable on x86. Removed old version.
 
 *glcdprocdriver-0.0.3-r2 (07 Apr 2007)
 
diff --git a/app-misc/glcdprocdriver/files/digest-glcdprocdriver-0.0.3-r1 b/app-misc/glcdprocdriver/files/digest-glcdprocdriver-0.0.3-r1
deleted file mode 100644
index b8512fdb735c..000000000000
--- a/app-misc/glcdprocdriver/files/digest-glcdprocdriver-0.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67d1948efe2f9f15098eab1e261fc797 glcdprocdriver-0.0.3.tar.bz2 17565
-RMD160 ef15bdda24d52f2c097968f4ef3a3bea78a87cc5 glcdprocdriver-0.0.3.tar.bz2 17565
-SHA256 89c99051e5c3a0724c5ea212079e0571066888c74ebd3fda6befd65f8bec03e6 glcdprocdriver-0.0.3.tar.bz2 17565
diff --git a/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch b/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch
index c47eec9a12d9..51b93347acf1 100644
--- a/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch
+++ b/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch
@@ -17,5 +17,6 @@
 +	$(CXX) -c -fPIC $(CXXFLAGS) $< -o $@
 +
  $(LIBNAME): $(OBJS)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(SONAME)" -o $@
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(SONAME)" -o $@
++	$(CXX) $(LDFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(SONAME)" -o $@
  
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r1.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r1.ebuild
deleted file mode 100644
index 5452eb028902..000000000000
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r1.ebuild,v 1.2 2007/04/07 14:16:22 jokey Exp $
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Glue library for the glcdlib LCDproc driver based on GraphLCD"
-HOMEPAGE="http://www.muresan.de/graphlcd/lcdproc"
-SRC_URI="http://www.muresan.de/graphlcd/lcdproc/${P}.tar.bz2"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-S=${WORKDIR}/${P}
-
-DEPEND=">=app-misc/graphlcd-base-0.1.3"
-RDEPEND=${DEPEND}
-
-IUSE=""
-
-src_unpack()
-{
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS defined in /etc/make.conf instead of the ones in Make.config
-	sed -i ${S}/Make.config -e "s:FLAGS *=:FLAGS ?=:"
-}
-
-src_compile()
-{
-	append-flags -fPIC
-
-	emake || die "make failed"
-}
-
-src_install()
-{
-	emake DESTDIR=${D}/usr LIBDIR=${D}/usr/$(get_libdir) install || die "make install failed"
-	dodoc AUTHORS README INSTALL TODO ChangeLog
-}
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild
index 74edade1a67e..2e8f837f53cc 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild,v 1.1 2007/04/07 19:48:27 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glcdprocdriver/glcdprocdriver-0.0.3-r2.ebuild,v 1.2 2007/04/08 12:50:26 tove Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -8,12 +8,10 @@ DESCRIPTION="Glue library for the glcdlib LCDproc driver based on GraphLCD"
 HOMEPAGE="http://www.muresan.de/graphlcd/lcdproc"
 SRC_URI="http://www.muresan.de/graphlcd/lcdproc/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-S=${WORKDIR}/${P}
-
 DEPEND=">=app-misc/graphlcd-base-0.1.3"
 RDEPEND=${DEPEND}
 
@@ -23,16 +21,15 @@ src_unpack()
 {
 	unpack ${A}
 	cd "${S}"
-
-	# use CFLAGS defined in /etc/make.conf instead of the ones in Make.config
-	sed -i ${S}/Make.config -e "s:FLAGS *=:FLAGS ?=:"
-	sed -i ${S}/Make.config -e "6s:gcc:$(tc-getCC):"
-	sed -i ${S}/Make.config -e "9s:g++:$(tc-getCXX):"
 	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
+}
+
 src_install()
 {
-	emake DESTDIR=${D}/usr LIBDIR=${D}/usr/$(get_libdir) install || die "make install failed"
+	emake DESTDIR="${D}/usr" LIBDIR="${D}/usr/$(get_libdir)" install || die "make install failed"
 	dodoc AUTHORS README INSTALL TODO ChangeLog
 }