Remove older unstable

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 6 insertions, 154 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index e3fbfb419d63..cde7098c31c8 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnatpmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/ChangeLog,v 1.27 2014/04/02 14:06:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/ChangeLog,v 1.28 2014/04/02 14:10:55 blueness Exp $
+
+  02 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  -files/remove-static-lib-20120821.patch, -files/respect-FLAGS-20120821.patch,
+  -libnatpmp-20120821.ebuild:
+  Remove older unstable
 
 *libnatpmp-20140401 (02 Apr 2014)
 
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20120821.patch b/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
deleted file mode 100644
index 89be32d6c414..000000000000
--- a/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
---- libnatpmp-20120821.orig/Makefile	2012-08-26 20:33:51.000000000 -0400
-+++ libnatpmp-20120821/Makefile	2012-08-26 20:36:53.000000000 -0400
-@@ -24,7 +24,6 @@
- 
- OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
- 
--STATICLIB = libnatpmp.a
- ifeq ($(OS), Darwin)
-   SHAREDLIB = libnatpmp.dylib
-   SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
-@@ -38,7 +37,7 @@
- 
- HEADERS = natpmp.h
- 
--EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-+EXECUTABLES = testgetgateway natpmpc-shared
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -47,9 +46,9 @@
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule
- 
--all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
-+all: $(SHAREDLIB) $(EXECUTABLES)
- 
--pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
-+pythonmodule: libnatpmpmodule.c setup.py
- 	python setup.py build
- 	touch $@
- 
-@@ -57,18 +56,17 @@
- 	python setup.py install
- 
- clean:
--	$(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB)
-+	$(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB)
- 	$(RM) pythonmodule
- 	$(RM) -r build/ dist/
- 
- depend:
- 	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
- 
--install:	$(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
-+install:	$(HEADERS) $(SHAREDLIB) natpmpc-shared
- 	$(INSTALL) -d $(INSTALLDIRINC)
- 	$(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
- 	$(INSTALL) -d $(INSTALLDIRLIB)
--	$(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
- 	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
- 	$(INSTALL) -d $(INSTALLDIRBIN)
- 	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-@@ -78,19 +76,12 @@
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
- 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
--	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
- 
- testgetgateway:	testgetgateway.o getgateway.o
- 
--natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
--
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
--$(STATICLIB):	$(LIBOBJS)
--	$(AR) crs $@ $?
--
- $(SHAREDLIB):	$(LIBOBJS)
- ifeq ($(OS), Darwin)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch b/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
deleted file mode 100644
index 7c7dc8607d2c..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
---- libnatpmp-20120821.orig/Makefile	2012-08-21 13:24:15.000000000 -0400
-+++ libnatpmp-20120821/Makefile	2012-08-26 20:22:40.000000000 -0400
-@@ -5,12 +5,13 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- 
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+GENTOO_CFLAGS := $(CFLAGS)
- CFLAGS = -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
-@@ -32,6 +33,8 @@
-   SONAME = $(SHAREDLIB).$(APIVERSION)
- endif
- 
-+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
-+
- HEADERS = natpmp.h
- 
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-@@ -79,19 +82,19 @@
- testgetgateway:	testgetgateway.o getgateway.o
- 
- natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- $(STATICLIB):	$(LIBOBJS)
- 	$(AR) crs $@ $?
- 
- $(SHAREDLIB):	$(LIBOBJS)
- ifeq ($(OS), Darwin)
--	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
- else
--	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^
- endif
- 
- # DO NOT DELETE
diff --git a/net-libs/libnatpmp/libnatpmp-20120821.ebuild b/net-libs/libnatpmp/libnatpmp-20120821.ebuild
deleted file mode 100644
index 8f9ffe454ab0..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20120821.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20120821.ebuild,v 1.3 2012/12/16 18:23:58 armin76 Exp $
-
-EAPI="4"
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="An alternative protocol to UPnP IGD specification"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
-	epatch "${FILESDIR}"/respect-libdir-${PV}.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-${PV}.patch
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}