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

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 35 insertions, 32 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/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
 }