Bump to new python eclasses

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index 91888ec98c09424f1552de3d68d12f6f07fc3f18..141dd2ad1c6613ddc07331cc88fc394e1a325430 100644 (file)
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -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 <jlec@gentoo.org> metadata.xml,
+  ntlmaps-0.9.9.6-r3.ebuild:
+  Bump to new python eclasses
 
   07 Jan 2015; Pacho Ramos <pacho@gentoo.org> -ntlmaps-0.9.9.6-r2.ebuild,
   metadata.xml:

diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
index 271e1ba0e7005f95cb9ec8b313886ccc4b59bab4..879ccfca10d65058333a97001c886c2d5d7d6e37 100644 (file)
--- a/net-proxy/ntlmaps/Manifest
+++ b/net-proxy/ntlmaps/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ntlmaps-0.9.9-gentoo.patch 1165 SHA256 a701ddee9384bdcecd0655cbed04a3a6320ca0c4de374805a9b9e1269edf21be SHA512 335b38f1d323959ff0f7b57cd3f68b7528e23e8e8086e8b366e39eed0293faf32d8f03b4f1bab45f5d70d530043eadd015dfb4adcdd1bc706ae87fca35c36112 WHIRLPOOL 25f88e1b82402d8c1ea4aba388fb9ad842c07cacbe8667591d31f962379bd95b58830dd9dc3eaf5ba6a3fa39cf953443fc6e984769ca69452ddc39d9ba78c708
 AUX ntlmaps-0.9.9.6-gentoo.patch 985 SHA256 4ac20e213a081d0cc76d205ca3d954dbd9eca12df9ebdd0606ffcd56fc2d3a34 SHA512 7f207aa160a01a4b5c11a95540bd07ee7adfed63e282b9dcfaf1a2ddd1566c679408a6e0dbe4b69bf1326f6f9d9b18cba3f96c4656cb94ebceb9f833e158c383 WHIRLPOOL bfa1fd26994108e3f0548048764304cbb484b435369665f708f1bd4db893c180a1f29c5f9ddfef6cdabc20e5ec4098f5c6e1e8d90e4d92cd58722dde09a1fdb9
@@ -8,13 +8,25 @@ AUX ntlmaps.service 192 SHA256 779d16b84dd5e3cd16e91e6645cceacfdd59c49069cc49e61
 DIST ntlmaps-0.9.9.6.tar.gz 60760 SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a SHA512 0b0c80f3a32c523fdad47af2d0c7fa21d01124d014aafb2f7e9a00ba525685917b6c24572a25d5c294848f88fd6775a0e9c9e95014d91e35b86411c83f12adff WHIRLPOOL 66431212f20e5451992a2f788d7c8077dae95ee3cb97e956bd65862ce9c93fe2bea31e46cf34922fe5cbd99c6ea5780cfecd3fbadc128cbbd820c5c772f9371e
 DIST ntlmaps-0.9.9.tar.gz 55459 SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1
 EBUILD ntlmaps-0.9.9-r2.ebuild 1439 SHA256 a400f93508c27554d63bace0dc1913a018e69a91e9a7c1398c68a58bc9c72428 SHA512 d3f0b162032a9ba174a9b0991eef207c6c053637aba32cecfe7fbea345bb5c54c79d14e518edc5adb7eb84f0bd847633318126ded0666eb6ef4bf7a9896bf384 WHIRLPOOL 689a83824899314a459a32658c65301011fe23c307118a193dfc5dae9b957d34ab8ac73011977d0a87c52c60cab1332992f28b81f6a773705ac62e8b6ecabe19
