create log directory; fix ebuild wrong doings; 0.9.9-r1 stable on x86; bump to latest experimental version

(Portage version: 2.0.51.19)

4 files changed, 42 insertions, 3 deletions

diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r1
index 9d4bc473464f..9d4bc473464f 100644
--- a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r1
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5
new file mode 100644
index 000000000000..04e4e66df51b
--- /dev/null
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5
@@ -0,0 +1 @@
+MD5 bf7c0038765bdc97acd5eb726fa74f7f ntlmaps-0.9.9.5.tar.gz 61013
diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.5-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.5-gentoo.patch
new file mode 100644
index 000000000000..6aae9efe8b73
--- /dev/null
+++ b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.5-gentoo.patch
@@ -0,0 +1,37 @@
+diff -Nru ntlmaps-0.9.9.5.orig/__init__.py ntlmaps-0.9.9.5/__init__.py
+--- ntlmaps-0.9.9.5.orig/__init__.py	2005-06-10 06:49:35.000000000 +0300
++++ ntlmaps-0.9.9.5/__init__.py	2005-07-03 11:07:15.434273296 +0300
+@@ -22,8 +22,7 @@
+ 
+ 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.5.orig/main.py ntlmaps-0.9.9.5/main.py
+--- ntlmaps-0.9.9.5.orig/main.py	2005-06-16 13:03:15.000000000 +0300
++++ ntlmaps-0.9.9.5/main.py	2005-07-03 11:07:15.435273144 +0300
+@@ -18,17 +18,17 @@
+ # Free Software Foundation, Inc.,
+ # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ #
+-import __init__
+-
+ import sys
+ 
++sys.path.append('/usr/lib/ntlmaps')
++
+ import server, config, config_affairs
+ 
+ 
+ #--------------------------------------------------------------
+ # config affairs
+ # look for default config name in lib/config.py
+-conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))
++conf = config.read_config('/etc/ntlmaps/server.cfg')
+ 
+ conf['GENERAL']['VERSION'] = '0.9.9.5'
+ 
diff --git a/net-proxy/ntlmaps/files/ntlmaps.init b/net-proxy/ntlmaps/files/ntlmaps.init
index 8cf3288a0db0..b56d01b9a66c 100644
--- a/net-proxy/ntlmaps/files/ntlmaps.init
+++ b/net-proxy/ntlmaps/files/ntlmaps.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/files/ntlmaps.init,v 1.1 2005/04/22 19:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/files/ntlmaps.init,v 1.2 2005/07/03 08:57:13 mrness Exp $
 
 PID_FILE="/var/run/ntlmaps.pid"
 
@@ -13,8 +13,9 @@ start() {
 	ebegin "Starting ntlmaps"
 	touch ${PID_FILE}
 	chown nobody:nogroup ${PID_FILE}
-	start-stop-daemon --quiet --start --background --exec /usr/bin/python \
-		--make-pidfile --pidfile ${PID_FILE} --chuid nobody -- /usr/bin/ntlmaps < /dev/null && \
+	cd /var/log/ntlmaps && \
+		start-stop-daemon --quiet --start --background --exec /usr/bin/python \
+			--make-pidfile --pidfile ${PID_FILE} --chuid nobody -- /usr/bin/ntlmaps < /dev/null && \
 		sleep 1
 	eend $?
 }