Version bump, fix fltk linking, respect CXX, and remove old.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 44 insertions, 13 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 42af4f892f45..c844f1c01d79 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/nut
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.58 2013/04/07 02:47:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.59 2013/04/09 04:35:05 radhermit Exp $
+
+*nut-18.7 (09 Apr 2013)
+
+  09 Apr 2013; Tim Harder <radhermit@gentoo.org> -nut-18.6.ebuild,
+  +nut-18.7.ebuild, +files/nut-18.7-fltk-linking.patch:
+  Version bump, fix fltk linking, respect CXX, and remove old.
 
 *nut-18.6 (07 Apr 2013)
 
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index 1224322b2b38..e31deb86b3c4 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA256
 
 AUX nut-17.12-makefile.patch 227 SHA256 0e6f8c0adacf1cdf9ebf276208c93ba45226180808e38510483529705e5c9934 SHA512 b8354569645a513e4dcf59d4a642e4e7aac866e25c26da60e2ebf7671829d0e03e9ce753c15ea408a1fe8aff798d1ce601ea0a60b00959c2bf69f8f964a65f57 WHIRLPOOL 1de7d6014d7de78574c1c22050e16213211065db3fb78bfea70fd97b8e0f8dc841d3cd650bf4612357eae55367fc005f26ed380030b596bda51c69592c1490b0
+AUX nut-18.7-fltk-linking.patch 718 SHA256 8b7101d3b836bd1f8b0f7d04da9cb378fd2c80425ce52b4faab9790164d79dc0 SHA512 2eddfd92c57d29e7cab664e8f974204fc6dbfb99653dfb056d84f1f46a43aefccce0af03da39c024aa44d32fd3107a47e487fb080bf820db5b0baaf6f20c6ffc WHIRLPOOL 2663551d4f223315b8f88f9a2b64aff6b728175483be86892c93b4eb11f0596766333a3fed246ad9fe2a445e70772343b611da038abb688165cf8b7a318a5979
 DIST nut-18.5.tar.gz 1331213 SHA256 45c959fe2839a41726fde647b78175c45d4f0d9fb59dc8da1e828103b7fd5507 SHA512 d598532247611556cc4d8fb5d70bcbfc6978f8b1176a9c5a1ccf05df71fa50bac81045ff39c6ddb0344023fa128def12635c21da9b87876278159912a7eeab45 WHIRLPOOL 0c196a3afa40ae1cb31e987f4627d818ccc94166ea816930567ff7d728d862d8a372701747d8b197424aa61b653c866cc5878f7ac8a34b8a9bdcda8d28023cd9
-DIST nut-18.6.tar.gz 1634835 SHA256 4d49c9f9f29339f615549c900172e2e9e3a32fb555a5ea54ea46e3b07f952a58 SHA512 572ca4a0a16d0641e30a1de2e0565f43d0aee02fd80ebfd8ab7c0405bc574c8476468138a9edddbfdc294ffcc73175e45f3414565cc87316a238bda75ad1d592 WHIRLPOOL c1937beb93c8437c5cf7ae073c2c53cece10d20087695fbb6eb88daca0a34027c3cea5f79f70cd1a88613bfff8847a34bd3f86599b15dc3742f52b0bda24c81f
+DIST nut-18.7.tar.gz 1337114 SHA256 0bd35bbb5daab52d0a0270ac1955651cfbfd2f053e171f98cf5fb5bac1a9cdfb SHA512 cdcbe69eb5e6bb53e32a2e00773d88a3dba2b38b966b337e9b95da29e4682cd6b71b401e58070e6f9e4b9573a01c0663a01af86737fe1b0dbd87a8a1ca7c1b49 WHIRLPOOL ff53d764c3d096c701b1f78d438c7c6de217f2082b53601e5ce2ce3a258b0ac2f36d3ede501f2a73f1aa3b3e758b3584583ccce04f9d46ebc1f179369ceb8437
 EBUILD nut-18.5.ebuild 716 SHA256 58ee9152cc9904d4219b91f7d323774ab160c65d36b1a6be437fd90514e0934a SHA512 c2f7c6dbff20e24dce433a6bd0ea8ca53c60887d3aba17429ad665d0aa8f102d3f071729c9001cc2025fe51508a621e0fb64665e9cec020176435fca2652855e WHIRLPOOL aaba551c1814207d760f96725d43e79a8c5b23cda662c3716b66acf6809f85258de0af34a904d0d5795040e7365bf0d9ac7e893b5681799e58f476454e9cd3b8
