[gentoo-commits] repo/gentoo:master commit in: net-libs/libnatpmp/, net-libs/libnatpmp/files/

[David Seifert]

commit:     c421b0d9db8603cc18aa108d8135aba47ced77e2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:50:35 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:50:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c421b0d9

net-libs/libnatpmp: Remove old

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-libs/libnatpmp/Manifest                        |  3 --
 net-libs/libnatpmp/files/remove-static-lib.patch   | 44 ------------------
 .../libnatpmp/files/respect-FLAGS-20130911.patch   | 53 ----------------------
 net-libs/libnatpmp/files/respect-FLAGS.patch       | 40 ----------------
 net-libs/libnatpmp/files/respect-libdir.patch      | 19 --------
 net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild    | 28 ------------
 net-libs/libnatpmp/libnatpmp-20130911.ebuild       | 28 ------------
 net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild    | 29 ------------
 8 files changed, 244 deletions(-)

diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 8f0ebf0d711..3e9e60233fc 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,4 +1 @@
-DIST libnatpmp-20110808.tar.gz 17762 BLAKE2B f9559dd2d90b4dc662b5569e2a941415f075c97964988c4d06db64fce6f2446d32e2231f46120498fb8b6d9b7ecc9e83932ef1fec9dace23145f702c24a96af5 SHA512 1bb4304319a0570602f19e4bf5ea42505de259f4f9d659ffc3f54faf67717e2e28563a50b747556bf5ee279fed6fe92ee798cddec233b7d3b97f3aad697729e2
-DIST libnatpmp-20130911.tar.gz 18744 BLAKE2B c24a0cb158d9d40049292bfcae8d919bbe8ec6ea63dfd59ba8a8f2c85a9eaaebb96cf4f70f2c40c456169f63a8c2aff4736d952899d15ad7e7f687e13a4e77b3 SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d
-DIST libnatpmp-20140401.tar.gz 23302 BLAKE2B 85f2b1045ad3b8b122bc9db6a12d332642e11bd62cd5fa264e141bb75d2dae2920678ce8c240009272593f81f385277d7f911298667896babbc43c8393a8963b SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2
 DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09

diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
deleted file mode 100644
index dae64601b9c..00000000000
--- a/net-libs/libnatpmp/files/remove-static-lib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- libnatpmp-20110715/Makefile
-+++ libnatpmp-20110715/Makefile
-@@ -33,7 +32,7 @@
- 
- HEADERS = natpmp.h
- 
--EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-+EXECUTABLES = testgetgateway natpmpc-shared
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -45,9 +44,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 $@
- 
-@@ -55,11 +54,10 @@
- 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
-@@ -76,7 +74,6 @@
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
- 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
--	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
- 
- testgetgateway:	testgetgateway.o getgateway.o
- 

diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
deleted file mode 100644
index df36e2d4a4a..00000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
---- libnatpmp-20130911.orig/Makefile	2013-09-10 16:15:06.000000000 -0400
-+++ libnatpmp-20130911/Makefile	2013-09-12 13:20:29.191447842 -0400
-@@ -5,7 +5,7 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- VERSION = $(shell cat VERSION)
- 
-@@ -22,6 +22,7 @@
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+GENTOO_CFLAGS := $(CFLAGS)
- CFLAGS = -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
-@@ -52,6 +53,8 @@
- endif
- endif
- 
-+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
-+
- HEADERS = natpmp.h
- 
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-@@ -144,19 +147,19 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- $(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 $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
- endif
- 
- 

diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
deleted file mode 100644
index 0338d1810e6..00000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -4,13 +4,12 @@
- # 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
--CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+CFLAGS := -Wall -DENABLE_STRNATPMPERR $(CFLAGS)
- 
- LIBOBJS = natpmp.o getgateway.o
- 
-@@ -75,16 +75,18 @@
- testgetgateway:	testgetgateway.o getgateway.o
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-+
-+getgateway.o natpmp.o: CFLAGS += -fPIC
- 
- $(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/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
deleted file mode 100644
index 07f5d87ddf9..00000000000
--- a/net-libs/libnatpmp/files/respect-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -6,6 +6,7 @@
- # (c) 2007-2011 Thomas Bernard
- # http://miniupnp.free.fr/libnatpmp.html
- 
-+GENTOO_LIBDIR ?= lib
- OS = $(shell uname -s)
- CC ?= gcc
- INSTALL = install
-@@ -36,7 +37,7 @@
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
--INSTALLDIRLIB = $(INSTALLPREFIX)/lib
-+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule

diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
deleted file mode 100644
index 7974ad84d71..00000000000
--- a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="sparc"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS.patch
-	epatch "${FILESDIR}"/respect-libdir.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib.patch
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}

diff --git a/net-libs/libnatpmp/libnatpmp-20130911.ebuild b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
deleted file mode 100644
index 87dec82d0ac..00000000000
--- a/net-libs/libnatpmp/libnatpmp-20130911.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.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
-}

diff --git a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
deleted file mode 100644
index 3b9b7619953..00000000000
--- a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
-	tc-export CC
-}
-
-src_install() {
-	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}