public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2011-08-14 10:30 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-08-14 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     930ad3eb3ef9b0fe0f2a732f85485d4f71810bfd
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 15:18:59 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 15:18:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=930ad3eb

added metadata.xml

(Portage version: 2.2.0_alpha46/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 app-benchmarks/i7z/ChangeLog               |   14 +++++++
 app-benchmarks/i7z/files/9999-gentoo.patch |   56 ++++++++++++++++++++++++++++
 app-benchmarks/i7z/i7z-9999.ebuild         |   41 ++++++++++++++++++++
 app-benchmarks/i7z/metadata.xml            |    8 ++++
 4 files changed, 119 insertions(+), 0 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
new file mode 100644
index 0000000..30bba38
--- /dev/null
+++ b/app-benchmarks/i7z/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for app-benchmarks/i7z
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  22 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/9999-gentoo.patch,
+  +i7z-9999.ebuild, +metadata.xml:
+  added metadata.xml
+
+*i7z-9999 (22 Jul 2011)
+
+  22 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/9999-gentoo.patch,
+  +i7z-9999.ebuild:
+  Added live version
+

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
new file mode 100644
index 0000000..345fe50
--- /dev/null
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index fc4d262..e2347bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,18 +17,18 @@
+ 
+ #makefile updated from patch by anestling
+ 
+-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
++CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
+ 
+ LBITS := $(shell getconf LONG_BIT)
+ ifeq ($(LBITS),64)
+-   CFLAGS = $(CFLAGSANY) -Dx64_BIT
++   CFLAGS += -Dx64_BIT
+ else
+-   CFLAGS = $(CFLAGSANY) -Dx86
++   CFLAGS += -Dx86
+ endif
+ 
+-CC       = gcc 
++CC       ?= gcc
+ 
+-LDFLAGS  = -lncurses -lpthread
++LIBS  = -lncurses -lpthread
+ INCLUDEFLAGS = 
+ 
+ OBJS = helper_functions
+@@ -36,15 +36,15 @@ OBJS = helper_functions
+ BIN	= i7z
+ SRC	= i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c
+ 
+-sbindir = /usr/sbin
++sbindir = $(DESTDIR)/usr/sbin
+ 
+-all: clean message bin
++all: clean bin
+ 
+ message:
+ 	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
+ 
+ bin:
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o $(BIN)
+@@ -52,6 +52,6 @@ clean:
+ distclean: clean
+ 	rm -f *~ \#*
+ 
+-install: all
+-	install -m 755 $(BIN) $(sbindir)
++install:
++	install -D -m 755 $(BIN) $(sbindir)/$(BIN)
+ 

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
new file mode 100644
index 0000000..1819372
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.3 2011/04/27 07:45:55 jlec Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2 subversion toolchain-funcs
+
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="http://code.google.com/p/i7z/"
+SRC_URI=""
+ESVN_REPO_URI="http://i7z.googlecode.com/svn/trunk"
+
+SLOT="0"
+KEYWORDS=""
+LICENSE="GPL-2"
+IUSE="X"
+
+RDEPEND="
+	sys-libs/ncurses
+	X? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	tc-export CC
+}
+
+src_compile() {
+	default
+	if use X; then
+		cd GUI
+		eqmake4 GUI.pro && emake
+	fi
+}
+
+src_install() {
+	default
+	use X && newsbin GUI/GUI i7z_GUI
+	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
+}

diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
new file mode 100644
index 0000000..5e10119
--- /dev/null
+++ b/app-benchmarks/i7z/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2011-08-14 10:30 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-08-14 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c054e62c9064d28f3ed0ad8111404a89edfd5ba2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 10:29:50 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 10:29:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=c054e62c

Adopted to current HEAD

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 app-benchmarks/i7z/ChangeLog               |    3 +++
 app-benchmarks/i7z/files/9999-gentoo.patch |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 30bba38..1eda3cd 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Aug 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch:
+  Adopted to current HEAD
+
   22 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/9999-gentoo.patch,
   +i7z-9999.ebuild, +metadata.xml:
   added metadata.xml

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index 345fe50..fe65a16 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -21,8 +21,8 @@ index fc4d262..e2347bf 100644
 -CC       = gcc 
 +CC       ?= gcc
  
