summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-21 12:05:40 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-21 12:05:40 +0000
commitf7efadb69f8455f99ee5fee21b036d51d420103f (patch)
tree645ff7237a225addc5960cd5f7ff9a3ab3268345 /dev-lang/lisaac
parentx11-plugins/wmstickynotes: Add underlinking fix, #369205 (diff)
downloadgentoo-2-f7efadb69f8455f99ee5fee21b036d51d420103f.tar.gz
gentoo-2-f7efadb69f8455f99ee5fee21b036d51d420103f.tar.bz2
gentoo-2-f7efadb69f8455f99ee5fee21b036d51d420103f.zip
dev-lang/lisaac: Respect *FLAGS, #342135
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/lisaac')
-rw-r--r--dev-lang/lisaac/ChangeLog8
-rw-r--r--dev-lang/lisaac/files/lisaac-0.13.1-makefile.patch32
-rw-r--r--dev-lang/lisaac/lisaac-0.13.1-r2.ebuild (renamed from dev-lang/lisaac/lisaac-0.13.1-r1.ebuild)3
3 files changed, 36 insertions, 7 deletions
diff --git a/dev-lang/lisaac/ChangeLog b/dev-lang/lisaac/ChangeLog
index 621c4bbbdb93..97a5e1dcc5cf 100644
--- a/dev-lang/lisaac/ChangeLog
+++ b/dev-lang/lisaac/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/lisaac
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lisaac/ChangeLog,v 1.8 2012/05/10 15:44:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lisaac/ChangeLog,v 1.9 2012/06/21 12:05:40 jlec Exp $
+
+*lisaac-0.13.1-r2 (21 Jun 2012)
+
+ 21 Jun 2012; Justin Lecher <jlec@gentoo.org> -lisaac-0.13.1-r1.ebuild,
+ +lisaac-0.13.1-r2.ebuild, files/lisaac-0.13.1-makefile.patch:
+ Respect *FLAGS, #342135
10 May 2012; Agostino Sarubbo <ago@gentoo.org> -lisaac-0.13.1.ebuild:
Remove old
diff --git a/dev-lang/lisaac/files/lisaac-0.13.1-makefile.patch b/dev-lang/lisaac/files/lisaac-0.13.1-makefile.patch
index 77563ce90e0f..bd690f467dd4 100644
--- a/dev-lang/lisaac/files/lisaac-0.13.1-makefile.patch
+++ b/dev-lang/lisaac/files/lisaac-0.13.1-makefile.patch
@@ -1,11 +1,33 @@
---- Makefile.orig 2008-10-13 11:25:21.000000000 +0200
-+++ Makefile 2008-10-13 11:26:08.000000000 +0200
-@@ -59,7 +59,7 @@
+ Makefile | 11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 76e6403..9875e36 100644
+--- a/Makefile
++++ b/Makefile
+@@ -59,20 +59,19 @@ EXAMPLE=/examples
HTML=/html
BIN=/usr/bin
MAN=/usr/share/man/man1
-DOC=/usr/share/doc/lisaac
+DOC=${DOC:=/usr/share/doc/lisaac}
DESTDIR=
- CC=gcc
- CFLAGS=-O2
+-CC=gcc
+-CFLAGS=-O2
++CC ?=gcc
+
+ all: bin/lisaac.c bin/shorter.c
+ @echo "#define LISAAC_DIRECTORY \"$(DESTDIR)$(LIB)\"" > bin/path.h
+- $(CC) $(CFLAGS) bin/lisaac.c -o bin/lisaac
+- $(CC) $(CFLAGS) bin/shorter.c -o bin/shorter
++ $(CC) $(CFLAGS) $(LDFLAGS) bin/lisaac.c -o bin/lisaac
++ $(CC) $(CFLAGS) $(LDFLAGS) bin/shorter.c -o bin/shorter
+
+ interactive_userland: install_lisaac.c
+ @echo - Lisaac compiler installation For Unix / Linux / Windows -
+ @echo Please wait...
+- $(CC) $(CFLAGS) install_lisaac.c -o install_lisaac
++ $(CC) $(CFLAGS) $(LDFLAGS) install_lisaac.c -o install_lisaac
+ @echo - please run ./install_lisaac to finish the installation
+
+ install:
diff --git a/dev-lang/lisaac/lisaac-0.13.1-r1.ebuild b/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild
index fdf644674599..04ba77b82b84 100644
--- a/dev-lang/lisaac/lisaac-0.13.1-r1.ebuild
+++ b/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lisaac/lisaac-0.13.1-r1.ebuild,v 1.2 2012/02/13 04:49:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lisaac/lisaac-0.13.1-r2.ebuild,v 1.1 2012/06/21 12:05:40 jlec Exp $
EAPI="4"
inherit versionator elisp-common eutils
@@ -23,6 +23,7 @@ SITEFILE=50${PN}-gentoo.el
src_prepare(){
epatch "${FILESDIR}/${P}-makefile.patch"
+ rm lib/number/essai
}
src_compile(){