amd64 stable, bug #349186, thank Agostino Sarubbo for testing. Drop old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 7 insertions, 67 deletions

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
index 2897d9c5940a..c5be875d5f61 100644
--- a/net-libs/miniupnpc/ChangeLog
+++ b/net-libs/miniupnpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/miniupnpc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.5 2010/12/20 18:51:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.6 2010/12/21 08:49:16 pva Exp $
+
+  21 Dec 2010; Peter Volkov <pva@gentoo.org> -miniupnpc-1.4.20100609.ebuild,
+  miniupnpc-1.4.20100609-r1.ebuild:
+  amd64 stable, bug #349186, thank Agostino Sarubbo for testing. Drop old.
 
   20 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   miniupnpc-1.4.20100609-r1.ebuild:
diff --git a/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild b/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
index 777ac857f37b..6eb63b7ffca5 100644
--- a/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild,v 1.2 2010/12/20 18:51:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild,v 1.3 2010/12/21 08:49:16 pva Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -15,7 +15,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="python static-libs"
 
 DEPEND="sys-apps/lsb-release"
diff --git a/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild b/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild
deleted file mode 100644
index 02620098611b..000000000000
--- a/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.4.20100609.ebuild,v 1.1 2010/09/15 08:40:36 pva Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-Respect-LDFLAGS.patch"
-	epatch "${FILESDIR}/0003-Move-non-used-and-non-installed-test-executables-to-.patch"
-	epatch "${FILESDIR}/0004-Move-minixml-validation-test-to-check-target.patch"
-
-	sed \
-		-e 's/^CFLAGS ?= -O -Wall /CFLAGS += /' \
-		-i Makefile
-
-	if use !static-libs; then
-		sed \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
-			-i Makefile
-	fi
-
-	use python && distutils_src_prepare
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	emake \
-		PREFIX="${D}" \
-		INSTALLDIRLIB="${D}usr/$(get_libdir)" \
-		install || die
-
-	dodoc README Changelog.txt || die
-	doman man3/* || die
-
-	use python && distutils_src_install
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}