Add missing dependency. Fix building with x11-libs/fltk[-static-libs] by Attila Stehr (bug #405819). Clean up patch.

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

5 files changed, 103 insertions, 37 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 7e096e330a94..88be72e55792 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.34 2012/02/24 23:43:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.35 2012/02/27 00:51:22 jer Exp $
+
+*nut-17.4-r1 (27 Feb 2012)
+
+  27 Feb 2012; Jeroen Roovers <jer@gentoo.org> files/nut-16.12-makefile.patch,
+  nut-17.4.ebuild, +nut-17.4-r1.ebuild:
+  Add missing dependency. Fix building with x11-libs/fltk[-static-libs] by
+  Attila Stehr (bug #405819). Clean up patch.
 
   24 Feb 2012; Tim Harder <radhermit@gentoo.org>
   -files/nut-16.5-build-fixes.patch, -nut-16.9.ebuild:
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index c5040fb2e23a..11f4be1c3df9 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX nut-16.12-makefile.patch 1643 RMD160 0fb7d388e5441c2acc0da37cc0754482ef1ae94f SHA1 5eee2e43ccd710da3dd47c101215bd35293eec12 SHA256 7db652a27c038ad3608d6352bb4ee1098f0a6bcf8f4ff700ed43e76bce65bbb9
+AUX nut-16.12-makefile.patch 1976 RMD160 77eb30ad5b888ae385ef1fb4ca3eb752282d714f SHA1 c7ea6241b736b922fab0358d5016d78e6d794c81 SHA256 4bb9616b7eded6774dbd0290894447ac7d18d22dbaa7ef62c82ec7e392d99aab
 DIST nut-17.4.tar.gz 1315621 RMD160 d8333e4448cc71b1b4bfb85e6ba1b36d7a2a4b4e SHA1 31e090a01ee182ce24c1703eb79b544f6da1f4ad SHA256 d6b9b12c2b318173a03e9211c3724ba5091516934dc3bd6727a2de21292f9153
-EBUILD nut-17.4.ebuild 942 RMD160 ce91d3ad2f6fd7412825c8d976fea6c0c6e77b3c SHA1 ed00a609b3fed82918275c3a787c68b1bfa2555e SHA256 554795aff64956bf4562a1b3edcc8efa306e629b3671a2180ade9e7a2776726e
-MISC ChangeLog 4822 RMD160 49f5771067b9892bb40f605c88b00b238575ab5e SHA1 5fc16fdd659d6e8bd0184abad719eb3b6ab01001 SHA256 5837c68814cc33476704080ea817f7da546bfbe2f563cf8f28fe2bc2cd50d313
+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
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPSCCfAAoJEEqz6FtPBkyjh14IAKdpLWTpaikSjxqZKo0xBDFX
-xixVNIlofLfqc83Tl+mgib99q92QRVV4Nd6SkX1aYltGnmrM8GqzoMPvt0xZwgDK
-k48L/3ANo1DdVRH4oNMLMLJYSJoZ+XQyUPIhObcfihuW9tOqVQovL8uZAqiH3QgK
-5DkctGk/WMvgaUF9lAuj2nNWHfwS9zbymy4O6n9QijAunbSmvwgD+LMA3QBJotV/
-RBxn2GtKEAT2I97jO7iPbvZQPFcVQxvunil9VSiy1QsE5nBMgclMqTfBtR4xXF9I
-aJvwtzrxJtio/RI7j2QN/booJQgOEmP1ZrgL1khJY2rdz6f94AAc5h8w3+VVo2M=
-=xBsp
+iEYEARECAAYFAk9K05AACgkQVWmRsqeSphO9oACfaX+om9/h4BaWmmkPx8RS5uL8
+34sAnAl4N1TZACxbTPdKdlv4D8MsNMN6
+=3UyD
 -----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
index 90fac0b32555..749d6025d46c 100644
--- a/app-misc/nut/files/nut-16.12-makefile.patch
+++ b/app-misc/nut/files/nut-16.12-makefile.patch
@@ -1,25 +1,5 @@
---- 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
+--- a/Makefile
++++ b/Makefile
 @@ -1,4 +1,4 @@
 -prefix = /usr/local
 +prefix = /usr
@@ -69,3 +49,32 @@
  
  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/nut-17.4-r1.ebuild b/app-misc/nut/nut-17.4-r1.ebuild
new file mode 100644
index 000000000000..8aaa3ba38d34
--- /dev/null
+++ b/app-misc/nut/nut-17.4-r1.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.4-r1.ebuild,v 1.1 2012/02/27 00:51:22 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="X"
+
+RDEPEND="
+	X? (
+		x11-libs/fltk:1
+		x11-libs/libXpm
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-16.12-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
+}
diff --git a/app-misc/nut/nut-17.4.ebuild b/app-misc/nut/nut-17.4.ebuild
index 68b70d3828ac..6d5cdd7620a5 100644
--- a/app-misc/nut/nut-17.4.ebuild
+++ b/app-misc/nut/nut-17.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.4 2012/02/24 19:33:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.4.ebuild,v 1.5 2012/02/27 00:51:22 jer Exp $
 
 EAPI=4
 
@@ -15,7 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc x86"
 IUSE="X"
 
-RDEPEND="X? ( x11-libs/fltk:1 )"
+RDEPEND="
+	X? (
+		x11-libs/fltk:1
+		x11-libs/libXpm
+	)
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {