Version bump, drop ancient.

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

3 files changed, 18 insertions, 73 deletions

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
index ddbda56dd017..45de58129fd9 100644
--- a/net-libs/miniupnpc/ChangeLog
+++ b/net-libs/miniupnpc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/miniupnpc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.9 2011/05/24 21:00:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.10 2011/07/26 20:47:08 mgorny Exp $
+
+*miniupnpc-1.6 (26 Jul 2011)
+
+  26 Jul 2011; Michał Górny <mgorny@gentoo.org>
+  -miniupnpc-1.4.20100609-r1.ebuild, -miniupnpc-1.4.20101209.ebuild,
+  +miniupnpc-1.6.ebuild:
+  Version bump, drop ancient.
 
   24 May 2011; Markus Meier <maekke@gentoo.org> miniupnpc-1.5.ebuild:
   x86 stable, bug #365341
diff --git a/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild b/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
deleted file mode 100644
index 6eb63b7ffca5..000000000000
--- a/net-libs/miniupnpc/miniupnpc-1.4.20100609-r1.ebuild
+++ /dev/null
@@ -1,67 +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-r1.ebuild,v 1.3 2010/12/21 08:49:16 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"
-
-DEPEND="sys-apps/lsb-release"
-RDEPEND=""
-
-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
-}
diff --git a/net-libs/miniupnpc/miniupnpc-1.4.20101209.ebuild b/net-libs/miniupnpc/miniupnpc-1.6.ebuild
index 38f5310b0548..917127d98138 100644
--- a/net-libs/miniupnpc/miniupnpc-1.4.20101209.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.4.20101209.ebuild,v 1.1 2010/12/20 13:54:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.6.ebuild,v 1.1 2011/07/26 20:47:08 mgorny Exp $
 
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
+EAPI=3
+SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="python? 2"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils eutils toolchain-funcs
+inherit base distutils eutils toolchain-funcs
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
@@ -22,6 +22,8 @@ DEPEND="sys-apps/lsb-release"
 RDEPEND=""
 
 src_prepare() {
+	base_src_prepare
+
 	sed \
 		-e 's/^CFLAGS ?= -O -Wall /CFLAGS += /' \
 		-i Makefile || die
@@ -36,6 +38,9 @@ src_prepare() {
 	use python && distutils_src_prepare
 }
 
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
 src_compile() {
 	emake CC=$(tc-getCC) || die