Set PYTHON_MODNAME. Delete call to deprecated distutils_python_version().

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 18 insertions, 22 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index eb29112cc59d..8255c93840b7 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/nicotine+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.45 2010/03/08 03:29:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.46 2010/06/01 10:52:00 arfrever Exp $
+
+  01 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  nicotine+-1.2.14.ebuild, nicotine+-1.2.15.ebuild:
+  Set PYTHON_MODNAME. Delete call to deprecated distutils_python_version().
 
   08 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> nicotine+-1.2.15.ebuild:
   More python fixedness.
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 751ed1c26d2d..55b97f91b06a 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST nicotine+-1.2.14.tar.bz2 3876545 RMD160 363af1d75c5f69e3bbb53d05f5ef335d69af9877 SHA1 84e7e4e8eb090fbb3b7f7a8646009cbacac4b354 SHA256 6fe9ea7b1c64000c058bfeb0f666113e389028f80b98f667d1cc0097c79e14bb
 DIST nicotine+-1.2.15.tar.bz2 3893349 RMD160 92f83bd5b826ee121d7a3e51e49f75a9d79bd7e0 SHA1 95c01989a2022487dae48cb2caab2f90ddfa73d2 SHA256 2c92f942bda2ee9447ca519b30a3da903b56e49e10c166adf298f3402ebd2f56
-EBUILD nicotine+-1.2.14.ebuild 963 RMD160 ab40eb88e6ec879fdb86d2acb68262e4b892152c SHA1 d35fc5d9f44ef53ae39995c772aaa1d30fbbe448 SHA256 9f8d28aae863c105a6d526934311927cbb62392ca8916f5e0418e1db88b9f15d
-EBUILD nicotine+-1.2.15.ebuild 902 RMD160 e5226d861a8802ce664d0ddba7b7e45bdc583cb6 SHA1 2d7439a2a04ad8fa78bed5353bf9ea23203ee06a SHA256 24b3ffbae85cdad47f284c982a373b003477e76eb0daf9e1e8f21c9b9b7b57d2
-MISC ChangeLog 6274 RMD160 eade3be3ff0b17d698c7d688a6fa0c88118f3813 SHA1 eb1ad9dc73f36517962dc21f768d5d2b0dbe2226 SHA256 bb62b668bb656dec424f7571e27302ceb642c218f084df7c1171086ce64f2bb7
+EBUILD nicotine+-1.2.14.ebuild 877 RMD160 b479a2fd3840f85d9386e8a42d2804f23286bb3d SHA1 f2c4c20858cd9ffb283ca19ce7983882a3307cc4 SHA256 1840eedb9853124cbbae7435f517f471c4eee6565863767c5868a1a56b2376e8
+EBUILD nicotine+-1.2.15.ebuild 923 RMD160 d9db910575295dce2d658adc5e127e266f848670 SHA1 6576719c648864e8c1137b872c43e4472d6e2149 SHA256 cef701ffda2dbee565a6a84dcc17cb92515e5b8f4cb518417798c3d1a871b0cd
+MISC ChangeLog 6475 RMD160 200aaa99a5f1f5b5d708802bb83bb2ded49eddd7 SHA1 fb5d8ee77a3dbd2baa8bb946cad5ef4cf4dda10c SHA256 63eb5284d2ea40fef030462ad41d9e78a3cca92482eeccd8e094dfe7bb3fca28
 MISC metadata.xml 253 RMD160 c5653dbfa27ea739e3430aed0980016fd12aa68f SHA1 461dedcaf3322af7e59c93c21845796c5fa27419 SHA256 301f970e0628e48cfeaf5bd540b63c012452b458b76ef05bb0bcbe640a0f373f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkuUb8UACgkQiqiDRvmkBmLS/gCfbfZJN0g2dn/ZGIFSjyY+J/ZZ
-ivsAnivbnBUO5rkJm8+4UEUweYRe1BT4
-=4DaS
------END PGP SIGNATURE-----
diff --git a/net-p2p/nicotine+/nicotine+-1.2.14.ebuild b/net-p2p/nicotine+/nicotine+-1.2.14.ebuild
index 114912fdb2b5..4590a7318a64 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.14.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.14.ebuild
@@ -1,8 +1,8 @@
-# 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-p2p/nicotine+/nicotine+-1.2.14.ebuild,v 1.3 2009/11/21 18:50:26 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.14.ebuild,v 1.4 2010/06/01 10:52:00 arfrever Exp $
 
-inherit distutils multilib toolchain-funcs
+inherit distutils
 
 DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
 HOMEPAGE="http://nicotine-plus.sourceforge.net"
@@ -24,9 +24,9 @@ RDEPEND="virtual/python
 
 DEPEND="${RDEPEND}"
 
+PYTHON_MODNAME="pynicotine"
+
 src_install() {
-	distutils_python_version
-	distutils_src_install \
-		--install-lib /usr/$(get_libdir)/python${PYVER}/site-packages
+	distutils_src_install
 	dosym nicotine.py /usr/bin/nicotine
 }
diff --git a/net-p2p/nicotine+/nicotine+-1.2.15.ebuild b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
index d7726d40ea2f..6f66d08e8899 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.15.ebuild,v 1.3 2010/03/08 03:29:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.15.ebuild,v 1.4 2010/06/01 10:52:00 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit distutils python
+inherit distutils
 
 DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
 HOMEPAGE="http://nicotine-plus.sourceforge.net"
@@ -25,6 +25,8 @@ RDEPEND=">=dev-python/pygtk-2.12
 
 DEPEND="${RDEPEND}"
 
+PYTHON_MODNAME="pynicotine"
+
 pkg_setup() {
 	python_set_active_version 2
 }