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

Package-Manager: portage-2.0.51.19

8 files changed, 120 insertions, 16 deletions

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index 76fce063c952..73c9ac04962f 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/ntlmaps
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.2 2005/04/23 13:07:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.3 2005/07/03 08:57:13 mrness Exp $
+
+*ntlmaps-0.9.9.5 (03 Jul 2005)
+*ntlmaps-0.9.9-r1 (03 Jul 2005)
+
+  03 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/ntlmaps-0.9.9.5-gentoo.patch, files/ntlmaps.init,
+  -ntlmaps-0.9.9.ebuild, +ntlmaps-0.9.9-r1.ebuild, +ntlmaps-0.9.9.5.ebuild:
+  Add log directory and promote 0.9.9 version to stable on x86. Bump version
+  to the latest experimental version (#97340).
 
   22 Apr 2005; Alin Nastac <mrness@gentoo.org> :
   Rename category & herd www-proxy to net-proxy
diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
index 6afdabdb82dd..e2a3806b955d 100644
--- a/net-proxy/ntlmaps/Manifest
+++ b/net-proxy/ntlmaps/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3f2d9c89335388f691f9215d6ca70d93 ntlmaps-0.9.9.ebuild 1249
-MD5 40eae3923c71d9063255e2aaeb7bc147 ChangeLog 1886
+MD5 e702909d7558427edeb579280c234561 ntlmaps-0.9.9-r1.ebuild 1352
+MD5 3299fc41dc2862f119e8dd3146ebc9c5 ntlmaps-0.9.9.5.ebuild 1414
+MD5 306b375e9b49709207fb4eb8fe633293 ChangeLog 2255
 MD5 a65bb25d95d5de35ca0f2727b1e8e7c9 metadata.xml 489
-MD5 df9bb5492b4f9048ae67337eb13524c2 files/ntlmaps.init 697
+MD5 8986ad96cdc57db74518ce83fc0fbfee files/ntlmaps.init 725
 MD5 89d940c1a5df0a265c10c920498f1a03 files/ntlmaps-0.9.9-gentoo.patch 1165
-MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9 64
+MD5 f80ba6da97c9b6ecf9589fcbe791abf6 files/digest-ntlmaps-0.9.9.5 66
+MD5 2c97eb4d589e8a9f9e9968be5aa96daa files/ntlmaps-0.9.9.5-gentoo.patch 1183
+MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9-r1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCakiVI1lqEGTUzyQRAg1XAKCCATAiPFHcf9Dg3oX0x9mYpzdM5QCgnbeH
-EGa4bcg44Uh6A5yJd8z9kXg=
-=xsju
+iD8DBQFCx6h8NSP4Vda7IdsRAvBjAJsHPDgeLd5x7bqDjwZUHLO+2m13JQCeNedE
+OROK/jpbHT1YSzJPcD2MbyM=
+=QpzV
 -----END PGP SIGNATURE-----
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 $?
 }
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9-r1.ebuild
index 8242b0ad63a9..7800ceb7b61c 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.1 2005/04/22 19:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9-r1.ebuild,v 1.1 2005/07/03 08:57:13 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~s390 ~x86 ~ppc64 ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86"
 IUSE=""
 
 DEPEND="dev-lang/python"
@@ -21,7 +21,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
-	sed -i -e 's/\r//' server.cfg *.txt doc/*.txt # stupid windoze style
+	#stupid windoze style
+	sed -i -e 's/\r//' lib/*.py server.cfg *.txt doc/*.{txt,htm}
 }
 
 src_install() {
@@ -37,9 +38,12 @@ src_install() {
 	insinto /etc/${PN}
 	doins server.cfg
 	newinitd ${FILESDIR}/${PN}.init ${PN}
+	# log -------------------------------------------------------------------
+	diropts -m 0770 -g nobody
+	keepdir /var/log/${PN}
 }
+
 pkg_prerm() {
-	einfo "Removing init script and python compiled bytecode"
+	einfo "Removing python compiled bytecode"
 	rm -f /usr/lib/${PN}/*.py?
-	rm -f /etc/init.d/${PN}
 }
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild
new file mode 100644
index 000000000000..772c73a3bb28
--- /dev/null
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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.5.ebuild,v 1.1 2005/07/03 08:57:13 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
+HOMEPAGE="http://ntlmaps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/python"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	#stupid windoze style
+	sed -i -e 's/\r//' lib/*.py server.cfg doc/*.{txt,htm}
+}
+
+src_install() {
+	# exes ------------------------------------------------------------------
+	exeinto /usr/bin
+	newexe main.py ${PN} || die "failed to install main program"
+	insinto /usr/lib/${PN}
+	doins lib/* || die "failed to install python modules"
+	# doc -------------------------------------------------------------------
+	dodoc *.txt doc/*.txt
+	dohtml doc/*
+	# conf ------------------------------------------------------------------
+	insinto /etc/${PN}
+	doins server.cfg
+	newinitd ${FILESDIR}/${PN}.init ${PN}
+	# log -------------------------------------------------------------------
+	diropts -m 0770 -g nobody
+	keepdir /var/log/${PN}
+}
+
+pkg_prerm() {
+	einfo "Removing python compiled bytecode"
+	rm -f /usr/lib/${PN}/*.py?
+}