Version bump. Remove optional packages from USE and RDEPEND as suggested by

mgorny in bug #289904. Remove old.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

4 files changed, 66 insertions, 36 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index 0d3295fd6622..a407dec1fd29 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2010/10/15 19:16:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.50 2010/12/21 04:27:36 dirtyepic Exp $
+
+*nicotine+-1.2.16 (21 Dec 2010)
+
+  21 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> -nicotine+-1.2.14.ebuild,
+  +nicotine+-1.2.16.ebuild:
+  Version bump. Remove optional packages from USE and RDEPEND as suggested by
+  mgorny in bug #289904. Remove old.
 
   15 Oct 2010; Brent Baude <ranger@gentoo.org> nicotine+-1.2.15.ebuild:
   stable ppc, bug 326495
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 132488aabe20..46316e263106 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,6 +1,16 @@
-DIST nicotine+-1.2.14.tar.bz2 3876545 RMD160 363af1d75c5f69e3bbb53d05f5ef335d69af9877 SHA1 84e7e4e8eb090fbb3b7f7a8646009cbacac4b354 SHA256 6fe9ea7b1c64000c058bfeb0f666113e389028f80b98f667d1cc0097c79e14bb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nicotine+-1.2.15.tar.bz2 3893349 RMD160 92f83bd5b826ee121d7a3e51e49f75a9d79bd7e0 SHA1 95c01989a2022487dae48cb2caab2f90ddfa73d2 SHA256 2c92f942bda2ee9447ca519b30a3da903b56e49e10c166adf298f3402ebd2f56
-EBUILD nicotine+-1.2.14.ebuild 877 RMD160 b479a2fd3840f85d9386e8a42d2804f23286bb3d SHA1 f2c4c20858cd9ffb283ca19ce7983882a3307cc4 SHA256 1840eedb9853124cbbae7435f517f471c4eee6565863767c5868a1a56b2376e8
+DIST nicotine+-1.2.16.tar.bz2 3892006 RMD160 8f99535545933e550033f5e07c2112876287063a SHA1 ea6b89c2cf0c2aa69c18c83ff1ac346fc1b2e7a5 SHA256 71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d
 EBUILD nicotine+-1.2.15.ebuild 918 RMD160 5cce2516fd0c3e80316006d10fc4fa88c7c680a9 SHA1 d05ff6b4c377b2c9f62493dea6250abb1498667e SHA256 fcc79a54c6a592a806d74a8e7c853d3adb904b7c84863163135e6d73f0fd5ec9
-MISC ChangeLog 6794 RMD160 9789f5b8d1da7d9f6f9efd20bb1c4098069f155d SHA1 1ea02fbccf39a906118f294117242ea6e2b9a5a0 SHA256 c89cbb860f421d52d00d69bff9a0702cc16acd382441c7da614ac673fd540acb
+EBUILD nicotine+-1.2.16.ebuild 1166 RMD160 0e118dd7f32d62b175b8b4e8cdcce75b003fb8ef SHA1 f7b3036078382f938c05a462fcb3d1d3fab735a8 SHA256 8d43f87bfa873bb0fc8c3902356e9453d68cd04c622496d1e40a7eac973fccf9
+MISC ChangeLog 7048 RMD160 f63035ac3a91a396bc1134c43d98f9ed73543256 SHA1 98ed45482a399dc9459bd7a32c7e93770618be1a SHA256 778cbacbd258fea478b1931abe2fc143b62ec7c4af0fec375cc0b17f85d3966f
 MISC metadata.xml 253 RMD160 c5653dbfa27ea739e3430aed0980016fd12aa68f SHA1 461dedcaf3322af7e59c93c21845796c5fa27419 SHA256 301f970e0628e48cfeaf5bd540b63c012452b458b76ef05bb0bcbe640a0f373f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0QLfsACgkQiqiDRvmkBmIWTwCcCAsgtUUUzKQjgJBmy/9x0bF8
+PAIAoLA7a9XsT2WgOuacXrD/iR2lmlen
+=RAKc
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/nicotine+/nicotine+-1.2.14.ebuild b/net-p2p/nicotine+/nicotine+-1.2.14.ebuild
deleted file mode 100644
index 4590a7318a64..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.2.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.4 2010/06/01 10:52:00 arfrever Exp $
-
-inherit distutils
-
-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="http://129.125.101.92/${PN}/${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}"
-
-PYTHON_MODNAME="pynicotine"
-
-src_install() {
-	distutils_src_install
-	dosym nicotine.py /usr/bin/nicotine
-}
diff --git a/net-p2p/nicotine+/nicotine+-1.2.16.ebuild b/net-p2p/nicotine+/nicotine+-1.2.16.ebuild
new file mode 100644
index 000000000000..e4031d5072fe
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-1.2.16.ebuild
@@ -0,0 +1,45 @@
+# 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.16.ebuild,v 1.1 2010/12/21 04:27:36 dirtyepic Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="http://nicotine-plus.sourceforge.net"
+SRC_URI="mirror://sourceforge/nicotine-plus/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2.12"
+
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="pynicotine"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_install() {
+	distutils_src_install
+	python_convert_shebangs -r 2 "${D}"
+	dosym nicotine.py /usr/bin/nicotine
+}
+
+pkg_postinst() {
+	echo
+	elog "You may want to install these packages to add additional features"
+	elog "to Nicotine+:"
+	elog
+	elog "dev-python/geoip-python         Country lookup and flag display"
+	elog "dev-python/sexy-python          Spellchecking for chat rooms"
+	elog "media-libs/mutagen              Media metadata extraction"
+	elog "net-libs/miniupnpc              UPnP portmapping"
+	echo
+}