media-sound/mpdscribble: add 9999 version.

Closes: https://github.com/gentoo/gentoo/pull/2786

diff --git a/media-libs/libmpdclient/libmpdclient-2.10.ebuild b/media-libs/libmpdclient/libmpdclient-2.10.ebuild
index 979b375ee78521824d45cd48a201cf525058b62b..2f6798b9a6c43178daf3112b587f1b988e216434 100644 (file)
--- 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 da08103d786b97062882f116175bb4d77c9fa9c2..71fcf1bb420b053000cf81256cb92fe023cc9f79 100644 (file)
--- 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 e498ca6e2e7ffd2bf7813776554b9e8931e173da..d995367e13f637871316d95cc69493bcd81716bb 100644 (file)
--- 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-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild
new file mode 100644 (file)
index 0000000..5e27b2d
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit git-r3
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Mpdscribble"
+EGIT_REPO_URI="git://git.musicpd.org/master/mpdscribble.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+curl"
+
+RDEPEND="dev-libs/glib
+       media-libs/libmpdclient
+       curl? ( net-misc/curl )
+       !curl? ( net-libs/libsoup:2.4 )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+src_configure() {
+       econf \
+               --with-http-client=$(usex curl curl soup)
+}
+
+src_install() {
+       default
+       newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+       dodir /var/cache/mpdscribble
+}