[gentoo-commits] repo/gentoo:master commit in: net-p2p/nicotine+/

["Jason Donenfeld" <zx2c4@gentoo.org>]

commit:     05bd0d6528b0943dbdbdb77194d9e0d150ed7d6c
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 17:51:53 2018 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 17:52:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bd0d65

net-p2p/nicotine+: version bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-p2p/nicotine+/Manifest                         |  2 +-
 net-p2p/nicotine+/metadata.xml                     |  3 +--
 ...ne+-1.2.16-r1.ebuild => nicotine+-1.4.1.ebuild} | 27 +++++-----------------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 7696979f420..047e9967a8a 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1 +1 @@
-DIST nicotine+-1.2.16.tar.bz2 3892006 BLAKE2B 627ad763a319decd93b02e08273bee03545d623cdbcd7b274a51ff691947ed63fe7e290d29363ea806b350303df624afcedd7a3dbd88d30e31a6e6b138135fee SHA512 8b5b7f99e14f28f3a1c7a77fc12662cfafa0f9ac9d3c8c2a2d1e959f96a9161005a29ad2ed07fa07ea8908b88f247f3c120b299e7183a0558994b5e96cb47f78
+DIST nicotine+-1.4.1.tar.gz 3824830 BLAKE2B def211a4d06b1cb6a409917579652b3a1c8c36ec5ecfe5e295b9fabeaaca02cd4999fd20935c8999d4cf989f3ecff0a0a2c7f52a40f8c2b03e05b6c9dc2feca9 SHA512 894dfb318b205b6be21face0308f183da15772f329158c6a9a8a816dfdf231ad89245188acad5538821b2a778c8a8a6201ce8548cc58550c4eb6c0763db9d66a

diff --git a/net-p2p/nicotine+/metadata.xml b/net-p2p/nicotine+/metadata.xml
index 202f8408697..0acc3684dd5 100644
--- a/net-p2p/nicotine+/metadata.xml
+++ b/net-p2p/nicotine+/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
-		<remote-id type="github">eLvErDe/nicotine-plus</remote-id>
-		<remote-id type="sourceforge">nicotine-plus</remote-id>
+		<remote-id type="github">Nicotine-Plus/nicotine-plus</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-p2p/nicotine+/nicotine+-1.2.16-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1.ebuild
similarity index 53%
rename from net-p2p/nicotine+/nicotine+-1.2.16-r1.ebuild
rename to net-p2p/nicotine+/nicotine+-1.4.1.ebuild
index dd2b659a064..a6d9d9d6de4 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.16-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,34 +9,19 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
 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"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-	gnome-base/librsvg"
+RDEPEND=">=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:\(Icon=\).*:\1nicotine-plus-32px:' \
-		"${S}"/files/nicotine.desktop
-}
-
-src_install() {
-	distutils-r1_src_install
-	python_fix_shebang "${D}"
-	dosym nicotine.py /usr/bin/nicotine
-}
+S="${WORKDIR}/nicotine-plus-${PV}"
 
 pkg_postinst() {
 	echo