Version bump. Update to EAPI 4 and conditionally install desktop file.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 132 insertions, 5 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 388f8c28a96f..745f094db687 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/nut
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.23 2011/05/31 20:50:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.24 2011/06/06 22:00:01 radhermit Exp $
+
+*nut-16.12 (06 Jun 2011)
+
+  06 Jun 2011; Tim Harder <radhermit@gentoo.org> +nut-16.12.ebuild,
+  +files/nut-16.12-makefile.patch:
+  Version bump. Update to EAPI 4 and conditionally install desktop file.
 
   31 May 2011; Markus Meier <maekke@gentoo.org> nut-16.9.ebuild:
   x86 stable, bug #368271
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index b64a5123e507..d091ccf9a2a2 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -2,22 +2,29 @@
 Hash: SHA1
 
 AUX nut-14.1-build-fixes.patch 400 RMD160 dd3a66304053c04b1aab9b69aef73c7132e7f44c SHA1 e3c000c1a34104b8c0d263f35e8135fe6005fb7e SHA256 cd6a6b3dce8bb9caf7281a9c04b410e7373d8c95ac822c7696d577a624f10002
+AUX nut-16.12-makefile.patch 1643 RMD160 0fb7d388e5441c2acc0da37cc0754482ef1ae94f SHA1 5eee2e43ccd710da3dd47c101215bd35293eec12 SHA256 7db652a27c038ad3608d6352bb4ee1098f0a6bcf8f4ff700ed43e76bce65bbb9
 AUX nut-16.5-build-fixes.patch 1512 RMD160 ecaed7a6f641b28f15366a4b1f5c5a7f36cb2ce5 SHA1 54603045464fe290d5020c5da3bc95d2c19f7449 SHA256 daddb486d989ed4fa656ea85e170212b4f25bbdcf05c8d1242b2f3376ce1aa5f
 AUX nut-16.5-int.patch 3051 RMD160 97acad44b7b6a6f6cb9e490e6006910402bac7f1 SHA1 15e5624533fc971e8862b65e4357d0bd5f0e02ff SHA256 5f71264fa46d225ba0e561c03eb715832c7d7c701c1d8fc42e5d99223d758464
 DIST nut-14.1.tar.gz 1160598 RMD160 9b3b27e1a36f4d181e3c16609fda5bb3c8f43376 SHA1 954fd52c37be5ebe8e7b98deb1c449aa0f99d916 SHA256 b69e0f440aadd7cccdad4dbaffc0ef3cf15597270b4fc21bb065cbb61f2e3387
 DIST nut-16.11.tar.gz 1264945 RMD160 73ad80666323c570800bda353d9f9b4be916690d SHA1 8d46e0be798a46cbb4668d310ca33c172d3279a1 SHA256 c33bc5dfcc67f70cdea4b6a0237beaed846afb6dc95299304d6ec549a9490eba
+DIST nut-16.12.tar.gz 1262771 RMD160 90d29effe19de2c070249d5a883d30d364f90893 SHA1 b10fbc64d9fa7d5ff2aae6353ae3f9448ef594de SHA256 cf6185dcab2aedab3b7b847d89c933e5b182466d50728cce9a8246192f71a556
 DIST nut-16.5.tar.gz 1270063 RMD160 7f2bc03f14bcea20cdc7c64209e7ac20cfc94741 SHA1 d694d2d7b9a5de71f0f802ec704582cf243bf777 SHA256 525448b9aa26fd4682134b35556297820b75c77be21de56d68ad137adb364782
 DIST nut-16.9.tar.gz 1267995 RMD160 c0f0556f325f4e94ca386fbfd4142af888c489dc SHA1 6ccc77784519bda5cfbdcfcad70ba58652a31366 SHA256 901dd52a7e488af03837c9c7a17cd1eddbaa54f485a097a165c2ff01a9c22f97
 EBUILD nut-14.1.ebuild 807 RMD160 7b6865a3820972a1a5b84b13cebebe1c9427f2d4 SHA1 dfff4cfabb31db46f727ac310838c84eb3542732 SHA256 f180b3dddf430aeeb6390c9a4f68d5957e2c7a66161b31664e4dc7338fc9f73c
 EBUILD nut-16.11.ebuild 962 RMD160 f20219293462c116e439dc7ec01a2b66f19e6da4 SHA1 f54a2ff724eab15c0c3eb85e5164f21a678b8b39 SHA256 4b8c519f79aafb5709108ad9c218e03d953a5c0b570846e20039a9b8b8c251ba
+EBUILD nut-16.12.ebuild 942 RMD160 58254d91696c23b7bbc488a111ebaad756eab6ce SHA1 4be5a59ac601e01b1560fd009743a3c31335bac7 SHA256 f269548183888314eb86383f56e7826eac5490d412ce3af39ea12eb727c30777
 EBUILD nut-16.5.ebuild 989 RMD160 6f79608fdd69fff4e2a5284dbf001a6acd93d8f5 SHA1 ee8a711ffac62dc2c31194722b0fcb5b1047d4fa SHA256 2d95a26f5305c8486464eff785d45ae13c846b1a0543c5451b77943929cb406e
 EBUILD nut-16.9.ebuild 963 RMD160 8c04d0791901a8aa884155e9199c9ea3c60fd231 SHA1 986304f385cffba15163a9aaf37f6813a2e9ac6d SHA256 ceab1844bbb5a67b59e5885b44925e14aa9f6eebf6a7cc6528d1fd1582de9a6d
