Fix config file install path (bug #327959)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 34 insertions, 5 deletions

diff --git a/media-sound/mpdscribble/ChangeLog b/media-sound/mpdscribble/ChangeLog
index 864373293660..15e815de1bb6 100644
--- a/media-sound/mpdscribble/ChangeLog
+++ b/media-sound/mpdscribble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpdscribble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.37 2010/07/08 19:13:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/ChangeLog,v 1.38 2010/09/11 06:23:50 angelos Exp $
+
+  06 Sep 2010; <angelos@gentoo.org> mpdscribble-0.19.ebuild,
+  +files/mpdscribble-0.19-config_path.patch:
+  Fix config file install path (bug #327959)
 
   08 Jul 2010; Raúl Porcel <armin76@gentoo.org> mpdscribble-0.19.ebuild:
   sparc stable wrt #320929
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 44c1fc183661..d6dcb63cd8a0 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,4 +1,5 @@
 AUX mpdscribble-0.18-ldadd_gthread.patch 584 RMD160 2fbe382997f5e1a9931477ad1d5ae77031311d97 SHA1 1e58b259ea3ccfad22ebbfc83d188e2512725302 SHA256 cb9e056680f6ac183e90722cc3ea09ed529afde738d20402192f6fbab5581ac5
+AUX mpdscribble-0.19-config_path.patch 1070 RMD160 55644ea1d26d30ba0171797015341060efd9db22 SHA1 617f8dcfff81308bed1387e5174ffff80fc258ef SHA256 128bdd4e47bc4eb53573ded19668ed617ec8bd367b000313956eef38d8465c21
 AUX mpdscribble.rc 474 RMD160 b64550bf36a751e95197620d5afb3f370e45e5ab SHA1 b341f6af0a10353f7e0d05b10f9f091102e103b2 SHA256 c53787e97649d65b86de9fa041a5030727cd01f3ffebd330bc63abdb2eb88a93
 DIST mpdscribble-0.17.tar.bz2 124652 RMD160 387ab2225de996f21b3cb796a15ff414551177e1 SHA1 80f428bab751f5248cbdb55fe2ac4252a7ea0bed SHA256 228a66b7544228cabef9df4cbc44f9704c26e1f4a3ed7792f81abbf6366fd416
 DIST mpdscribble-0.18.1.tar.bz2 126854 RMD160 0177f7ecfe1dcf8f01b2b969a5e8e38c99512c35 SHA1 0697b0dbbfdee1ca084de1b71373f9cba719ecea SHA256 3939a9df2f48a3d1ce96ba3c2cc650887c479c278917eb579411b31ccc0c38a7
@@ -7,6 +8,6 @@ DIST mpdscribble-0.19.tar.bz2 115124 RMD160 3b0a381b7426ae5b273e5187c9a180e375ef
 EBUILD mpdscribble-0.17.ebuild 892 RMD160 1ed4d1861c40951b409dc4f8b80bf6a1fc54ee24 SHA1 daf8e38454bdef4f4c661130098772c298bb84df SHA256 ba2bb5e4ceddb5964a22dffc1f784187364b56378e56610f1f95ae6da2895125
 EBUILD mpdscribble-0.18.1.ebuild 1150 RMD160 b8cf99af955ed0e8b8a6220b817aa5eaa3c3b589 SHA1 c6b25261a8af8861e7f5f6efe4fb7ac6a98146e1 SHA256 a4b0daaf17c885e65a9ee1251f7e9ef2df39bcc609d7feb70918f9b0ef4f74ab
 EBUILD mpdscribble-0.18.ebuild 1144 RMD160 374eabf15deb2fea0e795ae51aa3a8773208c1e3 SHA1 6c1a96192331fbefb569aba4e1c8a589b0061b5b SHA256 a41d839dd06db7e3dcd2d74db4ff0815e597faa921c52004c07604f840f26213
-EBUILD mpdscribble-0.19.ebuild 1170 RMD160 4507a851b23135cfd3475eb3c7ec8698cade9e79 SHA1 fa8f8784df6e5ae90bf17690c633e061cdba39c7 SHA256 022cb2c47a1bb9106b091ac6a070dfc22b0eb5ca8878bc4546a91bd9b60b7fc3
-MISC ChangeLog 5672 RMD160 1eb9017f7af551da13a80e27071d66cfcbb8da1e SHA1 61a52f2011f640966852593814835fa0eea0d00a SHA256 2034dbe90d9fefb105185556c2abb193d63c9b3f2dc04e9fb835bb326cfcbf54
+EBUILD mpdscribble-0.19.ebuild 1232 RMD160 a116b5ab39544c61038329f957c82cc07923e385 SHA1 624cfe8c2075e30b681dfddc78ceeeb79de0339c SHA256 25103aa48e1f27837335a4ab433c42537a988ab902f73da2888deac298d45813
+MISC ChangeLog 5824 RMD160 b5960a50668ad3361d263bfd65d16207dc42ab10 SHA1 7359f053b0bc6b926bfb0e4640f4a9a32c6e21cc SHA256 680636523e0d28ffe5e8c8204b7b7300d1c067374d3a83c8cbc406085f4d8fef
 MISC metadata.xml 692 RMD160 6329e2163adbe48b0f1129bd858956aeeb7aa9d6 SHA1 8cbecb112f1a406a0013c13b150e0ce983c6283b SHA256 0f16c0804f0808cafc0787f4992f5fd8c6866b96d6f4c535a90fc8c476636230
diff --git a/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch b/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch
new file mode 100644
index 000000000000..c352410ef6be
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble-0.19-config_path.patch
@@ -0,0 +1,22 @@
+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.19.ebuild b/media-sound/mpdscribble/mpdscribble-0.19.ebuild
index 602daef1a81e..78add76ef384 100644
--- a/media-sound/mpdscribble/mpdscribble-0.19.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.19.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.19.ebuild,v 1.6 2010/07/08 19:13:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpdscribble/mpdscribble-0.19.ebuild,v 1.7 2010/09/11 06:23:50 angelos Exp $
 
 EAPI=2
+WANT_AUTOMAKE="1.11"
 inherit autotools eutils
 
 DESCRIPTION="An MPD client that submits information to Audioscrobbler"
@@ -22,7 +23,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.18-ldadd_gthread.patch
+	epatch "${FILESDIR}"/${PN}-0.18-ldadd_gthread.patch \
+		"${FILESDIR}"/${P}-config_path.patch
 	eautoreconf
 }