diff options
author | Michele Noberasco <s4t4n@gentoo.org> | 2008-01-28 13:43:14 +0000 |
---|---|---|
committer | Michele Noberasco <s4t4n@gentoo.org> | 2008-01-28 13:43:14 +0000 |
commit | 1b5b69716eeffd12e5ca4a71919132a75b109d35 (patch) | |
tree | cd8a637e1fc98af72d38e19eea305b631626c4c5 /x11-plugins/wmMoonClock | |
parent | Version bump (diff) | |
download | gentoo-2-1b5b69716eeffd12e5ca4a71919132a75b109d35.tar.gz gentoo-2-1b5b69716eeffd12e5ca4a71919132a75b109d35.tar.bz2 gentoo-2-1b5b69716eeffd12e5ca4a71919132a75b109d35.zip |
Revision bump, closing bug #207802. Some QA fixing on previous ebuild.
(Portage version: 2.1.3.19)
Diffstat (limited to 'x11-plugins/wmMoonClock')
-rw-r--r-- | x11-plugins/wmMoonClock/ChangeLog | 11 | ||||
-rw-r--r-- | x11-plugins/wmMoonClock/files/digest-wmMoonClock-1.27-r1 | 3 | ||||
-rw-r--r-- | x11-plugins/wmMoonClock/files/wmMoonClock-1.27-makefile.patch | 36 | ||||
-rw-r--r-- | x11-plugins/wmMoonClock/wmMoonClock-1.27-r1.ebuild | 38 | ||||
-rw-r--r-- | x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild | 6 |
5 files changed, 90 insertions, 4 deletions
diff --git a/x11-plugins/wmMoonClock/ChangeLog b/x11-plugins/wmMoonClock/ChangeLog index 4174403f2c85..77badb6ee742 100644 --- a/x11-plugins/wmMoonClock/ChangeLog +++ b/x11-plugins/wmMoonClock/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-plugins/wmMoonClock # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.9 2007/07/22 05:34:11 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/ChangeLog,v 1.10 2008/01/28 13:43:13 s4t4n Exp $ + +*wmMoonClock-1.27-r1 (28 Jan 2008) + + 28 Jan 2008; Michele Noberasco <s4t4n@gentoo.org> wmMoonClock-1.27-r1.ebuild, + files/digest-wmMoonClock-1.27-r1, files/wmMoonClock-1.27-makefile.patch : + Revision bump, with fixes for CFLAGS, crosscompile, multilib, QA, etc... + Closes bug #207802. + wmMoonClock-1.27.ebuild: + Some QA fixing. 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmMoonClock-1.27.ebuild: diff --git a/x11-plugins/wmMoonClock/files/digest-wmMoonClock-1.27-r1 b/x11-plugins/wmMoonClock/files/digest-wmMoonClock-1.27-r1 new file mode 100644 index 000000000000..1d2004f55be7 --- /dev/null +++ b/x11-plugins/wmMoonClock/files/digest-wmMoonClock-1.27-r1 @@ -0,0 +1,3 @@ +MD5 c85bc974e70c867d556805505d3be48c wmMoonClock-1.27.tar.gz 155197 +RMD160 adf74a0fff42a5e3d7823c7fabf71c95f47057e4 wmMoonClock-1.27.tar.gz 155197 +SHA256 439d330a30ee1cb084e0512e894f5e1a2e9869745a2274fbd9a56832c1527c77 wmMoonClock-1.27.tar.gz 155197 diff --git a/x11-plugins/wmMoonClock/files/wmMoonClock-1.27-makefile.patch b/x11-plugins/wmMoonClock/files/wmMoonClock-1.27-makefile.patch new file mode 100644 index 000000000000..ecc4f5c4fc62 --- /dev/null +++ b/x11-plugins/wmMoonClock/files/wmMoonClock-1.27-makefile.patch @@ -0,0 +1,36 @@ +--- Makefile.orig 1999-03-23 03:20:32.000000000 +0100 ++++ Makefile 2008-01-27 23:44:28.000000000 +0100 +@@ -1,8 +1,9 @@ +-CC = gcc +-CFLAGS = -O2 +-INCDIR = -I/usr/X11R6/include/X11 +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS += ++INCDIR = -I/usr/include/X11 ++PREFIX ?= /usr ++LIBDIR ?= /usr/lib ++MANDIR = $(PREFIX)/share/man + + # for Linux + LIBS = -lXpm -lX11 -lXext +@@ -22,7 +23,7 @@ + + wmMoonClock.o: wmMoonClock_master.xpm wmMoonClock_mask.xbm CalcEphem.h + wmMoonClock: $(OBJS) +- $(CC) $(COPTS) $(SYSTEM) -lm -o wmMoonClock $^ $(INCDIR) $(LIBDIR) $(LIBS) ++ $(CC) $(COPTS) $(SYSTEM) -lm -o wmMoonClock $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS) + + clean: + for i in $(OBJS) ; do \ +@@ -31,6 +32,7 @@ + rm -f wmMoonClock + + install:: wmMoonClock +- install -s -m 0755 wmMoonClock $(DESTDIR)/bin +- install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1 ++ install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(MANDIR)/man1 ++ install -m 0755 wmMoonClock $(DESTDIR)$(PREFIX)/bin ++ install -m 0644 wmMoonClock.1 $(DESTDIR)$(MANDIR)/man1 + diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27-r1.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27-r1.ebuild new file mode 100644 index 000000000000..b679db9f2687 --- /dev/null +++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27-r1.ebuild,v 1.1 2008/01/28 13:43:13 s4t4n Exp $ + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy." +SRC_URI="http://nis-www.lanl.gov/~mgh/WindowMaker/${P}.tar.gz" +HOMEPAGE="http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-proto/xproto + x11-proto/xextproto" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~mips ~ppc ~sparc" +IUSE="" + +S="${WORKDIR}/${P}/Src" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-makefile.patch +} + +src_compile() { + emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "install failed" + dodoc ../BUGS +} diff --git a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild index 6e46079a7c8c..8dc25a2ac875 100644 --- a/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild +++ b/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild @@ -1,6 +1,6 @@ -# 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/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.14 2007/07/22 05:34:11 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMoonClock/wmMoonClock-1.27.ebuild,v 1.15 2008/01/28 13:43:13 s4t4n Exp $ IUSE="" DESCRIPTION="dockapp that shows lunar ephemeris to a high accuracy." @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="x86 amd64 ~mips ppc ~sparc" src_unpack() { - unpack ${A} ; cd ${S}/Src + unpack "${A}" ; cd "${S}/Src" sed -i -e "s:-O2:${CFLAGS}:" Makefile } |