Version bump. Fix DEPEND.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 65 insertions, 8 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index cac8d998d200..c5906c850cfc 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.17 2011/03/20 20:20:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.18 2011/04/05 15:50:39 jer Exp $
+
+*nut-16.9 (05 Apr 2011)
+
+  05 Apr 2011; Jeroen Roovers <jer@gentoo.org> nut-16.5.ebuild,
+  +nut-16.9.ebuild:
+  Version bump. Fix DEPEND.
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> nut-16.5.ebuild:
   x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index 42c7c55ec5fc..522c4f998778 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -7,15 +7,17 @@ AUX nut-16.5-int.patch 3051 RMD160 97acad44b7b6a6f6cb9e490e6006910402bac7f1 SHA1
 DIST nut-10.15.tar.bz2 814365 RMD160 ffdcda35a2c1f4305fd02d3edf04005cf5de9ac5 SHA1 ded0d47618d0a0da8bc9bb89c6bd7a36539cc64c SHA256 e33d0d57af8ce5ce6ca1df89ab2ed5ae49a09e0cb5abdf4df6d7956ca98527fe
 DIST nut-14.1.tar.gz 1160598 RMD160 9b3b27e1a36f4d181e3c16609fda5bb3c8f43376 SHA1 954fd52c37be5ebe8e7b98deb1c449aa0f99d916 SHA256 b69e0f440aadd7cccdad4dbaffc0ef3cf15597270b4fc21bb065cbb61f2e3387
 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-10.15.ebuild 680 RMD160 3b97cb03b9fb873aa3fe9aea018c5bdb986197eb SHA1 6b43fc9c615323adb4bf56963e929cd0f2fbeecc SHA256 c8c172a90afecf6aee4398b8d2ff98e3b8d39fc0ed2e284f8c0fc084c0193c8c
 EBUILD nut-14.1.ebuild 815 RMD160 ffd3e42b881e412dbfaa4da38ee5f09a7ee3f64b SHA1 5f07829bebf2b063d0c457dce3647638a26c9935 SHA256 da2f9f1fbaa8923616dfa794c554da8d5dfa5ed0d6d0b11d7d28c579d7397cce
-EBUILD nut-16.5.ebuild 1003 RMD160 c65f22da0d51527acc8de4db1e1008aa3e5b85a4 SHA1 e3bacfaaeaa0fdce301478a815f2f486b4a87382 SHA256 4b4b0fb59c4b74f759897c49f234d8f88f3538ab84c4720b44d78a5bd36c4187
-MISC ChangeLog 2607 RMD160 1cdc6d858314532e3f30b7b06bb1c03fb9554cd4 SHA1 363a7084e834719ddde8b2c6540c153179db8319 SHA256 31c3c760b6a8e9a6d1d932dc5d5d40c966a6b8110a2557853ad98de813de6f33
+EBUILD nut-16.5.ebuild 1003 RMD160 80f2795cc11f3cfc2c22f3121a8a7d8792c4a768 SHA1 f411e3a4bd14fd0558d5591d2236d158859b1d44 SHA256 c22fc90e6c26ef62ebfa1083ee812ca6256912b5cb81977e90da9377f811c5e8
+EBUILD nut-16.9.ebuild 974 RMD160 21033d2bdd7d6fd035ec10b616d9888917614939 SHA1 3e59f06597da6718789614a0c0aee2c28bfd2166 SHA256 c67dfa5e686b547b4b5a56a23984d1b8741d9748668954771ee624a1342d087d
+MISC ChangeLog 2744 RMD160 2e574c52f167abdafb10629230e06fffa9669ca3 SHA1 454f43e37504b22c58a89c8a2df10837e365192b SHA256 71fa4b454a4fc8b25555a7a08032f5807b56db419caff9f8463dfa0fd301c52b
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2GYakACgkQgAnW8HDreRZvewCgshBL/OSiocgr89ZFJ3M1ct7r
-gxAAn1eGxJJFbVMLlxhN4s9vOr7szlFX
-=Dcgu
+iEYEARECAAYFAk2bOlUACgkQVWmRsqeSphOscQCfbWPnmd+u+w7/Ik+r6c9THZ46
+MrgAn1erjOlyDl+Fp079ZmvDq9qSaLHk
+=Epr6
 -----END PGP SIGNATURE-----
diff --git a/app-misc/nut/nut-16.5.ebuild b/app-misc/nut/nut-16.5.ebuild
index 45f7c011ad8a..8e7e05e2a06a 100644
--- a/app-misc/nut/nut-16.5.ebuild
+++ b/app-misc/nut/nut-16.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.3 2011/03/20 20:20:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.5.ebuild,v 1.4 2011/04/05 15:50:39 jer Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~arm ~alpha ~amd64 ~ppc ~x86 ~amd64"
 IUSE="X"
 
 RDEPEND="X? ( >=x11-libs/fltk-1.3:1 )"
-DEPEND="${RDEPEN}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch \
diff --git a/app-misc/nut/nut-16.9.ebuild b/app-misc/nut/nut-16.9.ebuild
new file mode 100644
index 000000000000..680e31da1fe2
--- /dev/null
+++ b/app-misc/nut/nut-16.9.ebuild
@@ -0,0 +1,49 @@
+# 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.9.ebuild,v 1.1 2011/04/05 15:50:39 jer Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic 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="~arm ~alpha ~amd64 ~ppc ~x86 ~amd64"
+IUSE="X"
+
+RDEPEND="X? ( >=x11-libs/fltk-1.3:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-16.5-build-fixes.patch
+
+	tc-export CC CXX
+
+	sed \
+		-e "s:/usr/local/lib:/usr/share:g" \
+		-i Makefile fltk/Makefile || die
+}
+
+src_compile() {
+	emake || die
+# need fltk-1.3
+	if use X; then
+		cd fltk
+		emake || die
+	fi
+}
+
+src_install() {
+	insinto /usr/share/nut
+	doins raw.data/* || die
+	dobin nut || die
+	if use X; then
+		dobin fltk/Nut || die
+	fi
+	doman nut.1 || die
+
+}