diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-07-26 20:49:09 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-07-26 20:49:09 +0000 |
| commit | ba3cf155daa1d791198f3e755bc47c54472d48e7 (patch) | |
| tree | 017ff1300cf52a0f57047fdba0963d778fd6fe1f /net-libs/miniupnpc | |
| parent | Force proper variable usage. Just saw this in gekis overlay so adding to main... (diff) | |
| download | gentoo-2-ba3cf155daa1d791198f3e755bc47c54472d48e7.tar.gz gentoo-2-ba3cf155daa1d791198f3e755bc47c54472d48e7.tar.bz2 gentoo-2-ba3cf155daa1d791198f3e755bc47c54472d48e7.zip | |
Drop old patches.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/miniupnpc')
4 files changed, 7 insertions, 109 deletions
diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog index 45de58129fd9..2e525e0f8c79 100644 --- a/net-libs/miniupnpc/ChangeLog +++ b/net-libs/miniupnpc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/miniupnpc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.10 2011/07/26 20:47:08 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.11 2011/07/26 20:49:08 mgorny Exp $ + + 26 Jul 2011; Michał Górny <mgorny@gentoo.org> + -files/0003-Move-non-used-and-non-installed-test-executables-to-.patch, + -files/0004-Move-minixml-validation-test-to-check-target.patch, + -files/miniupnpc-Respect-LDFLAGS.patch: + Drop old patches. *miniupnpc-1.6 (26 Jul 2011) diff --git a/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch b/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch deleted file mode 100644 index dd73b134d459..000000000000 --- a/net-libs/miniupnpc/files/0003-Move-non-used-and-non-installed-test-executables-to-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 154d2f3e29e221e9bb66582ba5defa4c269d75bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Tue, 7 Sep 2010 22:48:13 +0200 -Subject: [PATCH 3/6] Move non-used and non-installed test executables to everything target. - ---- - Makefile | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 427315c..199be58 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ else - SONAME = $(SHAREDLIBRARY).$(APIVERSION) - endif - --EXECUTABLES = upnpc-static \ -- testminixml minixmlvalid testupnpreplyparse \ -+EXECUTABLES = upnpc-static -+EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \ - testigddescparse testminiwget - - TESTMINIXMLOBJS = minixml.o igd_desc_parse.o testminixml.o -@@ -89,10 +89,12 @@ FILESTOINSTALL := $(FILESTOINSTALL) $(SHAREDLIBRARY) - endif - - --.PHONY: install clean depend all installpythonmodule -+.PHONY: install clean depend all everything installpythonmodule - - all: validateminixml $(LIBRARY) $(EXECUTABLES) - -+everything: all $(EXECUTABLES_ADDTESTS) -+ - pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py - python setup.py build - touch $@ --- -1.7.2.2 - diff --git a/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch b/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch deleted file mode 100644 index 26627ae509bb..000000000000 --- a/net-libs/miniupnpc/files/0004-Move-minixml-validation-test-to-check-target.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5aafd1a45c10dc9c06cf3655ec488339d292e58f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Tue, 7 Sep 2010 22:50:37 +0200 -Subject: [PATCH 4/6] Move minixml validation test to 'check' target. - ---- - Makefile | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 199be58..85b9737 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,9 +89,12 @@ FILESTOINSTALL := $(FILESTOINSTALL) $(SHAREDLIBRARY) - endif - - --.PHONY: install clean depend all everything installpythonmodule -+.PHONY: install clean depend all check everything installpythonmodule \ -+ validateminixml - --all: validateminixml $(LIBRARY) $(EXECUTABLES) -+all: $(LIBRARY) $(EXECUTABLES) -+ -+check: validateminixml - - everything: all $(EXECUTABLES_ADDTESTS) - --- -1.7.2.2 - diff --git a/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch b/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch deleted file mode 100644 index c62a08a699a2..000000000000 --- a/net-libs/miniupnpc/files/miniupnpc-Respect-LDFLAGS.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bbd74061406e1972820c24982a39c4f1770d0ed5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Tue, 7 Sep 2010 22:34:20 +0200 -Subject: [PATCH 2/6] Respect LDFLAGS. - ---- - Makefile | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index af257a8..427315c 100644 ---- a/Makefile -+++ b/Makefile -@@ -141,16 +141,16 @@ $(LIBRARY): $(LIBOBJS) - - $(SHAREDLIBRARY): $(LIBOBJS) - ifeq ($(OS), Darwin) -- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ -+ $(CC) -dynamiclib $(LDFLAGS) -Wl,-install_name,$(SONAME) -o $@ $^ - else -- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ - endif - - upnpc-static: upnpc.o $(LIBRARY) $(LDLIBS) -- $(CC) -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ - - upnpc-shared: upnpc.o $(SHAREDLIBRARY) $(LDLIBS) -- $(CC) -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ - - testminixml: $(TESTMINIXMLOBJS) - --- -1.7.2.2 |