Version bump. Use python.eclass.

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

4 files changed, 33 insertions, 48 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index ce929b7f271b..0f96bbf211d3 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/nicotine+
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.42 2009/11/21 18:50:26 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.43 2010/03/03 22:41:00 dirtyepic Exp $
+
+*nicotine+-1.2.15 (03 Mar 2010)
+
+  03 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> -nicotine+-1.2.12.ebuild,
+  -nicotine+-1.2.13.ebuild, +nicotine+-1.2.15.ebuild:
+  Version bump. Use python.eclass.
 
   21 Nov 2009; nixnut <nixnut@gentoo.org> nicotine+-1.2.14.ebuild:
   ppc stable #292338
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index b892d3a327b3..5c81db3b0fda 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,8 +1,16 @@
-DIST nicotine+-1.2.12.tar.bz2 3775683 RMD160 fd0ec66814a9b5a372459990713f3349c2ff482c SHA1 178a7b728f7cbf415ffc03acc83f68eda225c3a2 SHA256 7074eec4e9e26b6318c7f3347dd882f7334f08961b73bf711386fbe37bc04485
-DIST nicotine+-1.2.13.tar.bz2 3871149 RMD160 7f777f4f600831cfbd5816179b107d37a2393a3d SHA1 0bd3eac179e9691e3ed4dd60dc86aca27a3cc616 SHA256 52c86b9605e446f796f9d3e4b2abdf3d4f498bf89107ecd4f910ce9dc2c6b2a7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nicotine+-1.2.14.tar.bz2 3876545 RMD160 363af1d75c5f69e3bbb53d05f5ef335d69af9877 SHA1 84e7e4e8eb090fbb3b7f7a8646009cbacac4b354 SHA256 6fe9ea7b1c64000c058bfeb0f666113e389028f80b98f667d1cc0097c79e14bb
-EBUILD nicotine+-1.2.12.ebuild 911 RMD160 1b588ab5fc8ba167c3ba8897703fe9ca546aad65 SHA1 b0f78f61f52d07fb5d81ee98b608bd718f6d5edc SHA256 fc5efd194541cbe836588a873106b315a4dde1c7a2a18e62a2cb451e6a7e98d2
-EBUILD nicotine+-1.2.13.ebuild 957 RMD160 d5c987ae107d137a6444cf99fe28ccc1386c1e68 SHA1 3a9dcf523bd7cfd81bc08fb226188d90399e294a SHA256 e684ed6892c416b4a9f91ae6eabe58b0d051a394d94392c4deaa45cc681792f8
+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
-MISC ChangeLog 5827 RMD160 f93407caf8ed4c60984fc6710414f95572e16c1c SHA1 77434282bb0b47f1c065d295ef2764db10e904ab SHA256 8fe1b8be86b7c42f102311aded6146f0d46ef184bce2556d9af24050fcd4431a
+EBUILD nicotine+-1.2.15.ebuild 867 RMD160 3fe9132c3fba436dbf93d9ea1d1bbd6d610da26a SHA1 235c36ceae08aae338e61a0137c4edf821ebcba6 SHA256 0644211f7ad528872f24c9d661c7b062b7bdc94f5a6b4b83f4477166fc020970
+MISC ChangeLog 6027 RMD160 af168ef2737d173cd7e94c532a4795f90ab248c3 SHA1 a961ff7bf0be36ceb1ba7fa733f95ccbd4595468 SHA256 eb2611121db4972793ec054a02bdc354fc49ea5a1254e72c3bdd6305b0262b7b
 MISC metadata.xml 253 RMD160 c5653dbfa27ea739e3430aed0980016fd12aa68f SHA1 461dedcaf3322af7e59c93c21845796c5fa27419 SHA256 301f970e0628e48cfeaf5bd540b63c012452b458b76ef05bb0bcbe640a0f373f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkuO5hMACgkQiqiDRvmkBmIbSwCfXGubykIQNQ7s5+4/eeKA5scW
+rP4An3R3FUaO/4CLPRbnagdyln3uwIcd
+=lfKH
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/nicotine+/nicotine+-1.2.12.ebuild b/net-p2p/nicotine+/nicotine+-1.2.12.ebuild
deleted file mode 100644
index 2724195d94db..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.2.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.12.ebuild,v 1.3 2009/10/07 17:34:06 nixnut Exp $
-
-inherit distutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="http://nicotine-plus.sourceforge.net"
-SRC_URI="http://www.nicotine-plus.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="geoip spell"
-
-RDEPEND="virtual/python
-	>=dev-python/pygtk-2.10
-	media-libs/mutagen
-	geoip? ( >=dev-python/geoip-python-0.2.0
-			 >=dev-libs/geoip-1.2.1 )
-	spell? ( dev-python/sexy-python )
-	!net-p2p/nicotine"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils_python_version
-	distutils_src_install \
-		--install-lib /usr/$(get_libdir)/python${PYVER}/site-packages
-	dosym nicotine.py /usr/bin/nicotine
-}
diff --git a/net-p2p/nicotine+/nicotine+-1.2.13.ebuild b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
index 5331109b60de..3d49275619b5 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.13.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
@@ -1,21 +1,22 @@
-# 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.13.ebuild,v 1.1 2009/09/27 05:31:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.15.ebuild,v 1.1 2010/03/03 22:41:00 dirtyepic Exp $
 
-inherit distutils multilib toolchain-funcs
+EAPI=2
+SUPPORT_PYTHON_ABIS=1
+
+inherit distutils python
 
 DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
 HOMEPAGE="http://nicotine-plus.sourceforge.net"
-#SRC_URI="http://www.nicotine-plus.org/files/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/nicotine-plus/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="geoip spell"
 
-RDEPEND="virtual/python
-	>=dev-python/pygtk-2.10
+RDEPEND=">=dev-python/pygtk-2.12
 	media-libs/mutagen
 	geoip? ( >=dev-python/geoip-python-0.2.0
 			 >=dev-libs/geoip-1.2.1 )
@@ -24,9 +25,10 @@ RDEPEND="virtual/python
 
 DEPEND="${RDEPEND}"
 
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+
 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
 }