--LDFLAGS  = -lncurses -lpthread
-+LIBS  = -lncurses -lpthread
+-LDFLAGS  = -lncurses -lpthread -lrt
++LIBS  = -lncurses -lpthread -lrt
  INCLUDEFLAGS = 
  
  OBJS = helper_functions



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2011-12-04  8:54 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-12-04  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     1b0da65340233e9d46a151ca001341c734d5085e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 08:53:41 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 08:53:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=1b0da653

Adopted to changes in HEAD

(Portage version: 2.2.0_alpha79/git/Linux x86_64, unsigned Manifest commit)

---
 app-benchmarks/i7z/ChangeLog               |    3 +++
 app-benchmarks/i7z/files/9999-gentoo.patch |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 6460bda..a1a8101 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch:
+  Adopted to changes in HEAD
+
   27 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index fe65a16..e096ce2 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -40,7 +40,7 @@ index fc4d262..e2347bf 100644
  	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
  
  bin:
--	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN)
+-	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
  
  clean:



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2011-12-28 22:40 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-12-28 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bad88660641ac8a5937dc4212e3e6fd2fc285a7f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 22:37:27 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 22:37:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=bad88660

Fix for current HEAD

(Portage version: 2.2.0_alpha83/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 app-benchmarks/i7z/ChangeLog               |    4 ++++
 app-benchmarks/i7z/files/9999-gentoo.patch |   25 ++++++++++++++-----------
 app-benchmarks/i7z/i7z-9999.ebuild         |    7 ++++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index a1a8101..119c19e 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
+  i7z-9999.ebuild:
+  Fix for current HEAD
+
   04 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch:
   Adopted to changes in HEAD
 

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index e096ce2..f50f7c9 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -1,13 +1,16 @@
+ Makefile |   21 ++++++++++-----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
 diff --git a/Makefile b/Makefile
-index fc4d262..e2347bf 100644
+index df50bde..a8da026 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -17,18 +17,18 @@
  
  #makefile updated from patch by anestling
  
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
-+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
+-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
++CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
  
  LBITS := $(shell getconf LONG_BIT)
  ifeq ($(LBITS),64)
@@ -19,7 +22,7 @@ index fc4d262..e2347bf 100644
  endif
  
 -CC       = gcc 
-+CC       ?= gcc
++CC       ?= gcc 
  
 -LDFLAGS  = -lncurses -lpthread -lrt
 +LIBS  = -lncurses -lpthread -lrt
@@ -33,24 +36,24 @@ index fc4d262..e2347bf 100644
 -sbindir = /usr/sbin
 +sbindir = $(DESTDIR)/usr/sbin
  
--all: clean message bin
-+all: clean bin
+-all: clean message bin test_exist
++all: bin
  
  message:
  	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
  
- bin:
+ bin: 
 -	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
  
- clean:
- 	rm -f *.o $(BIN)
-@@ -52,6 +52,6 @@ clean:
+ test_exist:
+ 	@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed'
+@@ -55,6 +55,5 @@ clean:
  distclean: clean
  	rm -f *~ \#*
  
 -install: all
 -	install -m 755 $(BIN) $(sbindir)
+-
 +install:
 +	install -D -m 755 $(BIN) $(sbindir)/$(BIN)
- 

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 1819372..40bf095 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils qt4-r2 subversion toolchain-funcs
+inherit eutils flag-o-matic qt4-r2 subversion toolchain-funcs
 
 DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
 HOMEPAGE="http://code.google.com/p/i7z/"
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	replace-flags -O? -O0
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	tc-export CC
 }
@@ -30,12 +31,12 @@ src_compile() {
 	default
 	if use X; then
 		cd GUI
-		eqmake4 GUI.pro && emake
+		eqmake4 ${PN}_GUI.pro && emake clean && emake
 	fi
 }
 
 src_install() {
 	default
-	use X && newsbin GUI/GUI i7z_GUI
+	use X && dosbin GUI/i7z_GUI
 	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
 }



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2011-12-31 12:39 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-12-31 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5f3036bbe4df6f0ea7601bd3ff9a39b49131f7aa
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 12:39:19 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 12:39:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=5f3036bb

