Version bump and remove unused patch

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

3 files changed, 43 insertions, 23 deletions

diff --git a/media-sound/mpdscribble/ChangeLog b/media-sound/mpdscribble/ChangeLog
index eb94f7407d4c..b076fca2dccf 100644
--- a/media-sound/mpdscribble/ChangeLog
+++ b/media-sound/mpdscribble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpdscribble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.45 2011/06/14 16:36:04 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.46 2011/07/09 21:31:16 angelos Exp $
+
+*mpdscribble-0.22 (09 Jul 2011)
+
+  09 Jul 2011; Christoph Mende <angelos@gentoo.org>
+  -files/mpdscribble-0.19-config_path.patch, +mpdscribble-0.22.ebuild:
+  Version bump and remove unused patch
 
   14 Jun 2011; Christoph Mende <angelos@gentoo.org> mpdscribble-0.21.ebuild:
   Force libsoup, curl's last working version was removed
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch b/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch
deleted file mode 100644
index c352410ef6be..000000000000
--- a/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/work/mpdscribble-0.19/Makefile.am b/work/mpdscribble-0.19/Makefile.am
-index 626fde8..40862cb 100644
---- a/work/mpdscribble-0.19/Makefile.am
-+++ b/work/mpdscribble-0.19/Makefile.am
-@@ -61,12 +61,12 @@ install-dist_sysconfDATA:
- 	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
- 	@list='$(dist_sysconf_DATA)'; \
- 	for p in $$list; do \
--	    dest=$(am__strip_dir) \
--	    if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
--	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
-+	    $(am__strip_dir) \
-+	    if test -f $(DESTDIR)$(sysconfdir)/$$f; then \
-+	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$f"; \
- 	    else \
- 	        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	        echo " $(INSTALL_SECURE) $$d$$p $(DESTDIR)$(sysconfdir)/$$dest"; \
--	        $(INSTALL_SECURE) $$d$$p $(DESTDIR)$(sysconfdir)/$$dest; \
-+	        echo " $(INSTALL_SECURE) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
-+	        $(INSTALL_SECURE) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
- 	    fi; \
- 	done
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
new file mode 100644
index 000000000000..fa18f67d1988
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.22.ebuild,v 1.1 2011/07/09 21:31:16 angelos Exp $
+
+EAPI=4
+inherit eutils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="+curl"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=media-libs/libmpdclient-2.2
+	curl? ( net-misc/curl )
+	!curl? ( net-libs/libsoup:2.4 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_configure() {
+	local myclient=soup
+	use curl && myclient=curl
+	econf \
+		--with-http-client=${myclient} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	dodir /var/cache/mpdscribble
+}