Bumping to 1.8 and removing old versions and left over files

Package-Manager: portage-2.2.0_alpha161/cvs/Linux i686
Manifest-Sign-Key: 0x15AE484C

6 files changed, 18 insertions, 146 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index cc564d690f60..f7744d02d57c 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/miniupnpd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.30 2012/12/31 11:04:21 gurligebis Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.31 2013/02/08 19:00:04 gurligebis Exp $
+
+*miniupnpd-1.8 (08 Feb 2013)
+
+  08 Feb 2013; <gurligebis@gentoo.org> -files/miniupnpd-1.3-Makefile_fix.diff,
+  -miniupnpd-1.7.ebuild, -miniupnpd-1.8_pre20121005.ebuild,
+  +miniupnpd-1.8.ebuild, -files/miniupnpd-nf_nat-fix.diff:
+  Bumping to 1.8 and removing old versions and left over files
 
 *miniupnpd-1.8_pre20121005 (31 Dec 2012)
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 0d1d880fbb68..11bb64c6effd 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX miniupnpd-1.3-Makefile_fix.diff 330 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5 SHA512 4064cb044ac441c2ef91b0653e6b82b4292fb03b2b065411c1cd7fe8d961ecc48179686c17f8bc805265f8544f86365a7ef019a6535065cb910d32c373dfea3a WHIRLPOOL 3e5e801b58e23e08a2a91c770eda50e1b31d1aaeab0a2fc10a18afdea5c061ce5cbe78bf427a743f10698499814f484467bb2f167a00ad3fb1828d97eafc41e8
 AUX miniupnpd-conf.d 41 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3 SHA512 81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7 WHIRLPOOL 1e7a01c6d9ae398f418fafd9d1fb23842d999635d34ed567b4b21b23e1119e43aba3fae40ea8834e179372fbb94bc74371dd37eb0e99420fa0503810ecfb9088
 AUX miniupnpd-init.d 629 SHA256 2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643 SHA512 a25b2a444cde623fbdbe6fb26c544614cceb2cc1262a0409f40286f4c69b70ba1c05e55815552a12b0624b16ddd48d3e424dad18b278ff9da04bac335feb1d45 WHIRLPOOL 4de02748e8430803a891cc99f5c06601e1a316eca1082ea1ad43e296c9268c40e56a77d557d0ce2a8f7ee395ee0c5d598f2752d90c4e7e9982c197f5714e877f
