commit: 1e32cf3f3cab7f2ff274fc2baaa61f7368152756 Author: soredake <fdsfgs <AT> krutt <DOT> org> AuthorDate: Wed Nov 9 02:36:17 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Nov 21 00:34:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e32cf3f
media-sound/mpdscribble: add 9999 version. Closes: https://github.com/gentoo/gentoo/pull/2786 media-libs/libmpdclient/libmpdclient-2.10.ebuild | 10 +++++----- media-libs/libmpdclient/libmpdclient-2.9.ebuild | 10 +++++----- media-sound/mpdscribble/mpdscribble-0.22.ebuild | 13 +++++-------- ...pdscribble-0.22.ebuild => mpdscribble-9999.ebuild} | 19 ++++++++----------- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/media-libs/libmpdclient/libmpdclient-2.10.ebuild b/media-libs/libmpdclient/libmpdclient-2.10.ebuild index 979b375..2f6798b 100644 --- a/media-libs/libmpdclient/libmpdclient-2.10.ebuild +++ b/media-libs/libmpdclient/libmpdclient-2.10.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)" -HOMEPAGE="http://www.musicpd.org"; -SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"; +HOMEPAGE="https://www.musicpd.org"; +SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"; LICENSE="BSD" SLOT="0" @@ -17,12 +17,12 @@ RDEPEND="" DEPEND="doc? ( app-doc/doxygen )" src_prepare() { + default sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in } src_configure() { econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ $(use_enable static-libs static) \ $(use_enable doc documentation) } diff --git a/media-libs/libmpdclient/libmpdclient-2.9.ebuild b/media-libs/libmpdclient/libmpdclient-2.9.ebuild index da08103..71fcf1b 100644 --- a/media-libs/libmpdclient/libmpdclient-2.9.ebuild +++ b/media-libs/libmpdclient/libmpdclient-2.9.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)" -HOMEPAGE="http://www.musicpd.org"; -SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"; +HOMEPAGE="https://www.musicpd.org"; +SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"; LICENSE="BSD" SLOT="0" @@ -17,12 +17,12 @@ RDEPEND="" DEPEND="doc? ( app-doc/doxygen )" src_prepare() { + default sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in } src_configure() { econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ $(use_enable static-libs static) \ $(use_enable doc documentation) } diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild index e498ca6..d995367 100644 --- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild +++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 inherit eutils DESCRIPTION="An MPD client that submits information to Audioscrobbler" @@ -14,19 +14,16 @@ SLOT="0" KEYWORDS="amd64 ~hppa ~ppc x86" IUSE="+curl" -RDEPEND=">=dev-libs/glib-2.16:2 - >=media-libs/libmpdclient-2.2 +RDEPEND="dev-libs/glib + media-libs/libmpdclient curl? ( net-misc/curl ) !curl? ( net-libs/libsoup:2.4 )" DEPEND="${RDEPEND} virtual/pkgconfig" src_configure() { - local myclient=soup - use curl && myclient=curl econf \ - --with-http-client=${myclient} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} + --with-http-client=$(usex curl curl soup) } src_install() { diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild similarity index 58% copy from media-sound/mpdscribble/mpdscribble-0.22.ebuild copy to media-sound/mpdscribble/mpdscribble-9999.ebuild index e498ca6..5e27b2d 100644 --- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild +++ b/media-sound/mpdscribble/mpdscribble-9999.ebuild @@ -1,32 +1,29 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 -inherit eutils +EAPI=6 +inherit git-r3 DESCRIPTION="An MPD client that submits information to Audioscrobbler" HOMEPAGE="http://mpd.wikia.com/wiki/Client:Mpdscribble"; -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" +EGIT_REPO_URI="git://git.musicpd.org/master/mpdscribble.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" +KEYWORDS="" IUSE="+curl" -RDEPEND=">=dev-libs/glib-2.16:2 - >=media-libs/libmpdclient-2.2 +RDEPEND="dev-libs/glib + media-libs/libmpdclient curl? ( net-misc/curl ) !curl? ( net-libs/libsoup:2.4 )" DEPEND="${RDEPEND} virtual/pkgconfig" src_configure() { - local myclient=soup - use curl && myclient=curl econf \ - --with-http-client=${myclient} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} + --with-http-client=$(usex curl curl soup) } src_install() {
