Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
Date: Sun, 02 Jun 2013 08:07:38
Message-Id: 1370160445.b89ad474559d98953346467cd0f32d37d1283d78.jlec@gentoo
1 commit: b89ad474559d98953346467cd0f32d37d1283d78
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 08:07:18 2013 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 08:07:25 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=b89ad474
7
8 app-benchmarks/i7z: Add fix for tinfo
9
10 Package-Manager: portage-2.2.0_alpha177
11
12 ---
13 app-benchmarks/i7z/ChangeLog | 14 +++++++++++++-
14 app-benchmarks/i7z/files/i7z-9999-ncurses.patch | 22 ++++++++++++++++++++++
15 app-benchmarks/i7z/i7z-9999.ebuild | 3 ++-
16 app-benchmarks/i7z/metadata.xml | 6 +++---
17 4 files changed, 40 insertions(+), 5 deletions(-)
18
19 diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
20 index 1828336..82c73da 100644
21 --- a/app-benchmarks/i7z/ChangeLog
22 +++ b/app-benchmarks/i7z/ChangeLog
23 @@ -1,7 +1,19 @@
24 # ChangeLog for app-benchmarks/i7z
25 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
26 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 # $Header: $
28
29 + 02 Jun 2013; Justin Lecher <jlec@g.o> i7z-9999.ebuild,
30 + +files/i7z-9999-ncurses.patch, metadata.xml:
31 + Add fix for tinfo
32 +
33 + 02 Jun 2013; Justin Lecher <jlec@g.o> i7z-9999.ebuild,
34 + +files/i7z-9999-ncurses.patch, metadata.xml:
35 + Add fix for tinfo
36 +
37 + 02 Jun 2013; Justin Lecher <jlec@g.o> i7z-9999.ebuild,
38 + +files/i7z-9999-ncurses.patch, metadata.xml:
39 + Add fix for tinfo
40 +
41 31 Oct 2012; Justin Lecher <jlec@g.o> i7z-9999.ebuild:
42 Import tree changes
43
44
45 diff --git a/app-benchmarks/i7z/files/i7z-9999-ncurses.patch b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
46 new file mode 100644
47 index 0000000..2d0a5a1
48 --- /dev/null
49 +++ b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
50 @@ -0,0 +1,22 @@
51 +Index: Makefile
52 +===================================================================
53 +--- Makefile (revision 109)
54 ++++ Makefile (working copy)
55 +@@ -19,7 +19,7 @@
56 +
57 + CC ?= gcc
58 +
59 +-LIBS += -lncurses -lpthread -lrt -lm
60 ++LIBS += `pkg-config --libs ncurses` -lpthread -lrt -lm
61 + INCLUDEFLAGS =
62 +
63 + BIN = i7z
64 +@@ -42,7 +42,7 @@
65 +
66 + #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
67 + static-bin: message $(OBJ)
68 +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
69 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
70 +
71 + # perfmon-bin: message $(OBJ)
72 + # $(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS)
73
74 diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
75 index 6ca98ee..7dacdaa 100644
76 --- a/app-benchmarks/i7z/i7z-9999.ebuild
77 +++ b/app-benchmarks/i7z/i7z-9999.ebuild
78 @@ -1,4 +1,4 @@
79 -# Copyright 1999-2012 Gentoo Foundation
80 +# Copyright 1999-2013 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 # $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.3 2011/04/27 07:45:55 jlec Exp $
83
84 @@ -22,6 +22,7 @@ RDEPEND="
85 DEPEND="${RDEPEND}"
86
87 src_prepare() {
88 + epatch "${FILESDIR}"/${P}-ncurses.patch
89 tc-export CC
90 }
91
92
93 diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
94 index cc3fe24..a759be0 100644
95 --- a/app-benchmarks/i7z/metadata.xml
96 +++ b/app-benchmarks/i7z/metadata.xml
97 @@ -1,7 +1,7 @@
98 <?xml version="1.0" encoding="UTF-8"?>
99 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
100 <pkgmetadata>
101 - <maintainer>
102 - <email>maintainer-wanted@g.o</email>
103 - </maintainer>
104 + <maintainer>
105 + <email>maintainer-wanted@g.o</email>
106 + </maintainer>
107 </pkgmetadata>