Version bump.

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

7 files changed, 63 insertions, 220 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 036652994e5d..aba2274b2d36 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,13 @@
 # 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.45 2012/06/07 21:30:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.46 2012/09/05 16:37:54 jer Exp $
+
+*nut-17.12 (05 Sep 2012)
+
+  05 Sep 2012; Jeroen Roovers <jer@gentoo.org> -files/nut-16.12-makefile.patch,
+  -nut-17.5.ebuild, -files/nut-17.5-makefile.patch, +nut-17.12.ebuild,
+  +files/nut-17.12-makefile.patch:
+  Version bump.
 
   07 Jun 2012; Brent Baude <ranger@gentoo.org> nut-17.7.ebuild:
   Marking nut-17.7 ppc for bug 418609
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index 9e7d91c351b4..1dfc72043aaa 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -1,9 +1,18 @@
-AUX nut-16.12-makefile.patch 1976 SHA256 4bb9616b7eded6774dbd0290894447ac7d18d22dbaa7ef62c82ec7e392d99aab SHA512 470b8a0cc2de6bf235e8fd71e1c1cfe6bb1ef1470bafb4d9c0bcf942c6aec10802df309e97060e45d4a1f4ca9c8b50f14045dd1e4f05e0b03e14d5e3857f8fdf WHIRLPOOL 8e6203902ff6baad1424d4b4320dfa2cf9f04d424ab27c332946e4174e418a92475a21c553b6bf218043a98b71965273a452c8fd685746abf862ec6ad5b8a3c9
-AUX nut-17.5-makefile.patch 2250 SHA256 f7220f0d57cb2b42008dd9c5f800981a8377fe03be5e8be3a3077d8a36ca7685 SHA512 06d86f03b9a15fef9e9dfdb95f9a98aec8933daac7c3bab5ffc543e24533e15dd8dc052f3df015c96b53c4e0662f2db7a198cfef7ecc4b935d798820d5fafa27 WHIRLPOOL 6f28c8bbe0ec24274d030f5c0158841b7c36f966f9582944f3871b0c467ad9ba7bb6e13d1a4f7fe6dfac45382f8331961f8cc1c27ae3de4d84e13eef20b931e8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX nut-17.12-makefile.patch 227 SHA256 0e6f8c0adacf1cdf9ebf276208c93ba45226180808e38510483529705e5c9934 SHA512 b8354569645a513e4dcf59d4a642e4e7aac866e25c26da60e2ebf7671829d0e03e9ce753c15ea408a1fe8aff798d1ce601ea0a60b00959c2bf69f8f964a65f57 WHIRLPOOL 1de7d6014d7de78574c1c22050e16213211065db3fb78bfea70fd97b8e0f8dc841d3cd650bf4612357eae55367fc005f26ed380030b596bda51c69592c1490b0
 AUX nut-17.7-makefile.patch 1796 SHA256 adcf4b0d239a0236e9d9231cdefaa49fdc223b82e8018b35d7606472190187e8 SHA512 83e666f91faf04a387228a32e6c513f4b743ce466712d2eec6e3a39320eac4272b7842e9fa19037bd9892c2d4644cdc1658f89a6c90656313c49d53b80696b5a WHIRLPOOL b174ab0ecdd063bb5af7c5bba3901b8267d1ac1de15608ef64da2b42263aa09379702c27cee19d5c91d037624f647a618ba74da4c435b5b7f5414dbc4df4bbc9
-DIST nut-17.5.tar.gz 1315564 SHA256 a9e11b6192fd572bc3a6b8a9a4a1a96f21db2e68e57fe2c4816cddb96f895292 SHA512 1de7a28171bcfdd5fa7015583256abb674270a36609669ac0952b193e59c5990c90b051c5c29a6f03245fe019913eab9c6731d6944cedc219f07bcf519d13e96 WHIRLPOOL 877e6a1a1ce7c5f18720d3facb2082478fcee5629eadfb1c5c150e33143ce97758ee990f5ec86dbf6a885d3d9c9f7ff33ee4a2130d9a5069c771c5a4714df151
+DIST nut-17.12.tar.gz 1274051 SHA256 b2fbaa92cbb0351efc4b9a679c6fddb31ba56dd87c798fafecff12d21bb7d669 SHA512 eeefb7c0f0da918475ea1ef3a569f758d026fd6037579087b3e16d08d1fd026bff74466eca256e88de66676f5f782354fedb39f6546f13cca1fec4aff3782bcc WHIRLPOOL a0132c69591e14f137168efdd751cedaf832b42292ff0dec6d836eeccdc45dd43f07fb812df73bdcb58f54e9490be0fc16e14ddd76f270f7f3afd72db2166653
 DIST nut-17.7.tar.gz 1315707 SHA256 b41a9bf1687d6a7ce4a17b1afea19b0976a6828ec423c5b48ce648b80dbb5a5a SHA512 9f89d64a3b2a41835e845d272d57a905446e14626902106b2a88e1954748d4b7b33d7b2d0ea54e6d91cb6108667b9e187b57d5d9bc87eca1c9c799547d4d36de WHIRLPOOL 03ebba9de669cbddcd8ede868f70d416e7e6399b5156127745468c87256131f4fc653b5e36ea0e86eb8bb2fc0f5abbc043862e82ad42514803994e36adbe9878
