From 5f90afcc03935c543e8578e4cb4aae55f848c52d Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Tue, 1 Jun 2010 11:54:42 +0000 Subject: [PATCH] Delete calls to deprecated python_version(). Properly call python_mod_optimize() and python_mod_cleanup(). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- net-analyzer/net-snmp/ChangeLog | 8 ++++++- net-analyzer/net-snmp/Manifest | 21 +++++------------- .../net-snmp/net-snmp-5.4.2.1-r1.ebuild | 22 ++++++++++--------- .../net-snmp/net-snmp-5.4.2.1-r2.ebuild | 20 ++++++++++------- .../net-snmp/net-snmp-5.4.2.1-r3.ebuild | 20 ++++++++++------- .../net-snmp/net-snmp-5.4.2.1-r4.ebuild | 20 ++++++++++------- 6 files changed, 60 insertions(+), 51 deletions(-) diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog index edf06d74c009..62514a2be304 100644 --- a/net-analyzer/net-snmp/ChangeLog +++ b/net-analyzer/net-snmp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/net-snmp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.204 2010/05/01 00:20:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.205 2010/06/01 11:54:42 arfrever Exp $ + + 01 Jun 2010; Arfrever Frehtes Taifersar Arahesis + net-snmp-5.4.2.1-r1.ebuild, net-snmp-5.4.2.1-r2.ebuild, + net-snmp-5.4.2.1-r3.ebuild, net-snmp-5.4.2.1-r4.ebuild: + Delete calls to deprecated python_version(). Properly call + python_mod_optimize() and python_mod_cleanup(). 01 May 2010; Diego E. Pettenò net-snmp-5.4.2.1-r4.ebuild: diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index ac3bd3aa04a2..11fe4629f99a 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX CVE-2008-6123.patch 867 RMD160 1e8b6521ae0955681493c1ba594eb0344183e147 SHA1 3742c405fab9ac829acc93383bc39ba5b39962e9 SHA256 31a9b72b252582cd84e7f673b670ebbd2153dc719894aa668a48b24d6ba516f6 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874 AUX net-snmp-5.4.1-sensors3-version_detect.patch 1391 RMD160 eba5c1cba2fc5d0484143eb4b41f656f5f72bee4 SHA1 8c8ebcc9e4725e91cc7b07cdd45cbcf6e2ed806e SHA256 e18f7bd358c4f587793f9e9250489200d2708b50529dfe222f04b71617fa1e59 @@ -10,17 +7,9 @@ AUX snmpd.init 1054 RMD160 6cc814d19524e1899b4bb9539ee9752304451bc9 SHA1 ed2b1a4 AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3 AUX snmptrapd.init 624 RMD160 799faf488a62bc219d3765ed6d6283ca7764ad1c SHA1 1fdef5a0a29f181c2df31b9d7adc4d4ebb8b018c SHA256 0e6dae4ca0213be9f9311c8dacdf36e7fea05150db48d15660506d53abda5a39 DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c -EBUILD net-snmp-5.4.2.1-r1.ebuild 5441 RMD160 ae8abc07b3e42b5612d657ac9946db762337062f SHA1 0b78a0437fd2bf40f5ee2556d24c71260f77947e SHA256 9257d6068ce843604358aac868dc51c8968fb10068c836744e4c443b8cdec174 -EBUILD net-snmp-5.4.2.1-r2.ebuild 5544 RMD160 6d4f5c23c247ad62992d7a43685643857ff6ce52 SHA1 394bf5204ec2375169da946bdfd472c89df3e276 SHA256 5500f7aedc4e609674322ae5f5d7e1aa3b84a377a30459fad23f2e8d228b0cd3 -EBUILD net-snmp-5.4.2.1-r3.ebuild 5652 RMD160 8094ad748576087b4d61a07db058f908768679dd SHA1 0b1eb584fd13c77a1fa231d20449d6c066c55af3 SHA256 57eca9917aece56c920d1bdce18fe55f3766ece354d5ba351e00889981af97d1 -EBUILD net-snmp-5.4.2.1-r4.ebuild 5774 RMD160 9231815b06ccccb2b64ffa114db07f1ebf8131be SHA1 31610ae01073b2ed002fd19b13db2e9896efd2a8 SHA256 ce73be63caf977e341152e8ff6d8dd86696519cf162233e9a6ac04d51c5d4517 -MISC ChangeLog 34184 RMD160 cec666b9c62bbe8548e617ea6a5e34bac8bd2fb2 SHA1 3074923d56ac0508f9735abbb97a69fa1f64d8bf SHA256 c08f9c0b57ab7d281bdd8906c2a90e73b9eefc75f9e6b1d27cc9eed67d702d98 +EBUILD net-snmp-5.4.2.1-r1.ebuild 5483 RMD160 f835ab3cedf1e40cdb43a912b62544e6aa18ac8a SHA1 12401789db2f1e5d1f4a15a8fcdd5cb8be6c422b SHA256 2bf53e33f07102d0dc83a63321d1e0c1215ab59cf8bfd0f310cbeb58d638cbe4 +EBUILD net-snmp-5.4.2.1-r2.ebuild 5597 RMD160 be98f0aaaf645e8978008d0e748ac4708faee929 SHA1 ba6897bb4f057b7c2e80ed411135f1914ef07038 SHA256 52358096842b692188dcd5fd5748fa67a0997ae2d010f77922ae149c7e91bd1f +EBUILD net-snmp-5.4.2.1-r3.ebuild 5705 RMD160 a5e6821cf451e79304813766f8e7dc44eb7c8c6c SHA1 35d3c2df290e105386461827c41ab15cbb4f9017 SHA256 08b674a7db63259ebd8ff0ad758c18c8e837810a789ae02604faef5aabd01ea5 +EBUILD net-snmp-5.4.2.1-r4.ebuild 5823 RMD160 77b8b89a7f0040aa3bba12808e26c065c9d1de7f SHA1 526692b35ca5157b52cb633f6794f7f4efe427de SHA256 6d1ae6a22065c8f766eb5102281ff06c037958ff9fcec55e3ecbe6bb81484492 +MISC ChangeLog 34484 RMD160 128f6e6cba87a9708fb7cd43f1eea9e9e143723b SHA1 d52054ea11f8c0830dc69d5a6c937356bc4475cd SHA256 ca0236ad1b21f7bdc7d4582ae2264d9f14b188c5e1d1dc26015b3f77f1ddcd95 MISC metadata.xml 675 RMD160 3785784fde686fec578c82814a96f295e64c800b SHA1 433d32bd2e67c60324ad401a1b3eeb6b908656d2 SHA256 ed42873349256bf59c84251b140b22c5323a2d3d359fec89217ba50f8cecd9c4 -MISC net-snmp-5.4.1-r4.ebuild.rej 383 RMD160 e14cb798d11eed433293742c1158cb501208ea76 SHA1 2088f5ba408fd578616e471d2728cdc886b581b0 SHA256 81547782407afa0074145aa3115ed2935431568393d784299682200d54fcb819 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkvbc4MACgkQAiZjviIA2Xjy5gCgsR/40+2Ch9yFBgLtaY8KE3/c -gtwAn381FyT4xFPdEvMlfZNC1Wbj+sIJ -=7mMI ------END PGP SIGNATURE----- diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild index fa4beb6f56d1..225d32ba1d46 100644 --- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild,v 1.9 2009/10/16 08:51:06 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r1.ebuild,v 1.10 2010/06/01 11:54:42 arfrever Exp $ inherit fixheadtails flag-o-matic perl-module python autotools @@ -53,9 +53,7 @@ src_unpack() { die "sed fixproc failed" if use python ; then - python_version - PYTHON_MODNAME="netsnmp" - PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}/site-packages + PYTHON_DIR="$(python_get_sitedir)" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || die "sed python failed" fi @@ -180,13 +178,17 @@ src_install () { newins "${S}"/EXAMPLE.conf snmpd.conf.example } -pkg_postrm() { - if use python ; then - python_mod_cleanup +pkg_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/netsnmp fi -} -pkg_postinst() { elog "An example configuration file has been installed in" elog "/etc/snmp/snmpd.conf.example." } + +pkg_postrm() { + if use python; then + python_mod_cleanup $(python_get_sitedir)/netsnmp + fi +} diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r2.ebuild index 20990613ca90..ce1ce13a8de9 100644 --- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r2.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r2.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-analyzer/net-snmp/net-snmp-5.4.2.1-r2.ebuild,v 1.2 2010/04/16 15:58:57 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r2.ebuild,v 1.3 2010/06/01 11:54:42 arfrever Exp $ EAPI=2 @@ -62,9 +62,7 @@ src_prepare() { die "sed fixproc failed" if use python ; then - python_version - PYTHON_MODNAME="netsnmp" - PYTHON_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages" + PYTHON_DIR="$(python_get_sitedir)" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \ die "sed python failed" fi @@ -186,11 +184,17 @@ src_install () { newins "${S}"/EXAMPLE.conf snmpd.conf.example || die } -pkg_postrm() { - use python && python_mod_cleanup -} - pkg_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/netsnmp + fi + elog "An example configuration file has been installed in" elog "/etc/snmp/snmpd.conf.example." } + +pkg_postrm() { + if use python; then + python_mod_cleanup $(python_get_sitedir)/netsnmp + fi +} diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild index d01f2e9da116..0b7a8a5353e8 100644 --- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.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-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild,v 1.2 2010/04/16 15:58:57 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild,v 1.3 2010/06/01 11:54:42 arfrever Exp $ EAPI=2 @@ -62,9 +62,7 @@ src_prepare() { die "sed fixproc failed" if use python ; then - python_version - PYTHON_MODNAME="netsnmp" - PYTHON_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages" + PYTHON_DIR="$(python_get_sitedir)" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \ die "sed python failed" fi @@ -189,11 +187,17 @@ src_install () { newins "${S}"/EXAMPLE.conf snmpd.conf.example || die } -pkg_postrm() { - use python && python_mod_cleanup -} - pkg_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/netsnmp + fi + elog "An example configuration file has been installed in" elog "/etc/snmp/snmpd.conf.example." } + +pkg_postrm() { + if use python; then + python_mod_cleanup $(python_get_sitedir)/netsnmp + fi +} diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild index 8509dfcc2841..ca162f193805 100644 --- a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.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-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.2 2010/05/01 00:20:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.3 2010/06/01 11:54:42 arfrever Exp $ EAPI=2 @@ -62,9 +62,7 @@ src_prepare() { die "sed fixproc failed" if use python ; then - python_version - PYTHON_MODNAME="netsnmp" - PYTHON_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages" + PYTHON_DIR="$(python_get_sitedir)" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \ die "sed python failed" fi @@ -192,11 +190,17 @@ src_install () { newins "${S}"/EXAMPLE.conf snmpd.conf.example || die } -pkg_postrm() { - use python && python_mod_cleanup -} - pkg_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/netsnmp + fi + elog "An example configuration file has been installed in" elog "/etc/snmp/snmpd.conf.example." } + +pkg_postrm() { + if use python; then + python_mod_cleanup $(python_get_sitedir)/netsnmp + fi +} -- 2.26.2