version bump; *nixize paths and filenames (#78197)

Package-Manager: portage-2.0.51-r15

10 files changed, 80 insertions, 100 deletions

diff --git a/www-proxy/ntlmaps/ChangeLog b/www-proxy/ntlmaps/ChangeLog
index 8b165feea5f9..0ec90fc3f853 100644
--- a/www-proxy/ntlmaps/ChangeLog
+++ b/www-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-proxy/ntlmaps
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ChangeLog,v 1.6 2005/01/09 09:12:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ChangeLog,v 1.7 2005/02/24 13:08:18 mrness Exp $
+
+*ntlmaps-0.9.9 (24 Feb 2005)
+
+  24 Feb 2005; Alin Nastac <mrness@gentoo.org> -files/ntlmaps-0.9.8.patch,
+  +files/ntlmaps-0.9.9-gentoo.patch, files/ntlmaps.init,
+  -ntlmaps-0.9.8-r1.ebuild, -ntlmaps-0.9.8.ebuild, +ntlmaps-0.9.9.ebuild:
+  Version bump. *nixize paths and filenames (#78197).
 
   09 Jan 2005; Markus Rothe <corsair@gentoo.org> ntlmaps-0.9.8-r1.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/www-proxy/ntlmaps/Manifest b/www-proxy/ntlmaps/Manifest
index 30221d1ae612..918ca203d843 100644
--- a/www-proxy/ntlmaps/Manifest
+++ b/www-proxy/ntlmaps/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c5151118373d441b5353a7443d979488 ntlmaps-0.9.8.ebuild 997
-MD5 6a3171f45b919d991f305b760e79ecff ntlmaps-0.9.8-r1.ebuild 1440
-MD5 59895241f680a6f6ce0fda621760bac3 ChangeLog 1409
+MD5 db0e12baa4527eeac5554dcbb9a5884a ChangeLog 1699
 MD5 4c9331a0ff24469d68f936c3cc4e34c6 metadata.xml 489
-MD5 09c33d72764e3407544b0045f7f1d965 files/ntlmaps.init 762
-MD5 547d2124c00f02458c472025ac835071 files/digest-ntlmaps-0.9.8-r1 57
-MD5 584fc4f03ea3e2cb11cf5d155a86fab0 files/ntlmaps-0.9.8.patch 358
-MD5 547d2124c00f02458c472025ac835071 files/digest-ntlmaps-0.9.8 57
+MD5 bb8f4e05a638f7b0be1e90ca32c6f601 ntlmaps-0.9.9.ebuild 1242
+MD5 89d940c1a5df0a265c10c920498f1a03 files/ntlmaps-0.9.9-gentoo.patch 1165
+MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9 64
+MD5 4ac59759588c1d0764a9dba7cb7bff23 files/ntlmaps.init 697
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCE8fmjiC39V7gKu0RAtRbAKDZBqfk7buUuS+Y3cwsCymo2d1VxgCbBPvW
-fgg0OtpuT1FsWR0+yo3h1Qk=
-=4pqu
+iD8DBQFCHdHTjiC39V7gKu0RAj7XAJ9bKpouhMEe8kmeDgqRlrcr/dq4yQCcDjqK
+Kh03jX9/gJQo/nB1X2y/g/U=
+=YD/N
 -----END PGP SIGNATURE-----
diff --git a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8 b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8
deleted file mode 100644
index 30f4a1cc413d..000000000000
--- a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a824547a0751ee356ca8b054f23fb212 aps098.tar.gz 50437
diff --git a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1 b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1
deleted file mode 100644
index 30f4a1cc413d..000000000000
--- a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a824547a0751ee356ca8b054f23fb212 aps098.tar.gz 50437
diff --git a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.9 b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.9
new file mode 100644
index 000000000000..9d4bc473464f
--- /dev/null
+++ b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.9
@@ -0,0 +1 @@
+MD5 02d0f83f499eaf988de4ffab2dfd3618 ntlmaps-0.9.9.tar.gz 55459
diff --git a/www-proxy/ntlmaps/files/ntlmaps-0.9.8.patch b/www-proxy/ntlmaps/files/ntlmaps-0.9.8.patch
deleted file mode 100644
index d61d81f4f33c..000000000000
--- a/www-proxy/ntlmaps/files/ntlmaps-0.9.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur /usr/ntlmaps/main.py /tmp/ntlmaps/main.py
---- main.py	2004-04-29 10:11:01.000000000 +0200
-+++ /tmp/ntlmaps/main.py	2004-04-30 12:49:23.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- import socket, thread, sys, getpass, string
- 
--sys.path.append('lib')
-+sys.path.append(sys.path[0]+'/lib')
- 
- import server, logger
- import config, ntlm_procs, config_affairs
diff --git a/www-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch b/www-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch
new file mode 100644
index 000000000000..02e90f2ccf9d
--- /dev/null
+++ b/www-proxy/ntlmaps/files/ntlmaps-0.9.9-gentoo.patch
@@ -0,0 +1,37 @@
+diff -Nru ntlmaps-0.9.9.orig/__init__.py ntlmaps-0.9.9/__init__.py
+--- ntlmaps-0.9.9.orig/__init__.py	2004-11-10 01:27:05.000000000 +0200
++++ ntlmaps-0.9.9/__init__.py	2005-02-24 13:07:56.601327735 +0200
+@@ -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.orig/main.py ntlmaps-0.9.9/main.py
+--- ntlmaps-0.9.9.orig/main.py	2005-02-01 04:45:02.000000000 +0200
++++ ntlmaps-0.9.9/main.py	2005-02-24 13:11:46.762545214 +0200
+@@ -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'
+ 
diff --git a/www-proxy/ntlmaps/files/ntlmaps.init b/www-proxy/ntlmaps/files/ntlmaps.init
index 6465e7faa5cb..8a1794179632 100644
--- a/www-proxy/ntlmaps/files/ntlmaps.init
+++ b/www-proxy/ntlmaps/files/ntlmaps.init
@@ -1,10 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/files/ntlmaps.init,v 1.3 2005/01/05 12:54:03 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/files/ntlmaps.init,v 1.4 2005/02/24 13:08:18 mrness Exp $
 
-MY_CMD="/usr/bin/python /usr/ntlmaps/main.py"
-MY_PID_FILE="/var/run/ntlmaps.pid"
+PID_FILE="/var/run/ntlmaps.pid"
 
 depend() {
 	need net
@@ -12,17 +11,16 @@ depend() {
 
 start() {
 	ebegin "Starting ntlmaps"
-	touch ${MY_PID_FILE}
-	chown nobody:nogroup ${MY_PID_FILE}
-	start-stop-daemon --quiet --start --background --exec ${MY_CMD} \
-		--make-pidfile --pidfile ${MY_PID_FILE} --chuid nobody -- \
-		-c /etc/conf.d/ntlmaps.cfg < /dev/null
-	sleep 1
+	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 && \
+		sleep 1
 	eend $?
 }
 stop() {
 	ebegin "Stopping ntlmaps"
-	start-stop-daemon --stop --quiet --pidfile ${MY_PID_FILE} && \
-		rm -f ${MY_PID_FILE}
+	start-stop-daemon --stop --quiet --pidfile ${PID_FILE} && \
+		rm -f ${PID_FILE}
 	eend $?
 }
diff --git a/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild b/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild
deleted file mode 100644
index c4d4768987af..000000000000
--- a/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild,v 1.6 2005/01/05 12:54:03 satya Exp $
-
-inherit eutils
-
-MY_P_URL="aps${PV//.}"
-DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
-HOMEPAGE="http://ntlmaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ntlmaps/${MY_P_URL}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~s390 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-1.5"
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.51"
-
-S=${WORKDIR}/${MY_P_URL}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
-}
-
-src_install() {
-	dodir /usr/${PN}/lib
-	exeinto /usr/${PN}
-	doexe main.py || die
-	insinto /usr/${PN}/lib
-	doins lib/* || die
-
-	dodoc Install.txt changelog.txt readme.txt research.txt
-	insinto /usr/share/doc/${P}/doc
-	doins doc/*
-
-	newconfd ${S}/server.cfg ${PN}.cfg
-	newinitd ${FILESDIR}/${PN}.init ${PN}
-}
diff --git a/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild b/www-proxy/ntlmaps/ntlmaps-0.9.9.ebuild
index 3d66896d7ae7..19de1239468d 100644
--- a/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild
+++ b/www-proxy/ntlmaps/ntlmaps-0.9.9.ebuild
@@ -1,50 +1,45 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild,v 1.2 2005/01/09 09:12:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ntlmaps-0.9.9.ebuild,v 1.1 2005/02/24 13:08:18 mrness Exp $
 
 inherit eutils
 
-MY_P_URL="aps${PV//.}"
-MY_P_VER="${PV/-r.*/}"
 DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
 HOMEPAGE="http://ntlmaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ntlmaps/${MY_P_URL}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~s390 ~x86 ~ppc64"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-1.5"
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.51"
-
-S=${WORKDIR}/${MY_P_URL}
+DEPEND="dev-lang/python"
 
 src_unpack() {
 	unpack ${A}
+
 	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	sed -i -e 's/\r//' server.cfg *.txt doc/*.txt # stupid windoze style
 }
 
 src_install() {
-	dodir /etc/conf.d
-	dodir /usr/${PN}/lib
 	# exes ------------------------------------------------------------------
-	exeinto /usr/${PN}
-	doexe main.py || die
-	insinto /usr/${PN}/lib
+	exeinto /usr/bin
+	newexe main.py ${PN} || die
+	insinto /usr/lib/${PN}
 	doins lib/* || die
 	# doc -------------------------------------------------------------------
-	dodoc Install.txt changelog.txt readme.txt research.txt
-	insinto /usr/share/doc/${PF}/doc
-	doins doc/*
+	dodoc *.txt doc/*.txt
+	dohtml doc/*
 	# conf ------------------------------------------------------------------
-	newconfd ${S}/server.cfg ${PN}.cfg
+	insinto /etc/${PN}
+	doins server.cfg
 	newinitd ${FILESDIR}/${PN}.init ${PN}
 }
 pkg_prerm() {
-	einfo "Removing /etc/init.d/ntlmaps script and python compiled bytecode in /usr/ntlmaps dir"
-	rm -f /usr/ntlmaps/*/*.py?
-	rm -f /etc/init.d/ntlmaps
+	einfo "Removing init script and python compiled bytecode"
+	rm -f /usr/lib/${PN}/*.py?
+	rm -f /etc/init.d/${PN}
 }