Version bump.

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

4 files changed, 148 insertions, 5 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 88be72e55792..e1ca418865f1 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/nut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.35 2012/02/27 00:51:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.36 2012/03/13 11:21:10 jer Exp $
+
+*nut-17.5 (13 Mar 2012)
+
+  13 Mar 2012; Jeroen Roovers <jer@gentoo.org> +nut-17.5.ebuild,
+  +files/nut-17.5-makefile.patch:
+  Version bump.
 
 *nut-17.4-r1 (27 Feb 2012)
 
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index 11f4be1c3df9..6ddf97b2fbc6 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 AUX nut-16.12-makefile.patch 1976 RMD160 77eb30ad5b888ae385ef1fb4ca3eb752282d714f SHA1 c7ea6241b736b922fab0358d5016d78e6d794c81 SHA256 4bb9616b7eded6774dbd0290894447ac7d18d22dbaa7ef62c82ec7e392d99aab
+AUX nut-17.5-makefile.patch 2250 RMD160 458417e4b094595884a06ce49b92febd7129de5d SHA1 b61b60651809aaeea30ad04c75d012182981bd45 SHA256 f7220f0d57cb2b42008dd9c5f800981a8377fe03be5e8be3a3077d8a36ca7685
 DIST nut-17.4.tar.gz 1315621 RMD160 d8333e4448cc71b1b4bfb85e6ba1b36d7a2a4b4e SHA1 31e090a01ee182ce24c1703eb79b544f6da1f4ad SHA256 d6b9b12c2b318173a03e9211c3724ba5091516934dc3bd6727a2de21292f9153
+DIST nut-17.5.tar.gz 1315564 RMD160 4d37b8d20db239421e5782279da3f49643316b2a SHA1 bf3f165daad114379e99cefd14bd917065d7efc7 SHA256 a9e11b6192fd572bc3a6b8a9a4a1a96f21db2e68e57fe2c4816cddb96f895292
 EBUILD nut-17.4-r1.ebuild 969 RMD160 5f88d7cb5cb83d98ce88ae331121afa42980834a SHA1 43fb6410968ac43c26731f454d6924d0eb9dc59e SHA256 098f251d39bd913474157b99f115405d029ad20481fcb69502299ad7fb52999d
 EBUILD nut-17.4.ebuild 963 RMD160 c1bf5fa2488a425a295daa677ceb046c36152e8f SHA1 22384b8140b7241e15fa603a738536c2cd5673a3 SHA256 3116d4e49c6c0bcab0d52c4fd299cf175dea778c8f9662a368b29d2ea6750037
-MISC ChangeLog 5085 RMD160 37cbbd94bcd8bd428d94e862c005fc5c2564c096 SHA1 a35bbd2bee1036e75da8fc86dd5faa79cb5c6d1d SHA256 9ca4516a50ef666de34a82c87f1d7f43b2afff23bb6e5d15489722c4dce79823
+EBUILD nut-17.5.ebuild 975 RMD160 9317a6c62c07e629b37f25da4a8878549329f92a SHA1 51880006637f34fb3c257369c23565cb5d78ed62 SHA256 708891eb636c334e3b57d828385e982d1bf7355db0b1bd39eb83bb4f336513a5
+MISC ChangeLog 5226 RMD160 52481aed5fb1f50feab8ec7609703cdbbd37aa95 SHA1 88f9f4753b5ffb2d73acc9d4b5bc89258c7e4f4e SHA256 800872125d1d22c097c74b481f52f569658bdb01bf743af5382682d82e6a87ad
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9K05AACgkQVWmRsqeSphO9oACfaX+om9/h4BaWmmkPx8RS5uL8
-34sAnAl4N1TZACxbTPdKdlv4D8MsNMN6
-=3UyD
+iEYEARECAAYFAk9fLasACgkQVWmRsqeSphMc9gCfRon3s5raGSQRfZpGln48eX2/
+nk8AnA28VGVrXTDG2SrlG9G598/DzZdd
+=1LcQ
 -----END PGP SIGNATURE-----
diff --git a/app-misc/nut/files/nut-17.5-makefile.patch b/app-misc/nut/files/nut-17.5-makefile.patch
new file mode 100644
index 000000000000..0adb492fc764
--- /dev/null
+++ b/app-misc/nut/files/nut-17.5-makefile.patch
@@ -0,0 +1,86 @@
+--- a/Makefile
++++ b/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
+@@ -26,7 +17,7 @@
+ OPT = -O1
+ endif
+ 
+-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ ifeq ($(CC),gcc)
+ CFLAGS += $(OPT) -Wall -fno-inline -ansi
+ endif
+@@ -36,10 +27,10 @@
+ SOURCE := $(wildcard *.c)
+ OBJS := $(patsubst %.c,%.o,$(SOURCE))
+ 
+-all: nut $(FLTK_NUT)
++all: nut
+ 
+ nut:	$(OBJS)
+-	$(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ ifeq ($(HAVE_FLTK),1)
+ $(FLTK_NUT):
+--- a/fltk/Makefile
++++ b/fltk/Makefile
+@@ -5,24 +5,24 @@
+ NUTDIR := \".nutdb\"
+ FOODDIR := \"$(libdir)\"
+ EXECUTABLE := Nut
+-LIBS := `fltk-config --ldstaticflags` -lXpm
++LIBS := $(shell fltk-config --ldflags) -lXpm
+ 
+ OS := $(shell uname -s)
+ ifeq ($(OS),HP-UX)
+ CC = cc
+ CXX = /opt/aCC/bin/aCC
+ OPT = -O
+-LIBS := `fltk-config --ldflags` -lXpm
++LIBS := $(shell fltk-config --ldflags) -lXpm
+ else
+ CC = gcc
+ CXX = g++
+ OPT = -Os
+ endif
+ 
+-CFLAGS := -I.. `fltk-config --optim --cflags` $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS += -I.. $(shell fltk-config --optim --cflags) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+ 
+ ifeq ($(CXX),g++)
+-CFLAGS := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
++CFLAGS := -I.. $(shell fltk-config --optim --cflags) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
+ endif
+ 
+ CXXFLAGS := $(CFLAGS)
+@@ -31,7 +31,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) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CXX) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ deps:
+ 	makedepend -Y.. ../anameal.c ../db.c ../food.c ../meal.c ../options.c ../prtmenu.c ../recmeal.c ../util.c *.cc >/dev/null 2>&1
diff --git a/app-misc/nut/nut-17.5.ebuild b/app-misc/nut/nut-17.5.ebuild
new file mode 100644
index 000000000000..f8249399092c
--- /dev/null
+++ b/app-misc/nut/nut-17.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.5.ebuild,v 1.1 2012/03/13 11:21:10 jer 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="fltk"
+
+RDEPEND="
+	fltk? (
+		x11-libs/fltk:1
+		x11-libs/libXpm
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-17.5-makefile.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
+	if use fltk; 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 fltk; then
+		dobin fltk/Nut
+		doicon nut.xpm
+		make_desktop_entry Nut nut nut Education
+	fi
+}