From: Christian Andreetta Date: Wed, 5 Jan 2005 12:54:03 +0000 (+0000) Subject: better pkg removal options, minor bugfix in conf file install X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=741d94594dc7933f41dace6341c068012d722954;p=gentoo.git better pkg removal options, minor bugfix in conf file install --- diff --git a/www-proxy/ntlmaps/ChangeLog b/www-proxy/ntlmaps/ChangeLog index 8b27bb16337a..54f0b7077088 100644 --- a/www-proxy/ntlmaps/ChangeLog +++ b/www-proxy/ntlmaps/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-proxy/ntlmaps -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ChangeLog,v 1.4 2004/12/29 01:53:03 ciaranm Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/ChangeLog,v 1.5 2005/01/05 12:54:03 satya Exp $ + +*ntlmaps-0.9.8-r1 (05 Jan 2005) + + 05 Jan 2005; Christian Andreetta files/ntlmaps.init, + +ntlmaps-0.9.8-r1.ebuild, ntlmaps-0.9.8.ebuild: + 0.9.8: changed config name to make portage depcache happy. + 0.9.8-r1: better pkg removal options, minor bugfix in conf file install 29 Dec 2004; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/www-proxy/ntlmaps/Manifest b/www-proxy/ntlmaps/Manifest index bc3b3492678f..fca4ea4d2faf 100644 --- a/www-proxy/ntlmaps/Manifest +++ b/www-proxy/ntlmaps/Manifest @@ -1,6 +1,8 @@ -MD5 94319278939c7a61147781efc9a48252 ChangeLog 1014 +MD5 c5151118373d441b5353a7443d979488 ntlmaps-0.9.8.ebuild 997 +MD5 37ffdd2ab64c6154ca3b25c5e7bb0dfd ntlmaps-0.9.8-r1.ebuild 1431 +MD5 04f11d07f90006574cc910ae9f519d94 ChangeLog 1305 MD5 d9deb8db85ec3b52b53a3c21bd236125 metadata.xml 487 -MD5 39db4dcd94910786912176f62080866a ntlmaps-0.9.8.ebuild 994 -MD5 547d2124c00f02458c472025ac835071 files/digest-ntlmaps-0.9.8 57 +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 822cfcf69e84a4f1705d551644effe52 files/ntlmaps.init 788 +MD5 547d2124c00f02458c472025ac835071 files/digest-ntlmaps-0.9.8 57 diff --git a/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1 b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1 new file mode 100644 index 000000000000..30f4a1cc413d --- /dev/null +++ b/www-proxy/ntlmaps/files/digest-ntlmaps-0.9.8-r1 @@ -0,0 +1 @@ +MD5 a824547a0751ee356ca8b054f23fb212 aps098.tar.gz 50437 diff --git a/www-proxy/ntlmaps/files/ntlmaps.init b/www-proxy/ntlmaps/files/ntlmaps.init index de3a2e1189c0..6465e7faa5cb 100644 --- a/www-proxy/ntlmaps/files/ntlmaps.init +++ b/www-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/www-proxy/ntlmaps/files/ntlmaps.init,v 1.2 2004/08/30 18:47:26 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/ntlmaps/files/ntlmaps.init,v 1.3 2005/01/05 12:54:03 satya Exp $ MY_CMD="/usr/bin/python /usr/ntlmaps/main.py" MY_PID_FILE="/var/run/ntlmaps.pid" @@ -11,14 +11,14 @@ depend() { } start() { - ebegin "Starting ntlmaps" + 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 - eend $? + 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 + eend $? } stop() { ebegin "Stopping ntlmaps" diff --git a/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild b/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild new file mode 100644 index 000000000000..818c8703a8ec --- /dev/null +++ b/www-proxy/ntlmaps/ntlmaps-0.9.8-r1.ebuild @@ -0,0 +1,50 @@ +# 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.1 2005/01/05 12:54:03 satya 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" + +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 /etc/conf.d + dodir /usr/${PN}/lib + # exes ------------------------------------------------------------------ + exeinto /usr/${PN} + doexe main.py || die + insinto /usr/${PN}/lib + doins lib/* || die + # doc ------------------------------------------------------------------- + dodoc Install.txt changelog.txt readme.txt research.txt + insinto /usr/share/doc/${PF}/doc + doins doc/* + # conf ------------------------------------------------------------------ + newconfd ${S}/server.cfg ${PN}.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 +} diff --git a/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild b/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild index a20ac7a768da..c4d4768987af 100644 --- a/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild +++ b/www-proxy/ntlmaps/ntlmaps-0.9.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.5 2004/10/31 05:33:08 vapier Exp $ +# $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 @@ -37,6 +37,6 @@ src_install() { insinto /usr/share/doc/${P}/doc doins doc/* - newconfd ${S}/server.cfg ${PN} + newconfd ${S}/server.cfg ${PN}.cfg newinitd ${FILESDIR}/${PN}.init ${PN} }