app-benchmarks/i7z: Adopt to HEAD and include patch from http://code.google.com/p/i7z/issues/detail?id=44

(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 app-benchmarks/i7z/ChangeLog               |    5 +++
 app-benchmarks/i7z/files/9999-gentoo.patch |   51 ++++++++++++++++------------
 app-benchmarks/i7z/i7z-9999.ebuild         |    2 -
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 119c19e..d940882 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
+  i7z-9999.ebuild:
+  Adopt to HEAD and include patch from
+  http://code.google.com/p/i7z/issues/detail?id=44
+
   28 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
   i7z-9999.ebuild:
   Fix for current HEAD

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index f50f7c9..63bbacf 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -1,16 +1,14 @@
- Makefile |   21 ++++++++++-----------
- 1 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index df50bde..a8da026 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,18 +17,18 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 81)
++++ Makefile	(working copy)
+@@ -19,36 +19,40 @@
  
- #makefile updated from patch by anestling
- 
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
+ #explicitly disable two scheduling flags as they cause segfaults
+ CFLAGS_FOR_AVOIDING_SEG_FAULT = -fno-schedule-insns2  -fno-schedule-insns
+-CFLAGSANY = $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -O0 -g  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN
++CFLAGS ?= -O0 -g
++CFLAGS += $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN
  
  LBITS := $(shell getconf LONG_BIT)
  ifeq ($(LBITS),64)
@@ -25,35 +23,44 @@ index df50bde..a8da026 100644
 +CC       ?= gcc 
  
 -LDFLAGS  = -lncurses -lpthread -lrt
-+LIBS  = -lncurses -lpthread -lrt
++LIBS  += -lncurses -lpthread -lrt
  INCLUDEFLAGS = 
  
  OBJS = helper_functions
-@@ -36,15 +36,15 @@ OBJS = helper_functions
+ 
  BIN	= i7z
  SRC	= i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c
++OBJ	= $(SRC:.c=.o)
  
 -sbindir = /usr/sbin
-+sbindir = $(DESTDIR)/usr/sbin
++prefix = /usr
++sbindir = $(prefix)/sbin
++docdir = $(prefix)/share/doc/$(BIN)
  
 -all: clean message bin test_exist
-+all: bin
++all: test_exist
  
  message:
  	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
  
- bin: 
+-bin: 
 -	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
++bin: message $(OBJ)
++	$(CC) $(LDFLAGS) -o $(BIN) $(OBJ) $(LIBS)
  
- test_exist:
+-test_exist:
++test_exist: bin
  	@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed'
-@@ -55,6 +55,5 @@ clean:
+ 
+ clean:
+@@ -57,6 +61,7 @@
  distclean: clean
  	rm -f *~ \#*
  
 -install: all
 -	install -m 755 $(BIN) $(sbindir)
 -
-+install:
-+	install -D -m 755 $(BIN) $(sbindir)/$(BIN)
++install: $(BIN)
++	install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(docdir)
++	install -m 755 $(BIN) $(DESTDIR)$(sbindir)
++	install -m 0644 README.txt put_cores_offline.sh put_cores_online.sh MAKEDEV-cpuid-msr $(DESTDIR)$(docdir)

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 40bf095..4b9a2e2 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	replace-flags -O? -O0
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	tc-export CC
 }