-AUX miniupnpd-nf_nat-fix.diff 1784 SHA256 370eefe9a81e3dc17e1a41adbcb085bd496f1a41d929bcfd26638b7b2e3fb96c SHA512 3137751d462bd13db4ec10af3dca3d11155f3c3e6e903f027f5ff172f24e397595a291bedbce6a5b0bd50f60f41b0b8269e2863761a8afe4c7c2c3c45b63b3ed WHIRLPOOL 448a6c01873c610ff524dddb94f6591d471fde05d73d13b74da2d175e235a21045260007d413b4a52e1349741ddd3ff63589ed810557c644c168e8e888bf0c57
-DIST miniupnpd-1.7.20121005.tar.gz 144393 SHA256 5b8b8163fc578f6acb923b62002b38f071ff68fc178922dc0ff2410490ec6a0e SHA512 80287ff41ad9d1a436f8813aaa7bcc8f909851a040f359928ee94e82c566fddccd1bd112481a8612efc0556d0cb6a91c79d15e61056c4a59af88f7a65c1e8502 WHIRLPOOL a6ad3378089566720aea19fe79315b2f885d74b11556066b1ec43f7eb0a2ab1cc73c6cdb6019b03ccd884a400aba08060e0aaadab1995605972063e4b0f41054
-DIST miniupnpd-1.7.tar.gz 138047 SHA256 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74 SHA512 9d217f798c32990daf3d0e41d9d0a917788a56dca63b2102f0397948bd87e8844c17fd51ac6bcd71d423a5ae9d80605ae27bb22d54a4a5000352c95a0547e6f5 WHIRLPOOL a4ec24140593e85c81a343ad30f75ab75ddfae20f53eb50fc40ce9ad3a15cc70bf7033d53a8a474cc4ae1ef80634ba0a93de40424f4fa60c3010588e6d690e20
-EBUILD miniupnpd-1.7.ebuild 1526 SHA256 823695bb1598a6d204b819ac738176861f069edf518f1acd2465b95fdecf74eb SHA512 9bd661fddac5111dd6ab51003028a03a0e0970dc7c53e384d92a51b707452527941ea72c7d0459153cf75d187be9ffa68431bfdbfc6a626408751653341d298b WHIRLPOOL 462f615da6ff03e545faf79b9c3735bbd19c4748996dee521bd308b87f7fdeb5af72315d5df60335f9d6bc59da99750f15569309eb8215e6ad06231369ce6a22
-EBUILD miniupnpd-1.8_pre20121005.ebuild 1598 SHA256 aa32f661a653cbaa1cce9dc6ebeae9d9fe68805a7797241854b7df6a18b9c188 SHA512 e936f25d94cf38b91ca21a3086795ebda0aaee7fd87e663d770aff08bee4b51eb974f98580affacb9d4166c0a5670b5dd35cbda6665a3f304cb3d41c47695b2a WHIRLPOOL eeef4aaae55281eab8c0711e4d4e99f4658af6504b24501031493aa1f80f399b3bde837687d2a6e189b68ee4e832144089a56463a0f3d082d7ae23548f7a08db
-MISC ChangeLog 6959 SHA256 8c0ca0381bb75930cb9499ddc452bf8cb6dbe5a37ddcb6a638e8e9aa92af51a4 SHA512 5ef6fd65e21f428c4eabecff926615f625aec673eb71a82473216ed900973a783d91c56077225f02df8c387d03f603295f677d4bcb3b90ce4b9787d3a8d7b77f WHIRLPOOL d160599841bba2066ea385df58b5a8e47bef3697f372ab0356a8b489e5ebb058ead4bd52db5501395eb9c756e40e167e5cc8fa56ed1f2f9aea79864ba0e689ac
+DIST miniupnpd-1.8.tar.gz 146679 SHA256 e453a9225a2883e759d09e15c51bb0265b8a019d1132434131e6929fef0076bb SHA512 29103718dfecd49e5ff74187051054820f569b9d4a472a3f76898db5c74684b7af34d5f937b14692b5a4a27fd1efc851841c437bd153e37aa5879ecae36aa401 WHIRLPOOL a0240df1d9770e199c04c5d1c3f8400b498c4b25957e319806532200569171d948eafa76be6871d8366f10344b2b79da1f9686b746e5cb1d3d7c8e85bce84e06
+EBUILD miniupnpd-1.8.ebuild 1577 SHA256 00c19fcd404b4d9fd793f0167f683cf080af015706f5a87404585218b0d48689 SHA512 1eebe8b97ec4348ee29b25f155f365bf359ab4c53c17bb7e997ad1e23e8805221be314bdfe65512f33416879178b2778a7ab84ed7f1cb2440539e49595f57e4b WHIRLPOOL 61b3fe958b8deb293c4c3f106b4f6a6ecdf5db6a71fada2f78e60ea3cc4b44afb605a7899110ecd2afb984f76b920aacd343a1c3470d1b1558f774258f516369
+MISC ChangeLog 7251 SHA256 44c63e0d9df543fed693e076f47fb7d649c612c958c4d8e75bd9f7d96e563f05 SHA512 8600ce27c7b0bcb9c79fca7f49feaf4bf1246d99765f9c3090cca333f6c6bf1f74c3c3f5999ff903544f738a81e84accb0c168d81e36e3c01b7a5fa458f2ea7b WHIRLPOOL 0ebcb681016e35f48b6a4b7477c049bd2995e3846b410f6c01ba45500291cebc7f5757f8bfe575f5668bf8d32ca8371af18fcf2d053d522157415a17b485b408
 MISC metadata.xml 380 SHA256 cbfddfa590d65e994e3e3c45bdfa0f4d94cb2b446f5cd8815ed93cd1d7fcf727 SHA512 937b31ef4f1881a4e252aec0f7a1064b5151b0a5f8e77f5861c70f3ea2b308f94746ed5409aeb15080070fde56dacc362f1b6b10216a60b79f330854f63e793b WHIRLPOOL 0c387658aa3f54ebc27b813de32899804a8c7d148c02cc1b512d4dd6d838137f45a7b968c700b31e6accd52d203c84e92c7879979386b1c11bf9ca73e0f3eda6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDhcTUACgkQsR7PQhRXYEnEHwCfcaPHOvuBc6aTmot2kFp5mAEQ
