Remove old.

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

4 files changed, 20 insertions, 104 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/Manifest b/app-misc/nut/Manifest
index f3b6830b9ef8..c5040fb2e23a 100644
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX nut-16.12-makefile.patch 1643 RMD160 0fb7d388e5441c2acc0da37cc0754482ef1ae94f SHA1 5eee2e43ccd710da3dd47c101215bd35293eec12 SHA256 7db652a27c038ad3608d6352bb4ee1098f0a6bcf8f4ff700ed43e76bce65bbb9
-AUX nut-16.5-build-fixes.patch 1512 RMD160 ecaed7a6f641b28f15366a4b1f5c5a7f36cb2ce5 SHA1 54603045464fe290d5020c5da3bc95d2c19f7449 SHA256 daddb486d989ed4fa656ea85e170212b4f25bbdcf05c8d1242b2f3376ce1aa5f
-DIST nut-16.9.tar.gz 1267995 RMD160 c0f0556f325f4e94ca386fbfd4142af888c489dc SHA1 6ccc77784519bda5cfbdcfcad70ba58652a31366 SHA256 901dd52a7e488af03837c9c7a17cd1eddbaa54f485a097a165c2ff01a9c22f97
 DIST nut-17.4.tar.gz 1315621 RMD160 d8333e4448cc71b1b4bfb85e6ba1b36d7a2a4b4e SHA1 31e090a01ee182ce24c1703eb79b544f6da1f4ad SHA256 d6b9b12c2b318173a03e9211c3724ba5091516934dc3bd6727a2de21292f9153
-EBUILD nut-16.9.ebuild 962 RMD160 d8b0f6d0ed5d9ba03e03f7fa8fb32bf05e69f1d8 SHA1 27c01e0b141ee83030713246660063ccb5aea178 SHA256 cf3af2a49d9f566c6e9ff22ae53803aaac7f6aa667bfc181059f9b55abe50be0
 EBUILD nut-17.4.ebuild 942 RMD160 ce91d3ad2f6fd7412825c8d976fea6c0c6e77b3c SHA1 ed00a609b3fed82918275c3a787c68b1bfa2555e SHA256 554795aff64956bf4562a1b3edcc8efa306e629b3671a2180ade9e7a2776726e
-MISC ChangeLog 4700 RMD160 ecc89a777ce30884c616d3a3ad985054a350b23b SHA1 8fd3a5ee7835fc5fbf56432efdb6ddb3a8e52560 SHA256 5f053d452be8082b3e57c76c9e6ae41d1150644ea2c9b80efd18958725ff577f
+MISC ChangeLog 4822 RMD160 49f5771067b9892bb40f605c88b00b238575ab5e SHA1 5fc16fdd659d6e8bd0184abad719eb3b6ab01001 SHA256 5837c68814cc33476704080ea817f7da546bfbe2f563cf8f28fe2bc2cd50d313
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPSCCfAAoJEEqz6FtPBkyjh14IAKdpLWTpaikSjxqZKo0xBDFX
+xixVNIlofLfqc83Tl+mgib99q92QRVV4Nd6SkX1aYltGnmrM8GqzoMPvt0xZwgDK
+k48L/3ANo1DdVRH4oNMLMLJYSJoZ+XQyUPIhObcfihuW9tOqVQovL8uZAqiH3QgK
+5DkctGk/WMvgaUF9lAuj2nNWHfwS9zbymy4O6n9QijAunbSmvwgD+LMA3QBJotV/
+RBxn2GtKEAT2I97jO7iPbvZQPFcVQxvunil9VSiy1QsE5nBMgclMqTfBtR4xXF9I
+aJvwtzrxJtio/RI7j2QN/booJQgOEmP1ZrgL1khJY2rdz6f94AAc5h8w3+VVo2M=
+=xBsp
+-----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
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
-
-}