Add patch from upstream to fix if_existing. See bug #328891.

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

4 files changed, 35 insertions, 15 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 5de0a648a0a3..1b31ff644175 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.137 2010/07/14 14:06:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.138 2010/07/24 21:44:53 billie Exp $
+
+  24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild,
+  +files/conky-1.8.0-if-existing.patch:
+  Add patch from upstream to fix if_existing. See bug #328891.
 
   14 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   conky-1.8.0-r1.ebuild:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 214675b265af..4ddc3a955969 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
+AUX conky-1.8.0-if-existing.patch 827 RMD160 f04dd3c6423239118b28fb3d6e2a97ddc2a5f599 SHA1 88833bcad141c3a461d6e85739c9f7b318cd45dd SHA256 6a5b0bc9058f4a97cc9377110c4b5350197945fc1f7e7b100619c16438196493
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1
 EBUILD conky-1.8.0-r1.ebuild 3965 RMD160 07fc8a9f34bc7eda8c358b3aac93445dba442625 SHA1 a045a2e771952cb69e1078f428fb544347f6b59a SHA256 5ff216043923ef95458b314f5fca674e215d86518f7fe88e375e4d0a3648e1ab
-EBUILD conky-1.8.0-r2.ebuild 4002 RMD160 a27d501ee5be4b7f5cb7aee11838147db15535cf SHA1 c692c16315203f083f75406ea5e24d6b183faed4 SHA256 4584ecc90cef8374e4ca52610ab546471d604e96842d4f6a1b008cf15a877f2d
-MISC ChangeLog 21191 RMD160 f03b286e48262d887f5f8735f82fa81e0c5245d8 SHA1 950744b139fe67a3896176b5ce1c932e272285ab SHA256 4c2bcac41a8d257664b8d57f081f3bebede3f07bb6ea284d75cde6f9dcc5bc21
+EBUILD conky-1.8.0-r2.ebuild 4050 RMD160 1af0045c505307b18a7d7a28b1e9eadd3d7aeb7b SHA1 10a98e036daa27a11907c46865f774ba9333d678 SHA256 68999cbcaf9b8330442c72d89a9fd12f2ec57ff6a24270052dc45474823a8344
+MISC ChangeLog 21371 RMD160 b50c4cc5c542fda104994b1842932196fc332d2a SHA1 d99bb2aae98077db10c2652e741c91327690c175 SHA256 c9ec802ce920d4ffafa26f7a090e2d83c1133a1126ae297a10a9e1e2e0a312ab
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw9xOMACgkQNQqtfCuFneMObQCdF1pJxfVgkE0CRrhhLG4ujThS
-2lAAniPXZo1rKlf1as0Knlw+AGN4gbSY
-=WzjX
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.0-r2.ebuild b/app-admin/conky/conky-1.8.0-r2.ebuild
index cf1eb8d8a894..9cbaaf26851a 100644
--- a/app-admin/conky/conky-1.8.0-r2.ebuild
+++ b/app-admin/conky/conky-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.1 2010/07/03 20:07:57 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.2 2010/07/24 21:44:53 billie Exp $
 
 EAPI="2"
 
@@ -54,7 +54,8 @@ DEPEND="
 
 src_prepare() {
 	epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
-		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch"
+		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \
+		"${FILESDIR}/conky-1.8.0-if-existing.patch"
 	eautoreconf
 }
 
diff --git a/app-admin/conky/files/conky-1.8.0-if-existing.patch b/app-admin/conky/files/conky-1.8.0-if-existing.patch
new file mode 100644
index 000000000000..d7a8df95f9a5
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.0-if-existing.patch
@@ -0,0 +1,24 @@
+X-Git-Url: http://git.omp.am/?p=conky.git;a=blobdiff_plain;f=src%2Fconky.c;h=790e93c599414099ebca1f1ac6dafc1d54a8a2cb;hp=7e61f51d0197a1f700a0e0a77bf89575685cf22b;hb=9c5e5d86bd74465ca1b6f037b084bdb0eda453f7;hpb=c8e687406502be8c6f4e75b077113591823405f0
+
+diff --git a/src/conky.c b/src/conky.c
+index 7e61f51..790e93c 100644
+--- a/src/conky.c
++++ b/src/conky.c
+@@ -463,7 +463,7 @@ int check_contains(char *f, char *s)
+ 		}
+ 		fclose(where);
+ 	} else {
+-		NORM_ERR("Could not open the file");
++		NORM_ERR("Could not open the file '%s'", f);
+ 	}
+ 	return ret;
+ }
+@@ -1330,7 +1330,7 @@ void generate_text_internal(char *p, int p_max_size,
+ 					DO_JUMP;
+ 				} else if (spc) {
+ 					*spc = '\0';
+-					if (check_contains(obj->data.s, spc + 1))
++					if (!check_contains(obj->data.s, spc + 1))
+ 						DO_JUMP;
+ 					*spc = ' ';
+ 				}