Apply Interfaces patch against configure.ac instead of configure.ac.in. Thanks to Markos Chandras for the note.

Package-Manager: portage-2.1.10.31/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 17 insertions, 10 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 24a1571c6306..3230c8875aaa 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.167 2011/10/25 17:28:41 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.168 2011/10/28 17:25:21 billie Exp $
+
+*conky-1.8.1-r4 (28 Oct 2011)
+
+  28 Oct 2011; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1-r3.ebuild,
+  +conky-1.8.1-r4.ebuild, files/conky-1.8.1-maxinterfaces.patch:
+  Apply Interfaces patch against configure.ac instead of configure.ac.in.
+  Thanks to Markos Chandras for the note.
 
 *conky-1.8.1-r3 (25 Oct 2011)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 3772eb3ceb74..1cd8673771fd 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 AUX conky-1.8.1-acpitemp.patch 2415 RMD160 dcef233f8ba2ca192bfac3b16f0c671e1381fffe SHA1 d5000bfdddb134c4cd61e90e8bcc3bce5866c33c SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d
 AUX conky-1.8.1-curl-headers.patch 494 RMD160 26c0e9060991a9ece1e38a552da828109566daa3 SHA1 0cb58b354bbd91a44af183e4ac7022246843552d SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba
-AUX conky-1.8.1-maxinterfaces.patch 1611 RMD160 91129daabea4877cd344f9165b76d1673e23df32 SHA1 b21b6dd793299b362373ac8be0389873359218dc SHA256 53bf1866a309402148d122f718a5e278cc094223ccbf338ed57cdf519b338fc2
+AUX conky-1.8.1-maxinterfaces.patch 1605 RMD160 f4b6f51cd2ab6172f6aac9982eccc02c5c0d4f0b SHA1 9b9282e1f3866e9b1c6c7a379c67450f360375cc SHA256 34f1e53fb145fb252e1f91bcd60803870f12e4e0b31d691accc4cd83dda970ad
 AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
 AUX conky-1.8.1-secunia-SA43225.patch 1620 RMD160 3206a288819bc33048d9eee2444308b04b25fc1b SHA1 7c88144711911a6b38465311c7cf8cf6b0e6d45f SHA256 61c2d204796f51d0d51cd62e9a37a9f4f318e8fe8f955278ef86b64d5b2ff99f
 AUX conky-1.8.1-xmms2.patch 1190 RMD160 6ec093e08f55c198b5b2321acc7f3d1d7f74e267 SHA1 0e05fe363521145bde14eca99d3aebc28e258833 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.8.1-r3.ebuild 4080 RMD160 8b15c223824b8fd36f9ea5168afaf5020b250af9 SHA1 b7ab6f93df4bf503d55e1d3728c44b7d21f8de62 SHA256 c72e4c3432ee431d30cbf168d5c856dcbafc5e6a88a5c064fbd97fe3738072e6
-MISC ChangeLog 25646 RMD160 3af3345f4194771ca4820c9003a0c41353155195 SHA1 aa5ed3a380b2f278b56923170d614af82e1cdb77 SHA256 d49356db320092f4417134392edd5030aef115ac108a8e1055d8d2b43dfedab9
+EBUILD conky-1.8.1-r4.ebuild 4080 RMD160 604af025c5392aa76a138578c3835b6d497ff547 SHA1 e87f7f6a5d6e7b41be0e21e93f8e0af904226cf9 SHA256 d731a91fb3fdf989cb9d952d61757177f5271bd4d0338df01adc6464f1b6e355
+MISC ChangeLog 25935 RMD160 7998ed7cb854b5c200cfe0ac78ddf1d74b9e0928 SHA1 fb803addb6069a3752a2b6f914310ea8f4efb49a SHA256 1024c37e24d60b779eee5c6b928f6db81ac07e5f4b5773fae49de733de6ab397
 MISC metadata.xml 2035 RMD160 c4c5aca3e9d74df22ceec820eab9b1f25798cdb0 SHA1 791f5991269e7d531c11c3f9eeb784607a3730b0 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk6m8dUACgkQlcuUeyFa0U2o7wCg+lcmAiU/bHyFenofKcekI9ti
-5ugAoK2Yv5vHQ/0V2iATXYwAxI3a2xzs
-=DdJu
+iEYEAREIAAYFAk6q5ZAACgkQlcuUeyFa0U2c9wCeO1ZiolpZPL5zNGfRdY9R+tOo
+xdgAoIIe80wvQ+7oPnifjY4Blo6pqsAz
+=g3Wb
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.1-r3.ebuild b/app-admin/conky/conky-1.8.1-r4.ebuild
index 6a5d0c75c7d9..29a90998cc2f 100644
--- a/app-admin/conky/conky-1.8.1-r3.ebuild
+++ b/app-admin/conky/conky-1.8.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r3.ebuild,v 1.1 2011/10/25 17:28:41 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r4.ebuild,v 1.1 2011/10/28 17:25:21 billie Exp $
 
 EAPI=2
 
diff --git a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
index 97c58460114f..6f2097e120b4 100644
--- a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
+++ b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
@@ -12,8 +12,8 @@ MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505
 
 diff --git a/configure.ac.in b/configure.ac.in
 index 0f00237..d52d998 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -802,7 +802,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user])
  AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.])
  AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.])