Version Bump

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

8 files changed, 95 insertions, 89 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 7e809c7f3fa5..df929f4293a1 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2011/01/13 14:35:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.14 2011/01/13 17:52:43 jlec Exp $
+
+*nut-16.5 (13 Jan 2011)
+
+  13 Jan 2011; Justin Lecher <jlec@gentoo.org> nut-10.15.ebuild,
+  -nut-12.2.ebuild, -nut-12.7.ebuild, nut-14.1.ebuild, +nut-16.5.ebuild,
+  +files/nut-16.5-build-fixes.patch:
+  Version Bump
 
   13 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> nut-14.1.ebuild:
   ppc stable wrt #351547
diff --git a/app-misc/nut/Manifest b/app-misc/nut/Manifest
index ba5146e1c92a..318c94ef1a95 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -1,11 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nut-14.1-build-fixes.patch 400 RMD160 dd3a66304053c04b1aab9b69aef73c7132e7f44c SHA1 e3c000c1a34104b8c0d263f35e8135fe6005fb7e SHA256 cd6a6b3dce8bb9caf7281a9c04b410e7373d8c95ac822c7696d577a624f10002
+AUX nut-16.5-build-fixes.patch 623 RMD160 82e327d1733ef0c0cded142f474f4e405b3ecc41 SHA1 fb50f9a0534594a92d0183b958f1dbd2f6d0092b SHA256 a62f83062cf33d48d824d4ac526da98fd0db11538d54e387dde29ffd7432fab5
 DIST nut-10.15.tar.bz2 814365 RMD160 ffdcda35a2c1f4305fd02d3edf04005cf5de9ac5 SHA1 ded0d47618d0a0da8bc9bb89c6bd7a36539cc64c SHA256 e33d0d57af8ce5ce6ca1df89ab2ed5ae49a09e0cb5abdf4df6d7956ca98527fe
-DIST nut-12.2.tar.bz2 903328 RMD160 12f59cb2e6220bb2de1dadcc822d686719bc1f4a SHA1 4796683ff81902a0f79a000570f953d87fd06055 SHA256 8d046b9da70b25eb1bd5605e3f7d8cd2b19915cfffb8a6b9e9d8a015af27f0af
-DIST nut-12.7.tar.gz 1144380 RMD160 68a15936f11730aa7dcf9fe2101e0274b8147be4 SHA1 3adacbc2c7de3c8db65b7ab318e9b914b91a3d6f SHA256 ae02877ae3111d6fa601b74d5b93473926a35fa0dc6161f90cf0e15c4ceb8208
 DIST nut-14.1.tar.gz 1160598 RMD160 9b3b27e1a36f4d181e3c16609fda5bb3c8f43376 SHA1 954fd52c37be5ebe8e7b98deb1c449aa0f99d916 SHA256 b69e0f440aadd7cccdad4dbaffc0ef3cf15597270b4fc21bb065cbb61f2e3387