-MISC ChangeLog 3372 RMD160 0c217cce3985ec1e42d1b3e58f8d8a24c4b56c67 SHA1 9a43144b336fe790eeab1e6c011d7c60076e8a46 SHA256 fe1fa122bcf24dfd3fc86c9b1c4548e7e4d8fc3077bbe5b660715e467b3e2700
+MISC ChangeLog 3578 RMD160 e82932bbb4d2c3f8fbd02d2fa925e6727d1bbd1b SHA1 b04f7722a3955377ef78893fe6f4c1c89d2a1d69 SHA256 7edfa84adca07b1d83dbbd850cb760d1b8bdac82f5e677d7597dd5e80aea03c6
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3lVIgACgkQkKaRLQcq0GJATACZAU1Hw95Ai5+h/qpSL026dqse
-wnEAnj9CnbssmKjFZpKr57gwBW+EyXnD
-=hoGv
+iQEcBAEBAgAGBQJN7U34AAoJEEqz6FtPBkyj3NsH/3nXtOllUgaF23omgxIPXOjn
+I6vR0XefeCstr4lMYyY2Gt63Q/wFMW3cutGB9jnbzsYlgxsiveCpEUqI5Hny/5y4
+JFWGP6xi5++TumIdVg5YaQ2MwTfaHvmh7b/zSdunt8VYC5GU8qAQsDYnSFlzhwAe
+3tswklgcBzx+7M5PhqKDC/tSCXZCD0yOtFy2SqQ13T5kEL7bl4vLAOb8XUzfIyxe
+PLri8+g94l7Iqolm6gCN7ol3zQ+Ua17nmZ9O35uZtaECT+l6o5h7QRfXQJ6jV2fW
+4FDccI10esTnioSRp+pZZqXm0ch40ic2I9K4AjFqLQyULi6vCT5zOvig8JxuAYQ=
+=Ovec
 -----END PGP SIGNATURE-----
diff --git a/app-misc/nut/files/nut-16.12-makefile.patch b/app-misc/nut/files/nut-16.12-makefile.patch
new file mode 100644
index 000000000000..90fac0b32555
--- /dev/null
+++ b/app-misc/nut/files/nut-16.12-makefile.patch
@@ -0,0 +1,71 @@
+--- nut-16.12.orig//fltk/Makefile
++++ nut-16.12/fltk/Makefile
+@@ -16,7 +16,7 @@
+ CXX = g++
+ endif
+ 
+-CFLAGS := -I.. `fltk-config --optim --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ 
+ ifeq ($(CXX),g++)
+ CFLAGS += -Wall -fno-inline -ansi
+@@ -28,7 +28,7 @@
+ OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../recmeal.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
+ 
+ nut:	$(OBJS)
+-	$(CXX) -O -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ deps:
+ 	makedepend -Y. *.h *.cc >/dev/null 2>&1
+--- nut-16.12.orig//Makefile
++++ nut-16.12/Makefile
+@@ -1,4 +1,4 @@
+-prefix = /usr/local
++prefix = /usr
+ libdir = $(prefix)/lib/nut
+ bindir = $(prefix)/bin
+ mandir = $(prefix)/man/man1
+@@ -8,15 +8,6 @@
+ EXECUTABLE := nut
+ LIBS := -lm
+ 
+-FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
+-ifeq ($(FLTK_CONFIG),)
+-HAVE_FLTK = 0
+-FLTK_NUT =
+-else
+-HAVE_FLTK = 1
+-FLTK_NUT = fltk/Nut
+-endif
+-
+ OS := $(shell uname -s)
+ ifeq ($(OS),HP-UX)
+ CC = cc
+@@ -24,7 +15,7 @@
+ CC = gcc
+ endif
+ 
+-CFLAGS := -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ ifeq ($(CC),gcc)
+ CFLAGS += -Wall -fno-inline -ansi
+ endif
+@@ -34,15 +25,10 @@
+ SOURCE := $(wildcard *.c)
+ OBJS := $(patsubst %.c,%.o,$(SOURCE))
+ 
+-all: nut $(FLTK_NUT)
++all: nut
+ 
+ nut:	$(OBJS)
+-	$(CC) -O -o $(EXECUTABLE) $(OBJS) $(LIBS)
+-
+-ifeq ($(HAVE_FLTK),1)
+-$(FLTK_NUT):
+-	-cd fltk; $(MAKE)
+-endif
++	$(CC) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ deps:
+ 	makedepend -Y. *.c >/dev/null 2>&1
diff --git a/app-misc/nut/nut-16.12.ebuild b/app-misc/nut/nut-16.12.ebuild
new file mode 100644
index 000000000000..59fafc0e0767
--- /dev/null
+++ b/app-misc/nut/nut-16.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.12.ebuild,v 1.1 2011/06/06 22:00:01 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
+	if use X ; then
+		cd fltk
+		emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/nut
+	doins raw.data/*
+	dobin nut
+	doman nut.1
+	if use X ; then
+		dobin fltk/Nut
+		doicon nut.xpm
+		make_desktop_entry Nut nut nut Education
+	fi
+}