-EBUILD ntlmaps-0.9.9.6-r3.ebuild 1549 SHA256 bc76577972e188bd6021be5939ffb721ef6f1e8624a3b0321274da73d3ad75c2 SHA512 94cf5a4954a562148dbc26c7a4a0d7b58bf952528d1ade542624cd40cb3e5c79283fa86132a83faacd6eac2b4f8664979c311c3bb3fbcab45fef7e059f57fb11 WHIRLPOOL 84c4706aa72915970589893e033edaf875bd82421dd684fb25a83f5eae875b3d2a6044411fe1f443ab867672a39220cd96c6b3070de2ee626ff7bc563c305249
-MISC ChangeLog 5249 SHA256 4753b55bb4ac774233a353983b04d1cad3acd59c7360082ef02f4fd40b198487 SHA512 e52e507e179d11572872356b82fd8469a96ae426fca8fcf6fc6e15b6f7c80d351293d9ba72c8097d5a07b53b5d1854464b0a9e7119957b8f604de2704a344574 WHIRLPOOL 1351d73a59c3546d661b0cc7d5ae76c17342553dbf32fbff14aa0b8d0118fe8fb1a6a0069e03f70be3b42d744f483a4c2aac9d8f82e862c902fdbcc981a06ccb
-MISC metadata.xml 459 SHA256 7faf0fdb18cf8215a5fbe98da18ede33db881cb4864c09ac222f7e111d019830 SHA512 181057c2f9dea8ccb31521fae60a810fed327c39e3541128ddb36b73bfec4fdab49aa6e5c4254ef62a811fe348a4c12e8c74595f3e7f8556e391b23e99d88223 WHIRLPOOL 469189243feb5469557bdc017f4b25e0f9c74a564cd2fd0b709583e0b3300ed1d37f89bcac9024a00c5f0511270c33d56f3b18087eb57422a4e5a0989574945e
+EBUILD ntlmaps-0.9.9.6-r3.ebuild 1325 SHA256 55e4b189779a193b6e93dfc8c41019983a59d4d0b3fda97a31dbf24ef8484a20 SHA512 18efda39716575ec68151717d769eec7937f7668c0fe0359768814265d6b32661460b68ecf5b69fdd57c56a761cbbcf7380d74eb4b642fa4ffd9a59161e2a99a WHIRLPOOL 0972b0c6807d2d8c00ecf106c9c08f0a81e21b624e9225ed1a5a1357ced07e45bace90cd65f148bd493477b6728cdcac61089535f3fc8e46e78f79a7c2f52529
+MISC ChangeLog 5369 SHA256 fbd3a1fc743dfe3ae66530c04c5bcddaa62cfa1ecb46d812b62aad82890bc36c SHA512 bddf91fc73260c0bd059e0ec2fe5ee71cfd47ed34771033b589d253c5cca19b03bcd1dc53cc514121ff83b83a9ed8b70b8260d7a7f0cf026e4f41f649bb9c835 WHIRLPOOL 1c7687805778499afa5fea8ba1cbb832a56d67044538ef9fdff3ad4af71d9ffdd28c82c302afab4d9e3831839173d02c0678ffab1ea81738bba797796196ec5f
+MISC metadata.xml 470 SHA256 4a34b5e25ee4deeee5c7e81c1603c277e8dee3b498d6c3d3b48b30468a3b1c71 SHA512 4377d8b816aba250f9e3e7c2d5bb7d1e7af9e4acf0fc072bfee64572f8c1e2b584edbd4e1a59d3f86c058471d7bf180513cfbea1b3d87e110fe5765c4e32f7fe WHIRLPOOL f6b42d47b10a3c813556452a32fa7536caf27a198e49771bbec1629a589d3192558047fa7dab3541c50bccf8542eabe5e068eda29d0f09a630ff7911a6bec308
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlStO8wACgkQCaWpQKGI+9QkZQCfU4rM7wVMgLE7aCjwYRxpT+pK
-Z/YAnjNXBh08BTmHFOujvB2h9LAeLQmM
-=TDhi
+iQJ8BAEBCgBmBQJVDdXfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKkoP/jIox8MsK60L83auH4PAONCI
+IU7zojfNfNkcbPphVF0WUycAbsP3mGC29MB5AxOkm++G9l2PV0HpQ0kfcIKdqcew
+T1UlcRpgOcACLudWUQOVhr0J2Cf/VzHiVbybmWYoHv18GB42ONZOBaJEmUQDAon0
+sDAMT0DnEHfagYjLmSRYCeKxS6fCO2hWigDMdp7KFhW0TyUtlJnZgc+8Etpb9psx
+bal23qYaCiy+5a5OxjlYEIvGxnnincKa4td2AE/zYZC3eVJgq46+gevoluGuGB4N
+YiweVQGi3Hd0Yav9zSLdRIxISv1xutewzcd7eINl1lrw14G/VdhcysNAHOBw/OOT
+fgKTXAs7F9xYHBVSHs3DSD3Vv1zX0iMoMKY1XXcwXEZzAQw2wtpJlmedytjG7Cy7
+XNL2llnqyjxQPSd1hyJWKjbxhvYiQerOEdtplY/MoBxtgeqHLmvjs76xl18H7GjA
+9c8Vet1fKeULUk4fO/WDL9eohMo/th26VAxvbWtBa0jIuN3WZ/rvRq8Ii13I1yPf
+kFyNdotblY/1c878ZLdUkIRO2sojuq4Rjf07zWOmtvvkIlG4tJBMuzxoeYX1mW7v
+eiM3b4ddGYEm055OrxC1cAaRiB4T3HGqacwROXbu2L+YDmJTX3I01JDQ28kWxDdu
+BVe0wvwAC3K/iAKWwX5C
+=LVe/
 -----END PGP SIGNATURE-----

diff --git a/net-proxy/ntlmaps/metadata.xml b/net-proxy/ntlmaps/metadata.xml
index 7f1ebd1c44a70596f1141db7d3b77625414a6a4d..2d47b492b7c550a6edd06af2e5438fe32529e82d 100644 (file)
--- a/net-proxy/ntlmaps/metadata.xml
+++ b/net-proxy/ntlmaps/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-       <longdescription lang="en">
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</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).

diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild
index a444a3e6551cfc0497df2f8c587e96cb7bce0b3e..3bab47ad171e1588c6b4305d2fbce4d412abbeab 100644 (file)
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r3.ebuild
@@ -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 @@ LICENSE="GPL-2"
 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
+       python_foreach_impl python_domodule lib/*.py
 
-       pushd lib > /dev/null
-       PYTHON_MODULES=(*.py)
-       popd > /dev/null
+       python_foreach_impl python_newscript main.py ntlmaps
 
-       exeinto /usr/bin
-       newexe main.py ntlmaps
+       python_foreach_impl python_optimize
 
        dodoc doc/*.txt
        dohtml doc/*.{gif,htm}
@@ -61,11 +54,3 @@ src_install() {
        diropts -m 0770 -g ntlmaps
        keepdir /var/log/ntlmaps
 }
-
-pkg_postinst() {
-       python_mod_optimize "${PYTHON_MODULES[@]}"
-}
-
-pkg_postrm() {
-       python_mod_cleanup "${PYTHON_MODULES[@]}"
-}