Remove old.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

3 files changed, 5 insertions, 100 deletions

diff --git a/app-misc/nut/ChangeLog b/app-misc/nut/ChangeLog
index 50dcf8ef7c81..7e096e330a94 100644
--- a/app-misc/nut/ChangeLog
+++ b/app-misc/nut/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2012/02/24 19:33:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/ChangeLog,v 1.34 2012/02/24 23:43:14 radhermit Exp $
+
+  24 Feb 2012; Tim Harder <radhermit@gentoo.org>
+  -files/nut-16.5-build-fixes.patch, -nut-16.9.ebuild:
+  Remove old.
 
   24 Feb 2012; Brent Baude <ranger@gentoo.org> nut-17.4.ebuild:
   Marking nut-17.4 ppc for bug 404611
diff --git a/app-misc/nut/files/nut-16.5-build-fixes.patch b/app-misc/nut/files/nut-16.5-build-fixes.patch
deleted file mode 100644
index 98e16705de03..000000000000
--- a/app-misc/nut/files/nut-16.5-build-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/fltk/Makefile b/fltk/Makefile
-index 6e5f9d7..29cf098 100644
---- a/fltk/Makefile
-+++ b/fltk/Makefile
-@@ -1,18 +1,17 @@
- NUTDIR := \".nutdb\"
- FOODDIR := \"/usr/local/lib/nut\"
- EXECUTABLE := Nut
--LIBS := `fltk-config --ldstaticflags`
-+LIBS := `fltk-config --ldflags`
- 
--CFLAGS := `fltk-config --optim --cflags` -O3 -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic
--
--CXXFLAGS := $(CFLAGS)
-+CXXFLAGS += `fltk-config --optim --cxxflags` -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic
-+CFLAGS += `fltk-config --optim --cflags` -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic
- 
- SOURCE := $(wildcard *.c) $(wildcard *.cc)
- OBJS := $(patsubst %.c,%.o,$(patsubst %.cc,%.o,$(SOURCE)))
- CPPFLAGS := 
- 
- nut:	$(OBJS)
--	$(CXX) -s -o $(EXECUTABLE) $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
- 
- 
- deps:
diff --git a/app-misc/nut/nut-16.9.ebuild b/app-misc/nut/nut-16.9.ebuild
deleted file mode 100644
index 03aa0f790bb2..000000000000
--- a/app-misc/nut/nut-16.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-16.9.ebuild,v 1.5 2012/02/05 13:40:06 ranger 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="~alpha ~amd64 ~arm ppc x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/fltk: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
-
-}