Call python_pkg_setup(), python_mod_optimize() and python_mod_cleanup(). Delete obsolete code in pkg_preinst().

Package-Manager: portage-2.2_rc96_p20/cvs/Linux x86_64

3 files changed, 20 insertions, 24 deletions

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index e03db41f614c..7e9e3c6933bb 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/ntlmaps
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.17 2010/10/15 21:44:40 arfrever Exp $
+
+  15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ntlmaps-0.9.9.6-r1.ebuild:
+  Call python_pkg_setup(), python_mod_optimize() and python_mod_cleanup().
+  Delete obsolete code in pkg_preinst().
 
 *ntlmaps-0.9.9.6-r1 (14 Oct 2010)
 
diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
index f8995e9cde71..fa2438e78d91 100644
--- a/net-proxy/ntlmaps/Manifest
+++ b/net-proxy/ntlmaps/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ntlmaps-0.9.9-gentoo.patch 1165 RMD160 8125e6dadaeba75038cb6d6e9927be49402c1bef SHA1 9c44bcc92ed885de63a6154a02f828472b19217d SHA256 a701ddee9384bdcecd0655cbed04a3a6320ca0c4de374805a9b9e1269edf21be
 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-r1.ebuild 1849 RMD160 3b2b14ea1962b0653d90c11c5424aa6cab3246cd SHA1 4c77243ab2394814d36350723a2d5c151e82ee1c SHA256 bcedf5c99eb5756778c1c14df9b5204313808ac656304e55aaf7861532f98e09
-MISC ChangeLog 4247 RMD160 268768d1fbdac2e9261de3bd86ad8e309650fcdb SHA1 3b0ff2b78502e8fa3f2c06aa7913772f58752fe2 SHA256 569e7801410bb8d663ffd6cb05330f568b324d631d2fb8e347a7d401791aab10
+EBUILD ntlmaps-0.9.9.6-r1.ebuild 1787 RMD160 97f1e9770bf74c01c02634bd9644f08f7ccfa63b SHA1 733e88f3e5da8c11f0bbf478f8a25c3f5e05110d SHA256 cf4810c13028efb063c95cb5bbf4ab9f5c73bb974c7d20528071c0917b4091fa
+MISC ChangeLog 4466 RMD160 88e6063fbb236e91ca7fa9d81fbe1b78e953e5ce SHA1 52f7eab2bacd6544b6363c476edb4d1260c08d4b SHA256 3be1dd9c46d7f9ea502b5e198e8c9d9d68fe51602ea0ae916df38495e5ed23af
 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.16 (GNU/Linux)
-
-iEYEARECAAYFAky2zMMACgkQ9/cejkQaxBBUuwCcDYFcTSHcdiQBaL2YnA3fs14k
-6SMAnRoGH63G+X9UBuIinUCDAZLrXC0v
-=Vh8N
------END PGP SIGNATURE-----
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
index 6e9d9e8c9dee..5760694cc343 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/10/14 09:26:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.6-r1.ebuild,v 1.2 2010/10/15 21:44:40 arfrever Exp $
 
 EAPI=3
 
@@ -20,6 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE=""
 
 pkg_setup() {
+	python_pkg_setup
 	enewgroup ntlmaps
 	enewuser ntlmaps -1 -1 -1 ntlmaps
 }
@@ -40,6 +41,10 @@ src_install() {
 	}
 	python_execute_function installation
 
+	pushd lib > /dev/null
+	PYTHON_MODULES=(*.py)
+	popd > /dev/null
+
 	# exes ------------------------------------------------------------------
 	exeinto /usr/bin
 	newexe main.py ntlmaps || die "failed to install main program"
@@ -56,11 +61,10 @@ src_install() {
 	keepdir /var/log/ntlmaps
 }
 
-pkg_preinst() {
-	#Remove the following lines sometime in December 2005
-	#Their purpose is to fix security bug #107766
-	if [ -f "${ROOT}/etc/ntlmaps/server.cfg" ]; then
-		chmod 0640 "${ROOT}/etc/ntlmaps/server.cfg"
-		chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg"
-	fi
+pkg_postinst() {
+	python_mod_optimize "${PYTHON_MODULES[@]}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${PYTHON_MODULES[@]}"
 }