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

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 9 insertions, 70 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/Manifest b/net-libs/miniupnpc/Manifest
index 177b1410f164..83a430a1209c 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -3,8 +3,7 @@ AUX 0004-Move-minixml-validation-test-to-check-target.patch 822 RMD160 633cd250d
 AUX miniupnpc-Respect-LDFLAGS.patch 968 RMD160 54847e0996a08649c817c3265074660593c2c037 SHA1 56219da899959b22ac6a7c94b276f2d536fd87d2 SHA256 f522b3ab1745bb0ad000cac493ef453bfa6113b321f3544b7059f093d698fd29
 DIST miniupnpc-1.4.20100609.tar.gz 50390 RMD160 75b9b147a6595da1f0336a946ece56412ca5ea38 SHA1 470c7ecd2b2c5c4c79fae4e632e52c02e0bd35f0 SHA256 f2708b8a98bb996ce0bb6dbc91b9f13c7796290f3996093ebdcc82e173c33f0e
 DIST miniupnpc-1.4.20101209.tar.gz 51900 RMD160 ff499bc5fff246aa6215122199d3fdd885c4fd2e SHA1 2b2b817a1923bf05a5e2723f0ab5cbe884825eaf SHA256 a5ceb09e3d0e7d61c80565e318827d031c808d2b7181835295b00af5a8864d35
-EBUILD miniupnpc-1.4.20100609-r1.ebuild 1521 RMD160 d7073503dbed9d5e86e587e46b58a0969157df2e SHA1 7ad6930a3e3125caf894b8cf8b104713cb6d799d SHA256 98d8296fee664fb0e7164ff1e2f21d0d8236fa53148b03b8faaecb67bd354344
-EBUILD miniupnpc-1.4.20100609.ebuild 1470 RMD160 75e3e4cf4f1c9c0e551fefc6fa4dbd8a2f5f34c8 SHA1 f46b4f936fde796bf9dffa372c0e96410abc5562 SHA256 25560a5a8a75f19c62d1e9a067cbff3ac81ca40c44f31d455377193188a1752d
+EBUILD miniupnpc-1.4.20100609-r1.ebuild 1513 RMD160 9c62425d988c9e1e265c660c89a20a5afbdbcdd9 SHA1 273760efec8b063289c126e73476593a7109725c SHA256 27533316f29675d7fc38fdc52d3fe63c796b14c030683996a366be3f58c8b2b5
 EBUILD miniupnpc-1.4.20101209.ebuild 1311 RMD160 8ffd9d8f1ca61af651ba514409320f8cdd59fb21 SHA1 07ae6efc514890777395e81eb5448cf759203bb7 SHA256 f5d030b3545d424eae53bb6b9e6a4cdb08c8a003ae7936f9f61246ad34df4a30
-MISC ChangeLog 1209 RMD160 764f99f128345f2174145337122b41de5136a242 SHA1 067bd73474a777418acf84b79c84a50036d54aa4 SHA256 e31e83848d6cc54fb936cc167ad79a5b0d1dbf402b06c5cadcc6e948570fed2b
+MISC ChangeLog 1391 RMD160 d1be57858bf2cc47bba91f3659c4db65be42f7b0 SHA1 c78eb955db2849743f3309f3442b95264841d9c9 SHA256 26054f4002b8324d7ec920768a33762b63831899ac12718dd822fa288d2f3ea6
 MISC metadata.xml 418 RMD160 57cd3ee3cec2a418323823d0c5ab8f3e56722dcb SHA1 6d59a27ff76532516274b82fa8e53f8145d37fdc SHA256 d20ee611ec1a7073b0727710cea00748d46a4934f91cd2da852c5bce286ba1be
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
-}