Bumping to 1.7

Package-Manager: portage-2.2.0_alpha108/cvs/Linux i686

4 files changed, 15 insertions, 68 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index c087794fe6ec..71f98b6dc3fc 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2012/05/13 17:48:41 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.27 2012/06/03 16:26:12 gurligebis Exp $
+
+*miniupnpd-1.7 (03 Jun 2012)
+
+  03 Jun 2012; <gurligebis@gentoo.org> -miniupnpd-1.6.ebuild,
+  -miniupnpd-1.7_pre20120509.ebuild, +miniupnpd-1.7.ebuild:
+  Bumping to 1.7
 
 *miniupnpd-1.7_pre20120509 (13 May 2012)
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 47c07f2d45b1..3a1db6d6c90c 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -5,16 +5,14 @@ AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7
 AUX miniupnpd-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
 AUX miniupnpd-init.d 629 RMD160 0016f17563068c16d3a762dfcc3a151a7b911ec4 SHA1 6ab26ea633ab3d6d8d403f6b1c60b6c8f5e307ac SHA256 2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643
 AUX miniupnpd-nf_nat-fix.diff 1784 RMD160 3d7a420653a76f4adab6307e3f775ef673a4f930 SHA1 51ecbe42771a258b4436b16f05c16cfcd537d864 SHA256 370eefe9a81e3dc17e1a41adbcb085bd496f1a41d929bcfd26638b7b2e3fb96c
-DIST miniupnpd-1.6.20120509.tar.gz 137147 RMD160 42d2513646ae0395e04d20211d849255c56e2873 SHA1 9f5a5f844d443a7c9f6281cdeacbc9f0d79c826b SHA256 148964bc508abcf1736a6e6b4e525bc56c0d35a588661636420fdd283347b36a
-DIST miniupnpd-1.6.tar.gz 124917 RMD160 11ef50d02983d19e7d6eaa07eea5eb77f76cce04 SHA1 d8469ba820487fcbf5260556ec2974dd9db69f40 SHA256 a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
-EBUILD miniupnpd-1.6.ebuild 1510 RMD160 bee61271d7abaa94abd9577f4c3c21f3138ac1ce SHA1 63eab69df78efea9c21477f4f215b9bd2adc5220 SHA256 1779e26b4138b1e30b62dfb167f27a2e66fe0fae0d8a6014b2356d6fa73eb021
-EBUILD miniupnpd-1.7_pre20120509.ebuild 1547 RMD160 207d4a8637836e233f5930def6316877c31d79a0 SHA1 26f0da086def0b0b10e505d8fb2cdf628b7fd6c8 SHA256 90628220b89f4109de55168c2dcc40370c99d2ae9821f34e52b7870c85a229ea
-MISC ChangeLog 6333 RMD160 bb8a90f06b82625ed7fb8c3fc124d5ab7f10cb76 SHA1 3b787bda71137d462f0a0173e36f00adfcef1013 SHA256 95de8fba28ef4f9cafd97deb21de0b2e44d8cbf9e907f5f64978eba57f332a79
+DIST miniupnpd-1.7.tar.gz 138047 RMD160 fbf6cf43e177d3ef82c00b44653f0570ca0a723e SHA1 79e9e5e45b5492e0dd350e54e32f0fdbaf381fa8 SHA256 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74
+EBUILD miniupnpd-1.7.ebuild 1526 RMD160 059019001a7efd337490de8236057a01fc7f4f8b SHA1 daf798339ce15a7b3340aa1b5f3c5972f6f673d7 SHA256 823695bb1598a6d204b819ac738176861f069edf518f1acd2465b95fdecf74eb
+MISC ChangeLog 6503 RMD160 82c03d0b13171550e083cec195ee1ee637f66f90 SHA1 c7388fb69ba16690e2936ae83ade498e5a4f9221 SHA256 79e6801878c8d8a9426b90148334f98f5cf7e1aa9a870c0902f20d850e6b0b15
 MISC metadata.xml 380 RMD160 216ad6e31a386ad173222d81fd8996300dac7be6 SHA1 b8cbf8d00a419cdf74b782f3ae3968f8f9abf637 SHA256 cbfddfa590d65e994e3e3c45bdfa0f4d94cb2b446f5cd8815ed93cd1d7fcf727
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+v85gACgkQsR7PQhRXYEkPegCeIrpWXRJ/CNS8wGlyNKNPUZUf
-fBkAnjVOsd/7+47M5QX1WWPuM3Xpt/Ol
-=j20Y
+iEYEARECAAYFAk/LkDEACgkQsR7PQhRXYEk3nwCfap0ww4HvJe6zCBzTkvZxgay+
+0GQAn1Kldi4arplNpLPQzAZxvE9US7ix
+=vJJZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/miniupnpd-1.6.ebuild b/net-misc/miniupnpd/miniupnpd-1.6.ebuild
deleted file mode 100644
index 27eff0178dd8..000000000000
--- a/net-misc/miniupnpd/miniupnpd-1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.6.ebuild,v 1.1 2011/07/29 19:36:58 gurligebis Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PV=1.6
-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
-	sys-apps/lsb-release
-	>=sys-kernel/linux-headers-2.6.31"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	"
-
-src_prepare() {
-	mv Makefile.linux Makefile
-	epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
-	epatch "${FILESDIR}/${PN}-nf_nat-fix.diff"
-	sed -i \
-		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
-		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/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
-}
-
-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.7_pre20120509.ebuild b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
index a52b0aadded0..3e7f8cf47988 100644
--- a/net-misc/miniupnpd/miniupnpd-1.7_pre20120509.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
@@ -1,11 +1,11 @@
 # 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_pre20120509.ebuild,v 1.1 2012/05/13 17:48:41 gurligebis Exp $
+# $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.6.20120509
+MY_PV=1.7
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="MiniUPnP IGD Daemon"