@@ -38,5 +37,4 @@ src_compile() {
 src_install() {
 	default
 	use X && dosbin GUI/i7z_GUI
-	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
 }



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2013-06-02  8:07 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2013-06-02  8:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b89ad474559d98953346467cd0f32d37d1283d78
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 08:07:18 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 08:07:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=b89ad474

app-benchmarks/i7z: Add fix for tinfo

Package-Manager: portage-2.2.0_alpha177

---
 app-benchmarks/i7z/ChangeLog                    | 14 +++++++++++++-
 app-benchmarks/i7z/files/i7z-9999-ncurses.patch | 22 ++++++++++++++++++++++
 app-benchmarks/i7z/i7z-9999.ebuild              |  3 ++-
 app-benchmarks/i7z/metadata.xml                 |  6 +++---
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 1828336..82c73da 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -1,7 +1,19 @@
 # ChangeLog for app-benchmarks/i7z
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jun 2013; Justin Lecher <jlec@gentoo.org> i7z-9999.ebuild,
+  +files/i7z-9999-ncurses.patch, metadata.xml:
+  Add fix for tinfo
+
+  02 Jun 2013; Justin Lecher <jlec@gentoo.org> i7z-9999.ebuild,
+  +files/i7z-9999-ncurses.patch, metadata.xml:
+  Add fix for tinfo
+
+  02 Jun 2013; Justin Lecher <jlec@gentoo.org> i7z-9999.ebuild,
+  +files/i7z-9999-ncurses.patch, metadata.xml:
+  Add fix for tinfo
+
   31 Oct 2012; Justin Lecher <jlec@gentoo.org> i7z-9999.ebuild:
   Import tree changes
 

diff --git a/app-benchmarks/i7z/files/i7z-9999-ncurses.patch b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
new file mode 100644
index 0000000..2d0a5a1
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
@@ -0,0 +1,22 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 109)
++++ Makefile	(working copy)
+@@ -19,7 +19,7 @@
+ 
+ CC       ?= gcc
+ 
+-LIBS  += -lncurses -lpthread -lrt -lm
++LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
+ INCLUDEFLAGS = 
+ 
+ BIN	= i7z
+@@ -42,7 +42,7 @@
+ 
+ #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
+ static-bin: message $(OBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
+ 
+ # perfmon-bin: message $(OBJ)
+ # 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS)

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 6ca98ee..7dacdaa 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.3 2011/04/27 07:45:55 jlec Exp $
 
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-ncurses.patch
 	tc-export CC
 }
 

diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
index cc3fe24..a759be0 100644
--- a/app-benchmarks/i7z/metadata.xml
+++ b/app-benchmarks/i7z/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-wanted@gentoo.org</email>
-	</maintainer>
+  <maintainer>
+    <email>maintainer-wanted@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2019-12-19 18:31 Sebastian Pipping
  0 siblings, 0 replies; 7+ messages in thread
From: Sebastian Pipping @ 2019-12-19 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     3c45ff83ed4e23744f5f323ac999bebd6521952b
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 17:57:52 2019 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 18:30:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=3c45ff83

app-benchmarks/i7z: qmake-utils EAPI=5 unsupported bandaid

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 app-benchmarks/i7z/files/i7z-9999-ncurses.patch |  4 ++--
 app-benchmarks/i7z/i7z-9999.ebuild              | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app-benchmarks/i7z/files/i7z-9999-ncurses.patch b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
index 2d0a5a1..72695a9 100644
--- a/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
+++ b/app-benchmarks/i7z/files/i7z-9999-ncurses.patch
@@ -1,7 +1,7 @@
 Index: Makefile
 ===================================================================
---- Makefile	(revision 109)
-+++ Makefile	(working copy)
+--- a/Makefile	(revision 109)
++++ b/Makefile	(working copy)
 @@ -19,7 +19,7 @@
  
  CC       ?= gcc

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 8dc4760..1faeb37 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic git-r3 qmake-utils toolchain-funcs
 
@@ -21,19 +21,20 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ncurses.patch
+	eapply "${FILESDIR}"/${P}-ncurses.patch
 	tc-export CC
+	eapply_user
 }
 
 src_compile() {
 	default
-	if use X; then
-		cd GUI
-		eqmake4 ${PN}_GUI.pro && emake clean && emake
-	fi
+#	if use X; then
+#		cd GUI
+#		eqmake4 ${PN}_GUI.pro && emake clean && emake
+#	fi
 }
 
 src_install() {
 	emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
-	use X && dosbin GUI/i7z_GUI
+#	use X && dosbin GUI/i7z_GUI
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-12-19 18:31 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-04  8:54 [gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2019-12-19 18:31 Sebastian Pipping
2013-06-02  8:07 Justin Lecher
2011-12-31 12:39 Justin Lecher
2011-12-28 22:40 Justin Lecher
2011-08-14 10:30 Justin Lecher
2011-08-14 10:30 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox