[gentoo-commits] gentoo-x86 commit in x11-plugins/wmcalc: wmcalc-0.4.ebuild ChangeLog

[Samuli Suominen (drac)]

drac        08/01/06 14:45:32

  Modified:             wmcalc-0.4.ebuild ChangeLog
  Log:
  Fix include path wrt #204553 and rewrite ebuild.
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.12                 x11-plugins/wmcalc/wmcalc-0.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild?r1=1.11&r2=1.12

Index: wmcalc-0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wmcalc-0.4.ebuild	22 Jul 2007 05:19:51 -0000	1.11
+++ wmcalc-0.4.ebuild	6 Jan 2008 14:45:31 -0000	1.12
@@ -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
 }



1.18                 x11-plugins/wmcalc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalc/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	22 Jul 2007 05:19:51 -0000	1.17
+++ ChangeLog	6 Jan 2008 14:45:31 -0000	1.18
@@ -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@g.o>
+  -files/wmcalc-0.4-Makefile.patch, wmcalc-0.4.ebuild:
+  Fix include path wrt #204553 and rewrite ebuild.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@g.o>; wmcalc-0.4.ebuild:
   Drop virtual/x11 references.



-- 
gentoo-commits@l.g.o mailing list