Old.

(Portage version: 2.2.0_alpha176/cvs/Linux i686, signed Manifest commit with key A792A613)

5 files changed, 5 insertions, 91 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 13310f32dd6a..fa90dae36b01 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,10 @@
 # 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.64 2013/05/20 12:45:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.65 2013/05/20 15:07:48 jer Exp $
+
+  20 May 2013; Jeroen Roovers <jer@gentoo.org> -files/nut-17.12-makefile.patch,
+  -files/nut-18.7-fltk-linking.patch, -nut-18.5.ebuild, -nut-18.7.ebuild:
+  Old.
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> nut-18.8.ebuild:
   Stable for ppc, wrt bug #470088
diff --git a/app-misc/nut/files/nut-17.12-makefile.patch b/app-misc/nut/files/nut-17.12-makefile.patch
deleted file mode 100644
index 22eca16c6979..000000000000
--- a/app-misc/nut/files/nut-17.12-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-18.7-fltk-linking.patch b/app-misc/nut/files/nut-18.7-fltk-linking.patch
deleted file mode 100644
index bd35c4276d71..000000000000
--- a/app-misc/nut/files/nut-18.7-fltk-linking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.5.ebuild b/app-misc/nut/nut-18.5.ebuild
deleted file mode 100644
index 8e9d12fcb8a1..000000000000
--- a/app-misc/nut/nut-18.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.5.ebuild,v 1.4 2013/02/10 17:14:02 ago 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-18.7.ebuild b/app-misc/nut/nut-18.7.ebuild
deleted file mode 100644
index cbacb1173b5e..000000000000
--- a/app-misc/nut/nut-18.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.7.ebuild,v 1.1 2013/04/09 04:35:05 radhermit Exp $
-
-EAPI=5
-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"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fltk-linking.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
-}
-
-src_install() {
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-}