Version bump, drop ancient.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
index ddbda56dd017ad76f5445d8862052ddc2ed88e65..45de58129fd9810d48601958b003e651367a31eb 100644 (file)
--- 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/Manifest b/net-libs/miniupnpc/Manifest
index c640c51db2cec999393ae491126d92e4fbdf6df3..f00f2b6b23f433d4c9473483392f5c24ebb57509 100644 (file)
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0003-Move-non-used-and-non-installed-test-executables-to-.patch 1202 RMD160 845f3c63a0a59ac80025c19f0fe5ffdc9f1791e0 SHA1 d9be9dff0b1796b08c2441cf1eae011cad4cb473 SHA256 a89e30f8f422f924c627403eb7fc0511ad7e637d4efe56116f39ecfb8eeb5893
 AUX 0004-Move-minixml-validation-test-to-check-target.patch 822 RMD160 633cd250dce2ff1c08290ecbd737ff77eacf9a4f SHA1 0f31ad648274a6c8d8fb928d8a72e86562e1e828 SHA256 e884a6c3a7d855be57d4774277a437c50efa5817e4a84142606ed332a0f0a5e6
 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
 DIST miniupnpc-1.5.tar.gz 53309 RMD160 8989965305c56ac89011db7cdaf8955f4bb95eba SHA1 53ceae5515a547fed28b93bd5abba517586b0b3e SHA256 440f0e64e92c92c6624f49d21cf8279b9c05afe99261e4add357b2ee2828a957
-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
+DIST miniupnpc-1.6.tar.gz 66454 RMD160 d86b75b331a3fb5525c71708548f311977c0598f SHA1 ef8f2edb17f2e7c5b8dc67ee80a65c199d823e0a SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994
 EBUILD miniupnpc-1.5.ebuild 1299 RMD160 dbefefe7a90d25ee2a1d86d04a28c36b46d8ac08 SHA1 8323043236a5981fd7e6f4fb3e94e449c55b401b SHA256 ad7976db72f6e4aea02c6328ed455bca8d3e5a5727bf333daaf34d7ac3d59e85
-MISC ChangeLog 1721 RMD160 e9ee1cda5ca31417a4261efc31ce9de6a9f3363c SHA1 bbe1e82d87819c6a247115b8c2e5828a98decf41 SHA256 8dd2410e9a3227a7bbca0b2655f7003e59a1fa94ee73834d4556fb917c51d567
+EBUILD miniupnpc-1.6.ebuild 1426 RMD160 92329dc9f8ec468f5ff27237efd7f824dbf70af5 SHA1 2c623c5cdbbd98dccad24549f1ca3cf144bf2a44 SHA256 cf2d37edb2fc19105167bab6316ac1f1aa9734afa59e8f9b8cfc97877ab9df0e
+MISC ChangeLog 1927 RMD160 176839452fbcd5c7dd9305f27c74595b50ffbc23 SHA1 dda17fc04fa5a50c19bbbb64c64839fb7b183a82 SHA256 ae968d26ab97f922c0606df18b464bffeeb20b901609a106643dcf25e8a6b2f0
 MISC metadata.xml 418 RMD160 57cd3ee3cec2a418323823d0c5ab8f3e56722dcb SHA1 6d59a27ff76532516274b82fa8e53f8145d37fdc SHA256 d20ee611ec1a7073b0727710cea00748d46a4934f91cd2da852c5bce286ba1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3cHGwACgkQkKaRLQcq0GKOpwCgmxKRgVGvo8irkgCXAOWhkLoa
-tGgAn2eDvMkbgaiYu4TFbi/JM/hQiMhM
-=4Bv9
+iJwEAQEIAAYFAk4vKB4ACgkQfXuS5UK5QB22jQP+PIscyGyWwO2JQWNGcLiILGkE
+nYBJeWMFSISCy2ug4ewhHs3crt0HWONfc/fwEgF1M/cm3r4+Z2WCtODuJ3Kp3Q/1
+sUkvKLNv+CLX63Zl88Q/NzkheTsFLDrfxaej14a1op73zx8ubyNzgJJ92J25ges9
+gKC64+xfEkusImOB33E=
+=hWQA
 -----END PGP SIGNATURE-----

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 (file)
index 6eb63b7..0000000
--- 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
similarity index 80%
rename from net-libs/miniupnpc/miniupnpc-1.4.20101209.ebuild
rename to net-libs/miniupnpc/miniupnpc-1.6.ebuild
index 38f5310b0548f9042702131f9df9436a56de1073..917127d981385023e05de5bcc438d9ca52068b45 100644 (file)
--- 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