Drop old patches.

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

5 files changed, 13 insertions, 118 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/Manifest b/net-libs/miniupnpc/Manifest
index f00f2b6b23f4..bb1ae91e7e9d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0003-Move-non-used-and-non-installed-test-executables-to-.patch 1202 RMD160 845f3c63a0a59ac80025c19f0fe5ffdc9f1791e0 SHA1 d9be9dff0b1796b08c2441cf1eae011cad4cb473 SHA256 a89e30f8f422f924c627403eb7fc0511ad7e637d4efe56116f39ecfb8eeb5893
-AUX 0004-Move-minixml-validation-test-to-check-target.patch 822 RMD160 633cd250dce2ff1c08290ecbd737ff77eacf9a4f SHA1 0f31ad648274a6c8d8fb928d8a72e86562e1e828 SHA256 e884a6c3a7d855be57d4774277a437c50efa5817e4a84142606ed332a0f0a5e6
-AUX miniupnpc-Respect-LDFLAGS.patch 968 RMD160 54847e0996a08649c817c3265074660593c2c037 SHA1 56219da899959b22ac6a7c94b276f2d536fd87d2 SHA256 f522b3ab1745bb0ad000cac493ef453bfa6113b321f3544b7059f093d698fd29
 DIST miniupnpc-1.5.tar.gz 53309 RMD160 8989965305c56ac89011db7cdaf8955f4bb95eba SHA1 53ceae5515a547fed28b93bd5abba517586b0b3e SHA256 440f0e64e92c92c6624f49d21cf8279b9c05afe99261e4add357b2ee2828a957
 DIST miniupnpc-1.6.tar.gz 66454 RMD160 d86b75b331a3fb5525c71708548f311977c0598f SHA1 ef8f2edb17f2e7c5b8dc67ee80a65c199d823e0a SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994
 EBUILD miniupnpc-1.5.ebuild 1299 RMD160 dbefefe7a90d25ee2a1d86d04a28c36b46d8ac08 SHA1 8323043236a5981fd7e6f4fb3e94e449c55b401b SHA256 ad7976db72f6e4aea02c6328ed455bca8d3e5a5727bf333daaf34d7ac3d59e85
 EBUILD miniupnpc-1.6.ebuild 1426 RMD160 92329dc9f8ec468f5ff27237efd7f824dbf70af5 SHA1 2c623c5cdbbd98dccad24549f1ca3cf144bf2a44 SHA256 cf2d37edb2fc19105167bab6316ac1f1aa9734afa59e8f9b8cfc97877ab9df0e
-MISC ChangeLog 1927 RMD160 176839452fbcd5c7dd9305f27c74595b50ffbc23 SHA1 dda17fc04fa5a50c19bbbb64c64839fb7b183a82 SHA256 ae968d26ab97f922c0606df18b464bffeeb20b901609a106643dcf25e8a6b2f0
+MISC ChangeLog 2180 RMD160 340ab73b9ebfcc81551b264a0666da858baa68fb SHA1 4c5bb5fd0e0a60a4be0b5571647410cf9dd403a5 SHA256 2be183b55bc9777889574f5014f40e2b423dd4f8a34c83a89f54977e9422c59e
 MISC metadata.xml 418 RMD160 57cd3ee3cec2a418323823d0c5ab8f3e56722dcb SHA1 6d59a27ff76532516274b82fa8e53f8145d37fdc SHA256 d20ee611ec1a7073b0727710cea00748d46a4934f91cd2da852c5bce286ba1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4vKB4ACgkQfXuS5UK5QB22jQP+PIscyGyWwO2JQWNGcLiILGkE
-nYBJeWMFSISCy2ug4ewhHs3crt0HWONfc/fwEgF1M/cm3r4+Z2WCtODuJ3Kp3Q/1
-sUkvKLNv+CLX63Zl88Q/NzkheTsFLDrfxaej14a1op73zx8ubyNzgJJ92J25ges9
-gKC64+xfEkusImOB33E=
-=hWQA
+iJwEAQEIAAYFAk4vKJYACgkQfXuS5UK5QB246AQAg35KYVgRl2RBMc6XdWY+gd6F
+H4QoOtvPirGHDTCmyrpkIPqBFpir64c/AdxJIhhafDDa5mraR2TvvKGnpS6J5J8M
+1N9ymoNblXH5lWqrDFJm1CA87UM2ewf1nELwMp8rGMw7iJHVUtaeKXMgAznhPmIY
+M3GMLcXSb9SwG5n16U4=
+=QsCM
 -----END PGP SIGNATURE-----
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