-EBUILD nut-18.6.ebuild 649 SHA256 6b0123b967e1346ca1f627fdbe4531a217f266244e054546b58db498d633a457 SHA512 be274e8c6fafbebcf91112785c1d1e437e65a25725adb434e1a58e56f83a1d9ca1874896e268dae058df7cf4bda9d25eb708dbf569af65e0b816668e8c94dfc9 WHIRLPOOL cc77c7d79d098c9496b4ba17212f35a41cc2257add6262f198fb9c1e8e8d16063c953046b94303274140e50d3e6dad425df47add572822dbca61979471694761
-MISC ChangeLog 7694 SHA256 743148ae29997c867cc03c8700c22d6290545fbafe7a57dc61b03a4e84b2ca30 SHA512 0a8a3d6dddbb00180c09e84f77380932d6b1f952a4f37d74564c893abeb0bba7d664f9f9242abe00fb42ba160533adb2b145b35844874d31772c38c636070d4d WHIRLPOOL 41e7cd60f9787c171e7142b073767b1f9fb6dec2c3a4d0ddeaaf4cf7e743f70e4c297a4263e5ba7456037c575738eac78341a185f4c1c6dc04f9c3f58d57ae17
+EBUILD nut-18.7.ebuild 733 SHA256 f4307ad5a60446a0ef86c4d972cb612c70b62f64666effbaed28d75ddf9ab8fb SHA512 d3fdd52e571d0288baae111cd3149d36dbc5aebe8e638ea12f7dad65d58a9827c7c04358e610f3919046eb8f463ffcbde7f05c0c9efbd9f49f0ff347f4e1c77f WHIRLPOOL 9088bbad3c0861b8aabeec860c468813874ec24dc0831937ad1e41b870b73586e404f9c81e0d6c7df985f0e42f3c5f75a8139276ce04d3a36dc2f8158b022546
+MISC ChangeLog 7906 SHA256 d0d012c104dedb5df23fcc23af5b52c3209d7759a42488ff1785433c7da4149f SHA512 d40e58045741e01775b16b932c9abd87ac4bea7fbfa71c7c7c9c8443058f181e416de254e80a948ceecf479f5241fecd4e7ab56c50a0b7060627fee12bd3fd1a WHIRLPOOL 4672ee45231241267604b33484347a0e7b95a16747b7b02e8c6228381f5e14e10a337e33c2796dc1868f7a76dae7de23491c19260132887d8f072895d7ecaeb9
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYN5LAAoJEEqz6FtPBkyjgscIAKD8HNo3hd2Ou7l1Ygr7m0Pz
-fOp+zhUU8ZJD8uvmikZtN0Jv9QGtwqq1gV6eruweyVghUTV/jUx+H2JSjG6nckhI
-qUEZ6Sux2892U03H+pkAcvwOsMHZNgMjpx1kRm7aZzPkR5I3l47QzWBB7DpTHfV+
-dWgAsyAFJyyWhdct9KlK22nGpRco0hNWxn6Hfmh7U+d+/hhdKlK6mE/1Er1KVUxG
-tvosn8RkJTiiqQShJgWC4uIOpONzjnM1WqggPm8gTJdKmj3IsgiFyCiiKmBQ1YJa
-XAz9mbu6NjkqfyYJcQ9DfFh02B0cSohQDAOB1oRSwY9IpRu4YJx38BYFZWKy7fs=
-=wsS+
+iQEcBAEBCAAGBQJRY5p6AAoJEEqz6FtPBkyjNEMIAJTeKSbHLAG8D93FhWiw4+wF
+oiSVmvQ+2tmF1sscsXJvamLnOZdXm8RLmIFRiaeWXdHnaZXyo7vrsvkEXWaeQqjx
+8Q+XMtwSuFCEDEM/ew8m+IMbc3PBb/9Hv1AFi0MqyRO2a47CWjIQLHRNBExje8aR
+CKoetlFycJ62dBINNFPuUZCsd8KWrk5qwei4FzYT9X4k4Nl5mgEXAtg3OTseLTHu
+NIPMvrR+WDzx+nC7oI4bM1lzyhkctzGAmKX2v5Zhd3t0O6AngJB8haI7R0GYYhgq
+f5jB/MMstW8U0g6ns2+9nXoaAEYv/JdJtUzSZoTtHPttLRadLRBF7HsP0Hjevig=
+=rVlx
 -----END PGP SIGNATURE-----
diff --git a/app-misc/nut/files/nut-18.7-fltk-linking.patch b/app-misc/nut/files/nut-18.7-fltk-linking.patch
new file mode 100644
index 000000000000..bd35c4276d71
--- /dev/null
+++ b/app-misc/nut/files/nut-18.7-fltk-linking.patch
@@ -0,0 +1,20 @@
+--- nut-18.7/fltk/Makefile
++++ nut-18.7/fltk/Makefile
+@@ -5,7 +5,7 @@
+ NUTDIR := \".nutdb\"
+ FOODDIR := \"$(libdir)\"
+ EXECUTABLE := Nut
+-LIBS := `fltk-config --libs`
++LIBS := `fltk-config --ldflags`
+ 
+ OS := $(shell uname -s)
+ ifeq ($(OS),HP-UX)
+@@ -31,7 +31,7 @@
+ OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../ranking.o ../recmeal.o ../trendy.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
+ 
+ nut:	$(OBJS)
+-	$(CXX) $(OPT) $(LDFLAGS) `fltk-config --ldflags` -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CXX) $(OPT) $(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-18.6.ebuild b/app-misc/nut/nut-18.7.ebuild
index 1c7e1b305a82..cbacb1173b5e 100644
--- a/app-misc/nut/nut-18.6.ebuild
+++ b/app-misc/nut/nut-18.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.6.ebuild,v 1.1 2013/04/07 02:47:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.7.ebuild,v 1.1 2013/04/09 04:35:05 radhermit Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -13,8 +13,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fltk-linking.patch
+}
+
 src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
 }
 
 src_install() {