[gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/

[Jeroen Roovers]

commit:     9d98689edb12ba9a987e68c4fda46608769ff6bc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 11:08:28 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu May 25 11:09:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d98689e

media-sound/ncmpcpp: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/ncmpcpp/Manifest                       |  1 +
 .../{ncmpcpp-9999.ebuild => ncmpcpp-0.8.ebuild}    | 28 ++++++++--------------
 media-sound/ncmpcpp/ncmpcpp-9999.ebuild            | 15 ++++--------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index fc7ad160f4e..6fc37cf350c 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1 +1,2 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 SHA256 
b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef SHA512 
a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 WHIRLPOOL 
49a5e16cf583424618db5e2c38a946cc60d5ea2e17015c7e6232c91f84cf44c308389b81bb2f380045f3f9595d83a13c2a4f571930ea122e85437f4e6cccb4d1
+DIST ncmpcpp-0.8.tar.bz2 464165 SHA256 
2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a SHA512 
b51217df85f95efa345f0484f16024bd74c1c0e22f2c2b25238335fc2f00caf81877088170f241c1d97fd328d104b19f022dc4de9895ff420f1fcbea341e7cdb
 WHIRLPOOL 
765bd7889d16ea88a574ec9da3a3a50a68c133a51d976053cf1fe533b9a8d21da3e789e76d6c50b18190a36915e57daa7e4e1378154b79c1119068cc82be6085

diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild 
b/media-sound/ncmpcpp/ncmpcpp-0.8.ebuild
similarity index 67%
copy from media-sound/ncmpcpp/ncmpcpp-9999.ebuild
copy to media-sound/ncmpcpp/ncmpcpp-0.8.ebuild
index 7fc8bf0dcaf..937bcfe975b 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.ebuild
@@ -1,30 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/";
-EGIT_REPO_URI="git://repo.or.cz/ncmpcpp.git"
-LICENSE="GPL-2"
+HOMEPAGE="https://rybczak.net/ncmpcpp/";
+SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="clock curl outputs taglib unicode visualizer"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
        !dev-libs/boost:0/1.57.0
        >=media-libs/libmpdclient-2.1
        dev-libs/boost:=[nls,threads]
-       sys-libs/ncurses:=[unicode?]
+       net-misc/curl
+       sys-libs/ncurses:=
        sys-libs/readline:*
-       curl? ( net-misc/curl )
        taglib? ( media-libs/taglib )
-       unicode? (
-               dev-libs/boost:=[icu]
-               dev-libs/icu:=
-       )
        visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="
@@ -35,18 +30,15 @@ DEPEND="
 src_prepare() {
        default
 
-       sed -i -e '/^docdir/d' {,doc/}Makefile.am || die
-       sed -i -e 's|COPYING||g' Makefile.am || die
-       eautoreconf
+       sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+       sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
 }
 
 src_configure() {
        econf \
                $(use_enable clock) \
                $(use_enable outputs) \
-               $(use_enable unicode) \
                $(use_enable visualizer) \
-               $(use_with curl) \
                $(use_with taglib) \
                $(use_with visualizer fftw) \
                --docdir=/usr/share/doc/${PF}

diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild 
b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 7fc8bf0dcaf..1a95c8ad5fb 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,20 +11,16 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="clock curl outputs taglib unicode visualizer"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
        !dev-libs/boost:0/1.57.0
        >=media-libs/libmpdclient-2.1
        dev-libs/boost:=[nls,threads]
-       sys-libs/ncurses:=[unicode?]
+       net-misc/curl
+       sys-libs/ncurses:=
        sys-libs/readline:*
-       curl? ( net-misc/curl )
        taglib? ( media-libs/taglib )
-       unicode? (
-               dev-libs/boost:=[icu]
-               dev-libs/icu:=
-       )
        visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="
@@ -37,6 +33,7 @@ src_prepare() {
 
        sed -i -e '/^docdir/d' {,doc/}Makefile.am || die
        sed -i -e 's|COPYING||g' Makefile.am || die
+
        eautoreconf
 }
 
@@ -44,9 +41,7 @@ src_configure() {
        econf \
                $(use_enable clock) \
                $(use_enable outputs) \
-               $(use_enable unicode) \
                $(use_enable visualizer) \
-               $(use_with curl) \
                $(use_with taglib) \
                $(use_with visualizer fftw) \
                --docdir=/usr/share/doc/${PF}