EAPI 5. Bump, prevent file collision by removing lib/utils.py. Fixes bug #351305.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 58 insertions, 41 deletions

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index 7e9e3c6933bb..c263869d3b53 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/ntlmaps
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.17 2010/10/15 21:44:40 arfrever Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.18 2013/04/19 20:33:58 tomwij Exp $
+
+*ntlmaps-0.9.9.6-r2 (19 Apr 2013)
+
+  19 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +ntlmaps-0.9.9.6-r2.ebuild,
+  -ntlmaps-0.9.9.6-r1.ebuild, ntlmaps-0.9.9-r2.ebuild:
+  EAPI 5. Bump, prevent file collision by removing lib/utils.py. Fixes bug
+  #351305.
 
   15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   ntlmaps-0.9.9.6-r1.ebuild:
@@ -122,4 +129,3 @@
 
   10 Jun 2004; satya@gentoo.org :
   New ebuild, as per bug #49958. Initscripts.
-
diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
index fa2438e78d91..a613d49fc50c 100644
--- a/net-proxy/ntlmaps/Manifest
+++ b/net-proxy/ntlmaps/Manifest
@@ -1,9 +1,23 @@
-AUX ntlmaps-0.9.9-gentoo.patch 1165 RMD160 8125e6dadaeba75038cb6d6e9927be49402c1bef SHA1 9c44bcc92ed885de63a6154a02f828472b19217d SHA256 a701ddee9384bdcecd0655cbed04a3a6320ca0c4de374805a9b9e1269edf21be
-AUX ntlmaps-0.9.9.6-gentoo.patch 985 RMD160 ae6a10fb3a9125489f4dac4d51c93351b5c04ba3 SHA1 60242cecff2195371a4add2c60a40201f284515c SHA256 4ac20e213a081d0cc76d205ca3d954dbd9eca12df9ebdd0606ffcd56fc2d3a34
-AUX ntlmaps.init 727 RMD160 0b1035e5b17276d7817f4aa9aef14245fb2f5be0 SHA1 e414e43c9baf229f99e39474ed1172a441c6d23b SHA256 5b1ca1b2978457b8c8f282036bc8a24b8d4723377f9de40a0e7d4d591fe5f2d4
-DIST ntlmaps-0.9.9.6.tar.gz 60760 RMD160 7d46394f0f975bda384bd9f82e2a11897fcb12ba SHA1 9d85271926d4682b9f4f7e76a44896790e8953c9 SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a
-DIST ntlmaps-0.9.9.tar.gz 55459 RMD160 95bb90f04ceb7696bfaa848e506e6b7d7f297f51 SHA1 0a71de7c0899aa6d35c62ea6974717baa9dae2ff SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1
-EBUILD ntlmaps-0.9.9-r2.ebuild 1812 RMD160 97b71cc7e3df066ccf89740de462fc59780e98f4 SHA1 530456cea146356101559a0caad5cb814beae115 SHA256 56807a4fbfe411898464e026600a3ef2f029e6b72896d476a9cf35c813e3583d
-EBUILD ntlmaps-0.9.9.6-r1.ebuild 1787 RMD160 97f1e9770bf74c01c02634bd9644f08f7ccfa63b SHA1 733e88f3e5da8c11f0bbf478f8a25c3f5e05110d SHA256 cf4810c13028efb063c95cb5bbf4ab9f5c73bb974c7d20528071c0917b4091fa
-MISC ChangeLog 4466 RMD160 88e6063fbb236e91ca7fa9d81fbe1b78e953e5ce SHA1 52f7eab2bacd6544b6363c476edb4d1260c08d4b SHA256 3be1dd9c46d7f9ea502b5e198e8c9d9d68fe51602ea0ae916df38495e5ed23af
-MISC metadata.xml 414 RMD160 3206521eef36edfa76ef449203e960a64c5893eb SHA1 151d7be64b05d970c58ba0f52007072a930c9d86 SHA256 5939687c17988204b099ca8a7b3951d60e1ff42831fd40acad61df41112ac193
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ntlmaps-0.9.9-gentoo.patch 1165 SHA256 a701ddee9384bdcecd0655cbed04a3a6320ca0c4de374805a9b9e1269edf21be SHA512 335b38f1d323959ff0f7b57cd3f68b7528e23e8e8086e8b366e39eed0293faf32d8f03b4f1bab45f5d70d530043eadd015dfb4adcdd1bc706ae87fca35c36112 WHIRLPOOL 25f88e1b82402d8c1ea4aba388fb9ad842c07cacbe8667591d31f962379bd95b58830dd9dc3eaf5ba6a3fa39cf953443fc6e984769ca69452ddc39d9ba78c708
+AUX ntlmaps-0.9.9.6-gentoo.patch 985 SHA256 4ac20e213a081d0cc76d205ca3d954dbd9eca12df9ebdd0606ffcd56fc2d3a34 SHA512 7f207aa160a01a4b5c11a95540bd07ee7adfed63e282b9dcfaf1a2ddd1566c679408a6e0dbe4b69bf1326f6f9d9b18cba3f96c4656cb94ebceb9f833e158c383 WHIRLPOOL bfa1fd26994108e3f0548048764304cbb484b435369665f708f1bd4db893c180a1f29c5f9ddfef6cdabc20e5ec4098f5c6e1e8d90e4d92cd58722dde09a1fdb9
+AUX ntlmaps.init 727 SHA256 5b1ca1b2978457b8c8f282036bc8a24b8d4723377f9de40a0e7d4d591fe5f2d4 SHA512 2b0f565f0bc44e922ca3b0a6118a2decee03512e1517a32cca76e21ea2b3e26534e345e0758077b6910dbb22d38da564838a38b885b37f77d60b447620f263a9 WHIRLPOOL f9867475a19c0f9fbd2c9249df5eb2967f0d7064dd643e31f7f8b446f163f8130c63b3c2e2da32b8f0bc6a7f6f8e07cf43dcc56efb7381d2482f6afdba4a6cec
+DIST ntlmaps-0.9.9.6.tar.gz 60760 SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a SHA512 0b0c80f3a32c523fdad47af2d0c7fa21d01124d014aafb2f7e9a00ba525685917b6c24572a25d5c294848f88fd6775a0e9c9e95014d91e35b86411c83f12adff WHIRLPOOL 66431212f20e5451992a2f788d7c8077dae95ee3cb97e956bd65862ce9c93fe2bea31e46cf34922fe5cbd99c6ea5780cfecd3fbadc128cbbd820c5c772f9371e
+DIST ntlmaps-0.9.9.tar.gz 55459 SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1
+EBUILD ntlmaps-0.9.9-r2.ebuild 1434 SHA256 91f4ba31957e417c33cd3875b1dbc375ea3dd10c55f9cea4794903407bb9145a SHA512 2951454ceb3dcd216fd89dfaf11387cd8b6c8011af9751e3495e6b3598a83bbefe5e78186c2dd83adb073acffcaf8adbb908f1ff20c9790649bce4e1aa0e48e7 WHIRLPOOL e046dd11ebad6dc189bec79c3d961d1be94f71f47a8ad575cb6f529d751bb26d699028b71139ad4e8974838260836ddaf6ca3f1f4b7bf5ea585222945073b52e
+EBUILD ntlmaps-0.9.9.6-r2.ebuild 1493 SHA256 f738eaf119b9141ba9a68b977f7c9f54b8116351b4a6ba9c41e8d35ccc6f3776 SHA512 ed0b69054439869bae6940572d36668b330dd473daf3baa60d8015800684d34d17fa738d9c50609c0f7003354256fab2d2cb5954ca8f4c54c73accb49b682a72 WHIRLPOOL 91e860f83b178c8798441b106a8d9e44c6e728324f7de8cf2a51c148add056376953b80c22d30a513be89066af17727a5120e347894b79b987e79d0fdd8be5cf
+MISC ChangeLog 4715 SHA256 ce6f284f2f1d40333566ad30615ceb514a314848a67b449e90cb1ce316b83f3b SHA512 407d2c38bf79a0000a474d4d5c0e387329628949d95627d15f0b6e80cda274af504f18e61756218bc27e6c92d2d9565225f70f24c08db899ee2199297bd790f7 WHIRLPOOL c3c22efa8f535ddd013dce820d591342e5ed2123e5a74cb6bfeda485d80eb3ce63637aeaf014a93c89664b3694bbe37612afa98840b338f447ab2cd4d6b386df
+MISC metadata.xml 414 SHA256 5939687c17988204b099ca8a7b3951d60e1ff42831fd40acad61df41112ac193 SHA512 7354787f5aa88181fc79a0fd869d88218e033a996184c6691e1a036b48a29d8ebc83a8788932d636139c3ea4575582182c5c73c82d9d23616541bf0df2097af2 WHIRLPOOL 83bc543b7dea83636f5d5185299b25d36f394a9e2607e16204e12dad19f3b28d26ed735d0ea5172cb3a3b9a47ad2974cc2ef72ab3e68db856ce0a2443788e67f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRcan3AAoJEJWyH81tNOV9+2EH/1gh/LI+B89HMn3GG9ijwwdH
+RVNTUQ5DQqnBycK30xPL76skegoifdac7jrLtXhUkTZSt9fQrTwuaWmhf2mAjY26
+h8Wsbqs+5bcypDX1ykIIHiq6WzSXS3qv+mzXBzomzaFyO1oxHR5eX6xuPqRSVT1S
+BT6e/Ddg21iBv77gp8F3GrP0t65f7JeI/POHqxNSq04xoJFnJJqlVDzE+GG9+nyV
+geHLinT+sFazObnf0xYjarXwyWRxji14bU03CFVOKRlNo9GomKTYBluIGeuB4bu4
+MKobkbcJCCx63o44XcJGOpWSufFs+oCATvM4PZywSpvI3z8kDL9G0jw5oDBpHpE=
+=vlnm
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
index 51ed5317533e..f196c5d47f28 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild,v 1.9 2008/02/28 20:22:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild,v 1.10 2013/04/19 20:33:58 tomwij Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -20,31 +22,26 @@ pkg_setup() {
 	enewuser ntlmaps -1 -1 -1 ntlmaps
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 
-	#stupid windoze style
-	cd "${S}"
-	sed -i -e 's/\r//' lib/*.py server.cfg *.txt doc/*.{txt,htm}
+	sed -i -e 's/\r//' lib/*.py server.cfg *.txt doc/*.{txt,htm} || die 'Failed to convert line endings.'
 }
 
 src_install() {
-	# exes ------------------------------------------------------------------
 	exeinto /usr/bin
-	newexe main.py ntlmaps || die "failed to install main program"
+	newexe main.py ntlmaps
 	insinto /usr/lib/ntlmaps
-	doins lib/* || die "failed to install python modules"
-	# doc -------------------------------------------------------------------
+	doins lib/*
+
 	dodoc *.txt doc/*.txt
 	dohtml doc/*
-	# conf ------------------------------------------------------------------
+
 	insopts -m0640 -g ntlmaps
 	insinto /etc/ntlmaps
 	doins server.cfg
 	newinitd "${FILESDIR}/ntlmaps.init" ntlmaps
-	# log -------------------------------------------------------------------
+
 	diropts -m 0770 -g ntlmaps
 	keepdir /var/log/ntlmaps
 }
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r2.ebuild
index 5760694cc343..10838bcfeb8b 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild,v 1.2 2010/10/15 21:44:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r2.ebuild,v 1.1 2013/04/19 20:33:58 tomwij Exp $
 
-EAPI=3
+EAPI=5
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS=1
@@ -17,10 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE=""
 
 pkg_setup() {
 	python_pkg_setup
+
 	enewgroup ntlmaps
 	enewuser ntlmaps -1 -1 -1 ntlmaps
 }
@@ -29,15 +29,16 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	python_convert_shebangs 2 main.py
 
-	#stupid windoze style
-	cd "${S}"
-	sed -i -e 's/\r//' lib/*.py server.cfg doc/*.{txt,htm}
+	sed -i -e 's/\r//' lib/*.py server.cfg doc/*.{txt,htm} || die 'Failed to convert line endings.'
 }
 
 src_install() {
+	# Bug #351305, prevent file collision.
+	rm "${S}"/lib/utils.py
+
 	installation() {
 		insinto $(python_get_sitedir)
-		doins lib/*.py || die
+		doins lib/*.py
 	}
 	python_execute_function installation
 
@@ -45,18 +46,17 @@ src_install() {
 	PYTHON_MODULES=(*.py)
 	popd > /dev/null
 
-	# exes ------------------------------------------------------------------
 	exeinto /usr/bin
-	newexe main.py ntlmaps || die "failed to install main program"
-	# doc -------------------------------------------------------------------
-	dodoc doc/*.txt || die
-	dohtml doc/*.{gif,htm} ||die
-	# conf ------------------------------------------------------------------
+	newexe main.py ntlmaps
+
+	dodoc doc/*.txt
+	dohtml doc/*.{gif,htm}
+
 	insopts -m0640 -g ntlmaps
 	insinto /etc/ntlmaps
 	doins server.cfg
 	newinitd "${FILESDIR}/ntlmaps.init" ntlmaps
-	# log -------------------------------------------------------------------
+
 	diropts -m 0770 -g ntlmaps
 	keepdir /var/log/ntlmaps
 }