-EBUILD nut-17.5.ebuild 975 SHA256 17bbd2f9bc2246ef8eec5f148fd13365012260250c39e749e602fa2c66c3d709 SHA512 522d6ce1d192c270603d3f9a43259f5e1ba706b299c98fee6bbaafbf8dbb87a838e486e329f8ec199259aaefda4aceee2e6eb0198bafd8556425810962bcdc9e WHIRLPOOL 674b76e3357979f633f09e4016d6bc1c562f8565fd4ea0cb074b53362e74fa42b8700aa1e514c224d004a317be5ec139b60dab2e552e4563ef4c740ee9e0e41d
+EBUILD nut-17.12.ebuild 718 SHA256 a058f92b2ef045d0598d4b7ccd264ebf6f4827ec865e7b975ec73caa8d04e14e SHA512 869e798ce11270582253d7fb8b7d7a524807559f9d45ef43962f4a4663ebbfe16c037de34e2deeb57822d982e0e286bfcf4e85d81cd4b6ba8b8f3073b8cae05d WHIRLPOOL 72d457f7601fb99610b515815d3e7486f9a973ef51c4b43cf58ee34c8b5be34a83c505f8bf7bcfe2b19a32aa961818518e3a79610ce29992467ff86260212169
 EBUILD nut-17.7.ebuild 954 SHA256 5f564e198cba62092682a74ebf1e4f69a0961325d14f088d974dfc2e849b39e7 SHA512 fb12a4ae226f85a03f80e17e175b549ba5b183c4efb2108decbc3d7b7b9f8f990e9e4107c341ffff5a2b9e8e1fe9f0a7431801304c4db849d1df3a57798b874a WHIRLPOOL 3fa1f1f1695c545eeaa469fdaf9fc82dc59219c905155f9ccc56fcd15a66ebc9849230509a937262e731a18bab8f4e4ab963f71ed5dd650852a3086cadb552a0
-MISC ChangeLog 6178 SHA256 713543624d2ea91f24a943414657fc81ac7c84f4cd2dd6143905a28fe3a165dd SHA512 3bc875ad15341e9fa21825387f54910937c11fdf879aa2416e759eeed58c33acd42f1068e00ec91c013173b6b7ea348ef3c619a237fcc07264e0c08aad278213 WHIRLPOOL b7aaa559125af9b867fbeb2b90a063a34dfaa5cc93006f4e291deb046f5dd89f956c8c9a5419c6a77dfe0ada52f52dfc5dd0184cbb917a0b63c49f0dd5a84fe1
+MISC ChangeLog 6404 SHA256 2c2ffeee17e021c65122390de805abd1baba9a2afe1c82310cf9feb82338db97 SHA512 e20f42c0a8397fc24c2fe9fb5917c4eab1d2b6b803399024b2235b0f710bddd7abf8bd44c5a9b7449a982f2c2a221223b556e20df8b28a00b7dd115c88fa6863 WHIRLPOOL 76fdaad0536d4ce4c7b2facde486b9273a115badcc35f9bab4314f7cf7fc24ce9a64487270c8122dbeebaa3bca1ec353194fb8c0a22508d8938bcd6210108aa7
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBHf+gACgkQVWmRsqeSphMVgQCeNRErIwAJWMpph1wuEv0SOWQi
+VYcAniNXvw3nQix0xv1GMDLHUBSA+b/t
+=fN2f
+-----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
deleted file mode 100644
index 749d6025d46c..000000000000
--- a/app-misc/nut/files/nut-16.12-makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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
-@@ -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
---- a/fltk/Makefile
-+++ b/fltk/Makefile
-@@ -5,7 +5,7 @@
- NUTDIR := \".nutdb\"
- FOODDIR := \"$(libdir)\"
- EXECUTABLE := Nut
--LIBS := `fltk-config --ldstaticflags` -lXpm
-+LIBS := `fltk-config --ldflags` -lXpm
- 
- OS := $(shell uname -s)
- ifeq ($(OS),HP-UX)
-@@ -17,7 +17,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 := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
-@@ -29,7 +29,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.. ../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/files/nut-17.12-makefile.patch b/app-misc/nut/files/nut-17.12-makefile.patch
new file mode 100644
index 000000000000..22eca16c6979
--- /dev/null
+++ b/app-misc/nut/files/nut-17.12-makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@
+ all: nut
+ 
+ nut:	$(OBJS)
+-	$(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CC) $(OPT) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ deps:
+ 	makedepend -Y. *.c >/dev/null 2>&1
diff --git a/app-misc/nut/files/nut-17.5-makefile.patch b/app-misc/nut/files/nut-17.5-makefile.patch
deleted file mode 100644
index 0adb492fc764..000000000000
--- a/app-misc/nut/files/nut-17.5-makefile.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- 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.12.ebuild b/app-misc/nut/nut-17.12.ebuild
new file mode 100644
index 000000000000..f4367a8f8610
--- /dev/null
+++ b/app-misc/nut/nut-17.12.ebuild
@@ -0,0 +1,30 @@
+# 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.12.ebuild,v 1.1 2012/09/05 16:37:54 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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-17.12-makefile.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
+}
+
+src_install() {
+	insinto /usr/share/nut
+	doins raw.data/*
+	dobin nut
+	doman nut.1
+}
diff --git a/app-misc/nut/nut-17.5.ebuild b/app-misc/nut/nut-17.5.ebuild
deleted file mode 100644
index 501ca292cc6d..000000000000
--- a/app-misc/nut/nut-17.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.4 2012/05/05 21:53:59 ranger 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
-}