Fix include path wrt #204553 and rewrite ebuild.

(Portage version: 2.1.4_rc14)

3 files changed, 30 insertions, 44 deletions

diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog
index 7b07a11e5e83..2030ca880252 100644
--- a/x11-plugins/wmcalc/ChangeLog
+++ b/x11-plugins/wmcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmcalc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.17 2007/07/22 05:19:51 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.18 2008/01/06 14:45:31 drac Exp $
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/wmcalc-0.4-Makefile.patch, wmcalc-0.4.ebuild:
+  Fix include path wrt #204553 and rewrite ebuild.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcalc-0.4.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch b/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch
deleted file mode 100644
index 966f4c8ad616..000000000000
--- a/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile	2004-08-15 22:23:44.790506624 +0200
-+++ Makefile	2004-08-15 22:24:26.111224920 +0200
-@@ -14,10 +14,10 @@
- INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
- 
- .c.o:
--	gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-+	gcc -c -Wall ${INCLUDES} ${CFLAGS} $< -o $*.o
- 
- ${TARGET}: ${OBJECTS}
--	gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	gcc ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
index 4e8ffe00eb7a..5f8bc584f3e6 100644
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.11 2007/07/22 05:19:51 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.12 2008/01/06 14:45:31 drac Exp $
 
-inherit eutils
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A WindowMaker DockApp calculator"
 HOMEPAGE="http://dockapps.org/file.php/id/130"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc ppc64 ~sparc"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
 
-DEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXpm
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
 
-IUSE=""
-
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/wmcalc-0.4-Makefile.patch
+	cd "${S}"
+	sed -e "s:gcc:$(tc-getCC):g" \
+		-e "s:-O2:${CFLAGS}:g" -i Makefile
 }
 
-src_compile()
-{
-	emake || die
+src_compile() {
+	emake INCLUDES="-I/usr/include/X11" \
+		LIBINC="-L/usr/$(get_libdir)" \
+		|| die "emake failed."
 }
 
-src_install ()
-{
-	dobin wmcalc
-
-	dodoc README
+src_install() {
+	dodir /etc /usr/bin
 
-	newman ${FILESDIR}/wmcalc.man wmcalc.1
+	emake DESTDIR="${D}" PREFIX="/usr" install \
+		|| die "emake install failed."
 
-	insinto /etc
-	newins .wmcalc wmcalc.conf
-
-	insinto /etc/skel
-	doins .wmcalc
+	dodoc README
+	newman "${FILESDIR}"/wmcalc.man wmcalc.1
 }