Bumping to 1.7

(Portage version: 2.2.0_alpha108/cvs/Linux i686)

3 files changed, 9 insertions, 60 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/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"