-MhIAmgNul7fNQ+dtJGD8bMuq/lYbWx8k
-=NsJr
+iEYEAREIAAYFAlEVSvgACgkQsR7PQhRXYEkz+QCfUAzrgV0SsfXAOmrnl5tED2BE
++w4An0GISq8kss8vPW8mDpCLLkHw7Iva
+=LNb1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff b/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
deleted file mode 100644
index 5c5a232b5cdc..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2009-04-23 11:43:02.000000000 +0000
-+++ Makefile	2009-04-23 11:43:16.000000000 +0000
-@@ -59,6 +59,8 @@ LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
- endif
- endif
- 
-+CFLAGS := $(CFLAGS) -DIPTABLES_143
-+
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
- 
- EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
diff --git a/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff b/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff
deleted file mode 100644
index 95f3b0f90903..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naurp netfilter/iptcrdr.c netfilter.new/iptcrdr.c
---- netfilter/iptcrdr.c	2011-06-22 20:34:51.000000000 +0000
-+++ netfilter/iptcrdr.c	2011-07-29 19:26:50.703120526 +0000
-@@ -29,7 +29,7 @@
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
- #define LIST_POISON2  ((void *) 0x00200200 )
- 
--#include <net/netfilter/nf_nat.h>
-+#include "tiny_nf_nat.h"
- #define ip_nat_multi_range	nf_nat_multi_range
- #define ip_nat_range		nf_nat_range
- #define IPTC_HANDLE		struct iptc_handle *
-@@ -38,7 +38,7 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #include <linux/netfilter_ipv4/ip_nat.h>
- #else
--#include <linux/netfilter/nf_nat.h>
-+#include "tiny_nf_nat.h"
- #endif
- #define IPTC_HANDLE		iptc_handle_t
- #endif
-diff -Naurp netfilter/tiny_nf_nat.h netfilter.new/tiny_nf_nat.h
---- netfilter/tiny_nf_nat.h	1970-01-01 00:00:00.000000000 +0000
-+++ netfilter/tiny_nf_nat.h	2011-07-29 19:26:26.895119616 +0000
-@@ -0,0 +1,36 @@
-+/* Only what miniupnpd needs, until linux-libc-dev gains nf_nat.h */
-+
-+#ifndef TINY_NF_NAT_H
-+#define TINY_NF_NAT_H
-+
-+#include <linux/types.h>
-+
-+#define IP_NAT_RANGE_MAP_IPS 1
-+#define IP_NAT_RANGE_PROTO_SPECIFIED 2
-+#define IP_NAT_RANGE_PROTO_RANDOM 4
-+#define IP_NAT_RANGE_PERSISTENT 8
-+
-+union nf_conntrack_man_proto {
-+	__be16 all;
-+	struct { __be16 port; } tcp;
-+	struct { __be16 port; } udp;
-+	struct { __be16 id;   } icmp;
-+	struct { __be16 port; } dccp;
-+	struct { __be16 port; } sctp;
-+	struct { __be16 key;  } gre;
-+};
-+
-+struct nf_nat_range {
-+	unsigned int flags;
-+	__be32 min_ip, max_ip;
-+	union nf_conntrack_man_proto min, max;
-+};
-+
-+struct nf_nat_multi_range_compat {
-+	unsigned int rangesize;
-+	struct nf_nat_range range[1];
-+};
-+
-+#define nf_nat_multi_range nf_nat_multi_range_compat
-+
-+#endif /*TINY_NF_NAT_H*/
diff --git a/net-misc/miniupnpd/miniupnpd-1.7.ebuild b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
deleted file mode 100644
index 3e7f8cf47988..000000000000
--- a/net-misc/miniupnpd/miniupnpd-1.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.7.ebuild,v 1.1 2012/06/03 16:26:12 gurligebis Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PV=1.7
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-firewall/iptables-1.4.6"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	sys-apps/lsb-release"
-
-src_prepare() {
-	mv Makefile.linux Makefile
-	sed -i \
-		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
-		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
-		-e "s/CFLAGS += -ansi/#CFLAGS += -ansi/g" \
-		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
-		-e 's/genuuid||//' \
-		Makefile || die
-	sed -i \
-		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
-		netfilter/iptcrdr.c || die
-
-	emake config.h
-
-	sed -i \
-		-e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \
-		config.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	einstall PREFIX="${D}" STRIP="true" || die "einstall failed"
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild b/net-misc/miniupnpd/miniupnpd-1.8.ebuild
index 1d399db5f77d..e7af42990755 100644
--- a/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild,v 1.1 2012/12/31 11:04:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8.ebuild,v 1.1 2013/02/08 19:00:04 gurligebis Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
 
-MY_PV=1.7.20121005
+MY_PV=1.8
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="MiniUPnP IGD Daemon"