-EBUILD nut-10.15.ebuild 694 RMD160 88b1b7ffdbe470ad259154418330f6af620e2266 SHA1 4a93a95678b22071a7ff9dbf3b0f21cc6160b2be SHA256 20868548c05c802141e1bedf7814ae3e5f8d2bccdfe1a0d5954c82faa66349ec
-EBUILD nut-12.2.ebuild 710 RMD160 6cb3816cce0fced2884b5e965361cb07b5903671 SHA1 dc29d9ecc0eff8cf2f63862cfc4d4f343353e419 SHA256 f08a3391a6fe4e6c0bb5b37567d1a13020ca701789b7e9eb8cd9ee2bcc8377e8
-EBUILD nut-12.7.ebuild 877 RMD160 30a7bd87e5422e6aa5334473a8f26a290449b9f4 SHA1 d63174495224066f1a350f94767b27f682d79c0d SHA256 26206b0b9625d02226cd232c50f2d4bf6be845be798b85c30a5d148eeed05212
-EBUILD nut-14.1.ebuild 844 RMD160 8ff1a99e1e94cfad4f765311576c249cafce263e SHA1 e736563077ced0e6ffd4d825f41f9646d5f45e00 SHA256 c530fc7e14ae7e498ee67695a7283f1e116067cb8436cb352dc528f0bdf258e9
-MISC ChangeLog 2021 RMD160 8910b5e9ac27336457bbe2ac0c7bf6d7da1c1f88 SHA1 bc684648bd318aabc78ccabba14073782e03e60a SHA256 dd7dc59f3fe26bf758fbde0870a788d0c61eeabc205caf0723d9249e2e19efd5
+DIST nut-16.5.tar.gz 1270063 RMD160 7f2bc03f14bcea20cdc7c64209e7ac20cfc94741 SHA1 d694d2d7b9a5de71f0f802ec704582cf243bf777 SHA256 525448b9aa26fd4682134b35556297820b75c77be21de56d68ad137adb364782
+EBUILD nut-10.15.ebuild 680 RMD160 3b97cb03b9fb873aa3fe9aea018c5bdb986197eb SHA1 6b43fc9c615323adb4bf56963e929cd0f2fbeecc SHA256 c8c172a90afecf6aee4398b8d2ff98e3b8d39fc0ed2e284f8c0fc084c0193c8c
+EBUILD nut-14.1.ebuild 815 RMD160 0b45b23ffd849fe742de1294be216a5857270d15 SHA1 f5c98050e05056c69d0cd3ada2f3fac7382d79ff SHA256 0f37c36bd957d49975fc1573681ee23a4c4c9b0c56e41a981cb091107dcdc298
+EBUILD nut-16.5.ebuild 780 RMD160 f30918136e2899811d400dda9d01d474020d9bb3 SHA1 7210146a76034e7ec9dd6a75c89802d029bd93a9 SHA256 a8d29fefb7f358a1c12c483dd2c623e9e5ab89ad3b75834be208473e3347d1c5
+MISC ChangeLog 2231 RMD160 ca43f60b0ee8f5b24d88cea4366978c1b7bfd898 SHA1 cca8165b34fc6f165da66710275b0e853b092767 SHA256 66aed9d1bd0338e3d38551c9b1b7a55bcdc2962519f23a0c353d292f470db72f
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0vO/EACgkQgAnW8HDreRaoggCgjUTo/uMDZTUXmBl1lgygE/s1
+eE8AoK0hGU8BsPOjdG6GZCwlIr7/Yj2A
+=HDeO
+-----END PGP SIGNATURE-----
diff --git a/app-misc/nut/files/nut-16.5-build-fixes.patch b/app-misc/nut/files/nut-16.5-build-fixes.patch
new file mode 100644
index 000000000000..c2b918da0c37
--- /dev/null
+++ b/app-misc/nut/files/nut-16.5-build-fixes.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 1b8b705..dc2a08b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,14 @@ FOODDIR := \"/usr/local/lib/nut\"
+ EXECUTABLE := nut
+ LIBS := -lm
+ 
+-CFLAGS := -Wall -O3 -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic 
+-
+-CXXFLAGS := $(CFLAGS)
++CFLAGS += -Wall -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic 
+ 
+ SOURCE := $(wildcard *.c) $(wildcard *.cc)
+ OBJS := $(patsubst %.c,%.o,$(patsubst %.cc,%.o,$(SOURCE)))
+ CPPFLAGS += 
+ 
+ nut:	$(OBJS)
+-	$(CC) -s -o $(EXECUTABLE) $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+ 
+ 
+ deps:
diff --git a/app-misc/nut/nut-10.15.ebuild b/app-misc/nut/nut-10.15.ebuild
index d4ea1aee3e0b..bf27822dee6a 100644
--- a/app-misc/nut/nut-10.15.ebuild
+++ b/app-misc/nut/nut-10.15.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-10.15.ebuild,v 1.4 2007/09/09 12:41:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-10.15.ebuild,v 1.5 2011/01/13 17:52:43 jlec Exp $
 
 inherit flag-o-matic
 
-DESCRIPTION="record what you eat and analyze your nutrient levels"
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
 HOMEPAGE="http://nut.sourceforge.net/"
 SRC_URI="http://www.lafn.org/~av832/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
-DEPEND=""
 
 src_compile() {
 	append-flags '-DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/share/nut\"'
@@ -19,9 +19,8 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/nut
 	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
+	doins raw.data/* || die
+	dobin nut || die
+	doman nut.1 || die
 }
diff --git a/app-misc/nut/nut-12.2.ebuild b/app-misc/nut/nut-12.2.ebuild
deleted file mode 100644
index fb8946c8e720..000000000000
--- a/app-misc/nut/nut-12.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-12.2.ebuild,v 1.2 2007/09/09 12:41:20 coldwind Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Record what you eat and analyze your nutrient levels"
-HOMEPAGE="http://nut.sourceforge.net/"
-SRC_URI="http://www.lafn.org/~av832/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	append-flags '-DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/share/nut\"'
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/nut
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-}
diff --git a/app-misc/nut/nut-12.7.ebuild b/app-misc/nut/nut-12.7.ebuild
deleted file mode 100644
index e0a98731af32..000000000000
--- a/app-misc/nut/nut-12.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-12.7.ebuild,v 1.2 2008/05/11 20:53:32 solar Exp $
-
-inherit 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=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e s/'gcc '/'$(CC) '/ Makefile || ewarn "It might of been fixed"
-}
-
-src_compile() {
-	append-flags '-DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/share/nut\"'
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/nut
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-}
diff --git a/app-misc/nut/nut-14.1.ebuild b/app-misc/nut/nut-14.1.ebuild
index 7d47d0efc7f7..fd657b406cda 100644
--- a/app-misc/nut/nut-14.1.ebuild
+++ b/app-misc/nut/nut-14.1.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-14.1.ebuild,v 1.3 2011/01/13 14:35:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-14.1.ebuild,v 1.4 2011/01/13 17:52:43 jlec Exp $
 
 EAPI=2
 
@@ -15,9 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~amd64 ~arm ppc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build-fixes.patch
 }
@@ -28,9 +25,8 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/nut
 	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
+	doins raw.data/* || die
+	dobin nut || die
+	doman nut.1 || die
 }
diff --git a/app-misc/nut/nut-16.5.ebuild b/app-misc/nut/nut-16.5.ebuild
new file mode 100644
index 000000000000..da9d26f78e79
--- /dev/null
+++ b/app-misc/nut/nut-16.5.ebuild
@@ -0,0 +1,37 @@
+# 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.1 2011/01/13 17:52:43 jlec 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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-fixes.patch
+	tc-export CC
+}
+
+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
+	doman nut.1 || die
+}