jlec 15/03/21 20:34:29 Modified: metadata.xml ntlmaps-0.9.9.6-r3.ebuild ChangeLog Log: Bump to new python eclasses (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.4 net-proxy/ntlmaps/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 7 Jan 2015 13:59:39 -0000 1.3 +++ metadata.xml 21 Mar 2015 20:34:29 -0000 1.4 @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer><email>[email protected]</email></maintainer> - <longdescription lang="en"> + <maintainer> + <email>[email protected]</email> + </maintainer> + <longdescription lang="en"> ntlmaps is a http/ftp/socks proxy server written in python that implements samba-like ntlm authentication against a Microsoft Proxy Server (which does not support 'normal' digest authentication). 1.2 net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild?r1=1.1&r2=1.2 Index: ntlmaps-0.9.9.6-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ntlmaps-0.9.9.6-r3.ebuild 1 Jul 2014 17:06:26 -0000 1.1 +++ ntlmaps-0.9.9.6-r3.ebuild 21 Mar 2015 20:34:29 -0000 1.2 @@ -1,14 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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-r3.ebuild,v 1.1 2014/07/01 17:06:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild,v 1.2 2015/03/21 20:34:29 jlec Exp $ EAPI=5 -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS=1 -RESTRICT_PYTHON_ABIS="3.*" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python systemd user +inherit eutils multilib systemd user python-r1 DESCRIPTION="NTLM proxy Authentication against MS proxy/web server" HOMEPAGE="http://ntlmaps.sourceforge.net/"; @@ -18,36 +16,31 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86" -pkg_setup() { - python_pkg_setup +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND}" +pkg_setup() { enewgroup ntlmaps enewuser ntlmaps -1 -1 -1 ntlmaps } src_prepare() { epatch "${FILESDIR}/${P}-gentoo.patch" - python_convert_shebangs 2 main.py - sed -i -e 's/\r//' lib/*.py server.cfg doc/*.{txt,htm} || die 'Failed to convert line endings.' + sed \ + -e 's/\r//' \ + -i lib/*.py server.cfg doc/*.{txt,htm} || die 'Failed to convert line endings.' } src_install() { # Bug #351305, prevent file collision. - rm "${S}"/lib/utils.py + rm "${S}"/lib/utils.py || die - installation() { - insinto $(python_get_sitedir) - doins lib/*.py - } - python_execute_function installation - - pushd lib > /dev/null - PYTHON_MODULES=(*.py) - popd > /dev/null + python_foreach_impl python_domodule lib/*.py - exeinto /usr/bin - newexe main.py ntlmaps + python_foreach_impl python_newscript main.py ntlmaps + + python_foreach_impl python_optimize dodoc doc/*.txt dohtml doc/*.{gif,htm} @@ -61,11 +54,3 @@ diropts -m 0770 -g ntlmaps keepdir /var/log/ntlmaps } - -pkg_postinst() { - python_mod_optimize "${PYTHON_MODULES[@]}" -} - -pkg_postrm() { - python_mod_cleanup "${PYTHON_MODULES[@]}" -} 1.22 net-proxy/ntlmaps/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ChangeLog?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ChangeLog?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ntlmaps/ChangeLog?r1=1.21&r2=1.22 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ChangeLog 7 Jan 2015 13:59:39 -0000 1.21 +++ ChangeLog 21 Mar 2015 20:34:29 -0000 1.22 @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/ntlmaps # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.21 2015/01/07 13:59:39 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.22 2015/03/21 20:34:29 jlec Exp $ + + 21 Mar 2015; Justin Lecher <[email protected]> metadata.xml, + ntlmaps-0.9.9.6-r3.ebuild: + Bump to new python eclasses 07 Jan 2015; Pacho Ramos <[email protected]> -ntlmaps-0.9.9.6-r2.ebuild, metadata.xml:
