Revbump with QA fixes and updated gentoo patch thanks to Monjoie <corentin.labbe@geomatys.com>. Bug #315877

(Portage version: 2.2_rc95/cvs/Linux x86_64)

3 files changed, 43 insertions, 37 deletions

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index 77d3fd7c8917..e03db41f614c 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/ntlmaps
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.15 2008/03/14 10:41:10 phreak Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.16 2010/10/14 09:26:35 hwoarang Exp $
+
+*ntlmaps-0.9.9.6-r1 (14 Oct 2010)
+
+  14 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  -ntlmaps-0.9.9.6.ebuild, +ntlmaps-0.9.9.6-r1.ebuild,
+  files/ntlmaps-0.9.9.6-gentoo.patch:
+  Revbump with QA fixes and updated gentoo patch thanks to Monjoie
+  <corentin.labbe@geomatys.com>. Bug #315877
 
   14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Christian Andreetta (satya, #48841) from metadata.xml.
diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
index d94d3db0adc2..bda0843e6c9f 100644
--- a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
+++ b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
@@ -1,20 +1,19 @@
-diff -Nru ntlmaps-0.9.9.6.orig/__init__.py ntlmaps-0.9.9.6/__init__.py
---- ntlmaps-0.9.9.6.orig/__init__.py	2005-06-10 06:49:35.000000000 +0300
-+++ ntlmaps-0.9.9.6/__init__.py	2006-09-20 14:52:58.000000000 +0300
-@@ -22,8 +22,7 @@
- 
- import os, sys
+--- __init__.py.old	2010-10-06 16:03:54.000000000 +0200
++++ __init__.py	2010-10-06 16:05:38.000000000 +0200
+@@ -20,10 +20,3 @@
+ # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ #
  
+-import os, sys
+-
 -ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
 -ntlmaps_libdir = ntlmaps_dir + '/lib'
-+ntlmaps_dir = '/usr/lib/ntlmaps'
- sys.path.append(ntlmaps_libdir)
- 
- del os, sys
-diff -Nru ntlmaps-0.9.9.6.orig/main.py ntlmaps-0.9.9.6/main.py
---- ntlmaps-0.9.9.6.orig/main.py	2005-07-05 06:13:43.000000000 +0300
-+++ ntlmaps-0.9.9.6/main.py	2006-09-20 14:52:58.000000000 +0300
-@@ -18,17 +18,17 @@
+-sys.path.append(ntlmaps_libdir)
+-
+-del os, sys
+--- main.py.old	2010-10-06 16:26:57.000000000 +0200
++++ main.py	2010-10-06 16:27:29.000000000 +0200
+@@ -18,8 +18,6 @@
  # Free Software Foundation, Inc.,
  # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  #
@@ -22,11 +21,8 @@ diff -Nru ntlmaps-0.9.9.6.orig/main.py ntlmaps-0.9.9.6/main.py
 -
  import sys
  
-+sys.path.append('/usr/lib/ntlmaps')
-+
  import server, config, config_affairs
- 
- 
+@@ -28,7 +26,7 @@
  #--------------------------------------------------------------
  # config affairs
  # look for default config name in lib/config.py
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
index 4018607eb2f8..6e9d9e8c9dee 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
@@ -1,8 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 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.ebuild,v 1.4 2007/11/04 08:15:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild,v 1.1 2010/10/14 09:26:35 hwoarang Exp $
 
-inherit eutils
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils python
 
 DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
 HOMEPAGE="http://ntlmaps.sourceforge.net/"
@@ -13,17 +19,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE=""
 
-DEPEND="dev-lang/python"
-
 pkg_setup() {
 	enewgroup ntlmaps
 	enewuser ntlmaps -1 -1 -1 ntlmaps
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	python_convert_shebangs 2 main.py
 
 	#stupid windoze style
 	cd "${S}"
@@ -31,14 +34,18 @@ src_unpack() {
 }
 
 src_install() {
+	installation() {
+		insinto $(python_get_sitedir)
+		doins lib/*.py || die
+	}
+	python_execute_function installation
+
 	# exes ------------------------------------------------------------------
 	exeinto /usr/bin
 	newexe main.py ntlmaps || die "failed to install main program"
-	insinto /usr/lib/ntlmaps
-	doins lib/* || die "failed to install python modules"
 	# doc -------------------------------------------------------------------
-	dodoc doc/*.txt
-	dohtml doc/*.{gif,htm}
+	dodoc doc/*.txt || die
+	dohtml doc/*.{gif,htm} ||die
 	# conf ------------------------------------------------------------------
 	insopts -m0640 -g ntlmaps
 	insinto /etc/ntlmaps
@@ -57,8 +64,3 @@ pkg_preinst() {
 		chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg"
 	fi
 }
-
-pkg_prerm() {
-	einfo "Removing python compiled bytecode"
-	rm -f "${ROOT}"/usr/lib/ntlmaps/*.py?
-}