Split the Python module into separate dev-python/miniupnpc. Bump EAPI, cleanup.

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

3 files changed, 26 insertions, 31 deletions

diff --git a/net-libs/miniupnpc/ChangeLog b/net-libs/miniupnpc/ChangeLog
index 190e5a45a254..8519f17dde12 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.14 2011/08/09 13:34:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/ChangeLog,v 1.15 2011/08/09 17:47:19 mgorny Exp $
+
+*miniupnpc-1.6-r1 (09 Aug 2011)
+
+  09 Aug 2011; Michał Górny <mgorny@gentoo.org> -miniupnpc-1.6.ebuild,
+  +miniupnpc-1.6-r1.ebuild:
+  Split the Python module into separate dev-python/miniupnpc. Bump EAPI,
+  cleanup.
 
   09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> miniupnpc-1.6.ebuild:
   Marked ~ppc64 wrt #377513
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 37fdc78b25e3..bfc1cdd1609a 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST miniupnpc-1.5.tar.gz 53309 RMD160 8989965305c56ac89011db7cdaf8955f4bb95eba SHA1 53ceae5515a547fed28b93bd5abba517586b0b3e SHA256 440f0e64e92c92c6624f49d21cf8279b9c05afe99261e4add357b2ee2828a957
 DIST miniupnpc-1.6.tar.gz 66454 RMD160 d86b75b331a3fb5525c71708548f311977c0598f SHA1 ef8f2edb17f2e7c5b8dc67ee80a65c199d823e0a SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994
 EBUILD miniupnpc-1.5.ebuild 1306 RMD160 8f426c9e7e5dbef6b94f730bbe7ad5637084407b SHA1 bd57608e6f962df66168b074596dc185d93943c2 SHA256 5d45e04f3c620acbc205b42ddfcda33fe0da4367c9a36960e77f694e80e3f528
-EBUILD miniupnpc-1.6.ebuild 1442 RMD160 1de66e44d02239ab629fd2b64865fc1ea0a4cc9a SHA1 82b06476211ee4678a2bd9a9cec43e50fd930d35 SHA256 562e9f38025e93e3a164fe6b3965afc2dc00e4eea77b6018cb38707a6d7f2efb
-MISC ChangeLog 2509 RMD160 ce0de53c81f702cdb00e0f0022dd4c05d51dd195 SHA1 5da63a3bca8944e61a33088f26ff5896188da185 SHA256 0eeafb44de20f8b0af443a725326002a558b2cff0a7919d10c199f50a44e4cec
+EBUILD miniupnpc-1.6-r1.ebuild 1206 RMD160 2d1fb597ab2031261ea6fc4f7f2822e42a3d02b2 SHA1 afe83810e727059bd1fa31e13dc37ed1730a250f SHA256 96854b492e60c8dab9d83e0d93783ef4605d90093442fccb497d1a203d3589bb
+MISC ChangeLog 2724 RMD160 6bf91325a507781873d43a7ab66f75dff71f32ac SHA1 73c3566b6ae85cd9b991d4e2192e1c23c181f619 SHA256 b7629f06ad63bd1a217afcc66e53e9d838eda6c72233bd936e4ced341591a417
 MISC metadata.xml 418 RMD160 57cd3ee3cec2a418323823d0c5ab8f3e56722dcb SHA1 6d59a27ff76532516274b82fa8e53f8145d37fdc SHA256 d20ee611ec1a7073b0727710cea00748d46a4934f91cd2da852c5bce286ba1be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5BN3IACgkQIiMqcbOVdxSuUQP+PbckNY8DPQcQhje2aKIMKN6+
-KPvx4mpjO12THP+Q8HG4/H7LfMznz8t6H1J1I5hJbdQS3Za9teLn8tJ7O9YweHIK
-7uz1hodGDw62ca2nt6VqeBwavE8N8B7XMuNQB1J6Eh2UgY/5kF36UQ1l+fkc3Buy
-7Rn6sJ+0yXrSSiY/zHs=
-=ht21
+iJwEAQEIAAYFAk5BcwgACgkQfXuS5UK5QB3UPAP/Stk3egWmPHB28ilelxNq8d7/
+dehQ90blipbyYcK1evZMTd0ynvKuLJeZ61yX4WsLlM/mjRHqe5h3qYCw3qmNPUdN
+twSsid864ymc5xSIdwFyDckt80eYKtmEaiQlwosmVvsTuuDVgU0MTNfnpiJZmsCM
+sUWipR3S83VUpwAr8G0=
+=maMg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/miniupnpc/miniupnpc-1.6.ebuild b/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
index 04795471097d..e56eb9513d6d 100644
--- a/net-libs/miniupnpc/miniupnpc-1.6.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
@@ -1,13 +1,10 @@
 # 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.6.ebuild,v 1.3 2011/08/09 13:34:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild,v 1.1 2011/08/09 17:47:19 mgorny Exp $
 
-EAPI=3
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI=4
 
-inherit base distutils eutils toolchain-funcs
+inherit base toolchain-funcs
 
 DESCRIPTION="UPnP client library and a simple UPnP client"
 HOMEPAGE="http://miniupnp.free.fr/"
@@ -16,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="python static-libs"
+IUSE="static-libs"
 
 DEPEND="sys-apps/lsb-release"
 RDEPEND=""
@@ -34,35 +31,26 @@ src_prepare() {
 			-e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
 			-i Makefile || die
 	fi
-
-	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
-
-	use python && distutils_src_compile
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	emake \
 		PREFIX="${D}" \
 		INSTALLDIRLIB="${D}usr/$(get_libdir)" \
-		install || die
-
-	dodoc README Changelog.txt || die
-	doman man3/* || die
+		install
 
-	use python && distutils_src_install
+	dodoc README Changelog.txt
+	doman man3/*
 }
 
 pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
+	elog "Please note that the python counterpart has been moved to"
+	elog "	dev-python/miniupnpc"
 }