diff options
| -rw-r--r-- | net-proxy/ntlmaps/ChangeLog | 12 | ||||
| -rw-r--r-- | net-proxy/ntlmaps/Manifest | 17 | ||||
| -rw-r--r-- | net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch | 32 | ||||
| -rw-r--r-- | net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild (renamed from net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild) | 36 |
4 files changed, 53 insertions, 44 deletions
diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog index 77d3fd7c8917..e03db41f614c 100644 --- a/net-proxy/ntlmaps/ChangeLog +++ b/net-proxy/ntlmaps/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/ntlmaps -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.15 2008/03/14 10:41:10 phreak Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.16 2010/10/14 09:26:35 hwoarang Exp $ + +*ntlmaps-0.9.9.6-r1 (14 Oct 2010) + + 14 Oct 2010; Markos Chandras <hwoarang@gentoo.org> + -ntlmaps-0.9.9.6.ebuild, +ntlmaps-0.9.9.6-r1.ebuild, + files/ntlmaps-0.9.9.6-gentoo.patch: + Revbump with QA fixes and updated gentoo patch thanks to Monjoie + <corentin.labbe@geomatys.com>. Bug #315877 14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml: Removing Christian Andreetta (satya, #48841) from metadata.xml. diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest index 8c9217b3c996..f8995e9cde71 100644 --- a/net-proxy/ntlmaps/Manifest +++ b/net-proxy/ntlmaps/Manifest @@ -2,18 +2,21 @@ Hash: SHA1 AUX ntlmaps-0.9.9-gentoo.patch 1165 RMD160 8125e6dadaeba75038cb6d6e9927be49402c1bef SHA1 9c44bcc92ed885de63a6154a02f828472b19217d SHA256 a701ddee9384bdcecd0655cbed04a3a6320ca0c4de374805a9b9e1269edf21be -AUX ntlmaps-0.9.9.6-gentoo.patch 1183 RMD160 1e075ca389c64b65aebb3e6bbe68949455f93aee SHA1 5160186011d813752c1ed46f54e7ed197c6e2e97 SHA256 99af32b7f14ad1508424d18d7e2bcde4d58fa28168d69f114cf6a45ad0545120 +AUX ntlmaps-0.9.9.6-gentoo.patch 985 RMD160 ae6a10fb3a9125489f4dac4d51c93351b5c04ba3 SHA1 60242cecff2195371a4add2c60a40201f284515c SHA256 4ac20e213a081d0cc76d205ca3d954dbd9eca12df9ebdd0606ffcd56fc2d3a34 AUX ntlmaps.init 727 RMD160 0b1035e5b17276d7817f4aa9aef14245fb2f5be0 SHA1 e414e43c9baf229f99e39474ed1172a441c6d23b SHA256 5b1ca1b2978457b8c8f282036bc8a24b8d4723377f9de40a0e7d4d591fe5f2d4 DIST ntlmaps-0.9.9.6.tar.gz 60760 RMD160 7d46394f0f975bda384bd9f82e2a11897fcb12ba SHA1 9d85271926d4682b9f4f7e76a44896790e8953c9 SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a DIST ntlmaps-0.9.9.tar.gz 55459 RMD160 95bb90f04ceb7696bfaa848e506e6b7d7f297f51 SHA1 0a71de7c0899aa6d35c62ea6974717baa9dae2ff SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1 EBUILD ntlmaps-0.9.9-r2.ebuild 1812 RMD160 97b71cc7e3df066ccf89740de462fc59780e98f4 SHA1 530456cea146356101559a0caad5cb814beae115 SHA256 56807a4fbfe411898464e026600a3ef2f029e6b72896d476a9cf35c813e3583d -EBUILD ntlmaps-0.9.9.6.ebuild 1816 RMD160 20a573bf145a63b138516d0d987c99f56a23b12a SHA1 351ba8aeb9a8bb7bd9deb5e96a7042a86593d4dd SHA256 b6e79bafb857b413916f20e03a4c832d3a6c69c1125dea2b45ace1302a62fdb1 -MISC ChangeLog 3951 RMD160 820903370a3438a12e9eaf0b9d60af9396918193 SHA1 98d96f9e1f2a0159f310ec415434db72ad6c28b3 SHA256 bcd395b3208c7ca0e7ba1e942a9469b7b977ec5a77fcb7708df73ec9f0329f07 +EBUILD ntlmaps-0.9.9.6-r1.ebuild 1849 RMD160 3b2b14ea1962b0653d90c11c5424aa6cab3246cd SHA1 4c77243ab2394814d36350723a2d5c151e82ee1c SHA256 bcedf5c99eb5756778c1c14df9b5204313808ac656304e55aaf7861532f98e09 +MISC ChangeLog 4247 RMD160 268768d1fbdac2e9261de3bd86ad8e309650fcdb SHA1 3b0ff2b78502e8fa3f2c06aa7913772f58752fe2 SHA256 569e7801410bb8d663ffd6cb05330f568b324d631d2fb8e347a7d401791aab10 MISC metadata.xml 414 RMD160 3206521eef36edfa76ef449203e960a64c5893eb SHA1 151d7be64b05d970c58ba0f52007072a930c9d86 SHA256 5939687c17988204b099ca8a7b3951d60e1ff42831fd40acad61df41112ac193 +MISC ntlmaps-0.9.9.6-r1.ebuild.orig 1844 RMD160 809b7d78bb7eefd56890bb91ebc3cac46327765f SHA1 edb6b232b7d43a2a2b5db3e916b9ab7e990c57aa SHA256 6b92808f01f9245937beee8a54b484745740949d6e85495839b2293a8d2505a5 +MISC ntlmaps-0.9.9.6.ebuild.orig 1844 RMD160 809b7d78bb7eefd56890bb91ebc3cac46327765f SHA1 edb6b232b7d43a2a2b5db3e916b9ab7e990c57aa SHA256 6b92808f01f9245937beee8a54b484745740949d6e85495839b2293a8d2505a5 +MISC ntlmaps-0.9.9.6.ebuild.rej 1822 RMD160 0059a379c0ad923d24a46b0b03ee50ef47c1f4ac SHA1 0eeee6d85dc6b5c09fed2865c983abdee5521ec4 SHA256 7daac995df2fc7a72e4a4dfa947767d5e4567488201198eb28bf63cc510cb93b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iD8DBQFH2lZLyuNVb5qfaOYRAoMDAJ9PwRXcZ2d8C9htZuaN+Z/RZAI3WgCfblPD -SvNwOxASvlx2QtNBcIGEGOU= -=O780 +iEYEARECAAYFAky2zMMACgkQ9/cejkQaxBBUuwCcDYFcTSHcdiQBaL2YnA3fs14k +6SMAnRoGH63G+X9UBuIinUCDAZLrXC0v +=Vh8N -----END PGP SIGNATURE----- diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch index d94d3db0adc2..bda0843e6c9f 100644 --- a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch +++ b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch @@ -1,20 +1,19 @@ -diff -Nru ntlmaps-0.9.9.6.orig/__init__.py ntlmaps-0.9.9.6/__init__.py ---- ntlmaps-0.9.9.6.orig/__init__.py 2005-06-10 06:49:35.000000000 +0300 -+++ ntlmaps-0.9.9.6/__init__.py 2006-09-20 14:52:58.000000000 +0300 -@@ -22,8 +22,7 @@ - - import os, sys +--- __init__.py.old 2010-10-06 16:03:54.000000000 +0200 ++++ __init__.py 2010-10-06 16:05:38.000000000 +0200 +@@ -20,10 +20,3 @@ + # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + # +-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.6.orig/main.py ntlmaps-0.9.9.6/main.py ---- ntlmaps-0.9.9.6.orig/main.py 2005-07-05 06:13:43.000000000 +0300 -+++ ntlmaps-0.9.9.6/main.py 2006-09-20 14:52:58.000000000 +0300 -@@ -18,17 +18,17 @@ +-sys.path.append(ntlmaps_libdir) +- +-del os, sys +--- main.py.old 2010-10-06 16:26:57.000000000 +0200 ++++ main.py 2010-10-06 16:27:29.000000000 +0200 +@@ -18,8 +18,6 @@ # Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # @@ -22,11 +21,8 @@ diff -Nru ntlmaps-0.9.9.6.orig/main.py ntlmaps-0.9.9.6/main.py - import sys -+sys.path.append('/usr/lib/ntlmaps') -+ import server, config, config_affairs - - +@@ -28,7 +26,7 @@ #-------------------------------------------------------------- # config affairs # look for default config name in lib/config.py diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild index 4018607eb2f8..6e9d9e8c9dee 100644 --- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild +++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild @@ -1,8 +1,14 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 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.ebuild,v 1.4 2007/11/04 08:15:06 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild,v 1.1 2010/10/14 09:26:35 hwoarang Exp $ -inherit eutils +EAPI=3 + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS=1 +RESTRICT_PYTHON_ABIS="3.*" + +inherit eutils python DESCRIPTION="NTLM proxy Authentication against MS proxy/web server" HOMEPAGE="http://ntlmaps.sourceforge.net/" @@ -13,17 +19,14 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86" IUSE="" -DEPEND="dev-lang/python" - pkg_setup() { enewgroup ntlmaps enewuser ntlmaps -1 -1 -1 ntlmaps } -src_unpack() { - unpack ${A} - +src_prepare() { epatch "${FILESDIR}/${P}-gentoo.patch" + python_convert_shebangs 2 main.py #stupid windoze style cd "${S}" @@ -31,14 +34,18 @@ src_unpack() { } src_install() { + installation() { + insinto $(python_get_sitedir) + doins lib/*.py || die + } + python_execute_function installation + # exes ------------------------------------------------------------------ exeinto /usr/bin newexe main.py ntlmaps || die "failed to install main program" - insinto /usr/lib/ntlmaps - doins lib/* || die "failed to install python modules" # doc ------------------------------------------------------------------- - dodoc doc/*.txt - dohtml doc/*.{gif,htm} + dodoc doc/*.txt || die + dohtml doc/*.{gif,htm} ||die # conf ------------------------------------------------------------------ insopts -m0640 -g ntlmaps insinto /etc/ntlmaps @@ -57,8 +64,3 @@ pkg_preinst() { chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg" fi } - -pkg_prerm() { - einfo "Removing python compiled bytecode" - rm -f "${ROOT}"/usr/lib/ntlmaps/*.py? -} |