From 8e100e74de1c0bcedf29427e9619de1ff98abfd6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 29 Jan 2005 05:20:52 +0000 Subject: respect $CC / $LDFLAGS #78928 (Portage version: 2.0.51-r15) --- games-misc/fortune-mod/files/9708-Makefile.patch | 41 --------------- games-misc/fortune-mod/files/9708-ppc-rot.patch | 11 ---- .../files/digest-fortune-mod-1.0.9708-r1 | 1 - .../fortune-mod/fortune-mod-1.0.9708-r1.ebuild | 60 ---------------------- games-misc/fortune-mod/fortune-mod-1.99.1.ebuild | 8 +-- 5 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 games-misc/fortune-mod/files/9708-Makefile.patch delete mode 100644 games-misc/fortune-mod/files/9708-ppc-rot.patch delete mode 100644 games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1 delete mode 100644 games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild (limited to 'games-misc') diff --git a/games-misc/fortune-mod/files/9708-Makefile.patch b/games-misc/fortune-mod/files/9708-Makefile.patch deleted file mode 100644 index a49e9424307c..000000000000 --- a/games-misc/fortune-mod/files/9708-Makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- Makefile.orig 2003-06-28 01:37:38.000000000 -0400 -+++ Makefile 2003-06-28 01:39:44.000000000 -0400 -@@ -3,24 +3,24 @@ - # - - # Where does the fortune program go? --FORTDIR=/usr/local/games -+FORTDIR=$(DESTDIR)/usr/bin - # Where do the data files (fortunes, or cookies) go? --COOKIEDIR=/usr/local/share/games/fortunes -+COOKIEDIR=$(DESTDIR)/usr/share/fortune - # Offensive ones? - OCOOKIEDIR=$(COOKIEDIR)/off - # The ones with html tags? - WCOOKIEDIR=$(COOKIEDIR)/html - # Where do strfile and unstr go? --BINDIR=/usr/local/bin -+BINDIR=$(DESTDIR)/usr/bin - # What is the proper mode for strfile and unstr? 755= everyone, 700= root only - BINMODE=0755 - #BINMODE=0700 - # Where do the man pages for strfile and unstr go? --BINMANDIR=/usr/local/man/man1 -+BINMANDIR=$(DESTDIR)/usr/share/man/man1 - # What is their proper extension? - BINMANEXT=1 - # And the same for the fortune man page --FORTMANDIR=/usr/local/man/man6 -+FORTMANDIR=$(DESTDIR)/usr/share/man/man6 - FORTMANEXT=6 - # Do we want to install the offensive files? (0 no, 1 yes) - OFFENSIVE=1 -@@ -55,7 +55,7 @@ - REGEXLIBS= - - DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" --CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -+CFLAGS= $(DEFINES) $(OPTCFLAGS) - LDFLAGS=-s - - # The above flags are used by default; the debug flags are used when make diff --git a/games-misc/fortune-mod/files/9708-ppc-rot.patch b/games-misc/fortune-mod/files/9708-ppc-rot.patch deleted file mode 100644 index c22863203faa..000000000000 --- a/games-misc/fortune-mod/files/9708-ppc-rot.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util/rot.c.orig 2003-06-28 01:45:44.000000000 -0400 -+++ util/rot.c 2003-06-28 01:45:51.000000000 -0400 -@@ -8,7 +8,7 @@ - - int main(void) - { -- char a, b; -+ short int a, b; - - while ((a = getchar()) != EOF) - { diff --git a/games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1 b/games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1 deleted file mode 100644 index 679b925ad361..000000000000 --- a/games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 81a87a44f9d94b0809dfc2b7b140a379 fortune-mod-9708.tar.gz 1408517 diff --git a/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild b/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild deleted file mode 100644 index e032a7688bbd..000000000000 --- a/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild,v 1.5 2004/07/01 11:19:52 eradicator Exp $ - -inherit eutils - -MY_P="${PN}-${P##*.}" -#The original (http://www.progsoc.uts.edu.au/~dbugger/hacks/hacks.html) is dead -# but the guy setup his 'perm' home with LSM (http://lsm.execpc.com/) -DESCRIPTION="The notorious fortune program" -HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/games/amusements/fortune/" -SRC_URI="http://www.ibiblio.org/pub/Linux/games/amusements/fortune/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha hppa amd64" -IUSE="offensive" - -DEPEND="virtual/libc" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - einfo "By default the fortune ebuild does not include 'offensive' fortunes." - einfo "If you wish to enable this functionality, you must add the 'offensive' local" - einfo "USE flag to your make.conf." -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch "${FILESDIR}/9708-Makefile.patch" - epatch "${FILESDIR}/9708-ppc-rot.patch" -} - -src_compile() { - local off=0 - - use offensive && off=1 - emake \ - OFFENSIVE=${off} \ - OPTCFLAGS="${CFLAGS}" \ - || die "emake failed" -} - -src_install() { - local off=0 - - use offensive && off=1 - make \ - OFFENSIVE=${off} \ - OPTCFLAGS="${CFLAGS}" \ - DESTDIR="${D}" \ - install \ - || die "make install failed" - - dosed /usr/share/man/man6/fortune.6 - - dodoc ChangeLog INDEX INSTALL Notes README TODO -} diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild index a52a4375ed13..c0488bc7b06f 100644 --- a/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild +++ b/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild,v 1.12 2004/09/24 04:04:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild,v 1.13 2005/01/29 05:20:52 vapier Exp $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="The notorious fortune program" HOMEPAGE="http://www.redellipse.net/code/fortune" @@ -45,7 +45,9 @@ src_unpack() { src_compile() { emake \ + CC=$(tc-getCC) \ E_CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ OFFENSIVE="${off}" \ || die "emake failed" } -- cgit v1.2.3-65-gdbad