5 files changed, 34 insertions, 12 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 524a4ad7e1ef..313ef908853f 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # 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.164 2011/07/29 06:40:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.165 2011/08/06 23:14:18 billie Exp $
+
+  06 Aug 2011; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r1.ebuild,
+  conky-1.8.1-r2.ebuild, +files/conky-1.8.1-maxinterfaces.patch:
+  Add patch to increase the number of maximum network devices. This fixes bug
+  #365287. Thanks to Markos Chandras for the report.
 
   29 Jul 2011; Christoph Mende <angelos@gentoo.org> conky-1.8.0-r1.ebuild,
   conky-1.8.1-r2.ebuild, +files/conky-1.8.1-curl-headers.patch:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 28a7de0fbb2c..d7368bf66215 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -5,19 +5,20 @@ AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a7
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 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 720 RMD160 85a267900576b3e80d0e7f55ce3ac454383a5d79 SHA1 528e8547fcecd64bd82ba8e2f6249655fd78ab91 SHA256 e732dee459cf0e9901f65af1b2c322d526b8a22f55229c68152d2ab38acd2ad4
 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.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.8.0-r1.ebuild 4010 RMD160 93077b67329c48907ad9cd366a6c80c62588f4bf SHA1 4adeb54854518d7d43bd9e184e47db3a04841e87 SHA256 280ac43b204f0edf7ac2e8996e96fc415e5f09468ed2d707e9c5c89a85c3b96d
-EBUILD conky-1.8.1-r2.ebuild 4015 RMD160 093ab0a8765481fc88ef7ddf7aaba3359be9fe5b SHA1 10d1b38fb09d0bcce7813444d244d74cfe69dcf1 SHA256 f015d931a085dd2e7b1ee08af161a8d3b57ddc42828e1dcd0dca7b8bf1f8d450
-MISC ChangeLog 24902 RMD160 7354f53fd863e4fd0a5052b12b0721ef4cb09a0f SHA1 01929f1c5581bcd4ff77042ea24158871c770b44 SHA256 306fc0bdb83c4dfd7786f6daa0e1547bed7e6bc75027bbca1d92227a99710a98
+EBUILD conky-1.8.0-r1.ebuild 4060 RMD160 e4f5a72c42f590a99eada7cfaa916f46fa9ca6e9 SHA1 0c8c3f9b6936cb932b2345dc26a65dcab372f0d4 SHA256 1690f1a684660c78a24cd57b20e804db21109e45274e077deaa91b5fc03893db
+EBUILD conky-1.8.1-r2.ebuild 4080 RMD160 f9ad842b52ade41f3955398a654ea79a3c031574 SHA1 fa0f0755ec0b528acb8f7ac298a8feee47cd7854 SHA256 5350840bc4c00bfa8c778fa8d2642981aa196c43368955cb3e3d7efe675af364
+MISC ChangeLog 25173 RMD160 9ea5eb446da1fec5d79ab4a6b14be9cd0efdfe93 SHA1 2b903ff7811a8a57a1431ad094ca090cc5992200 SHA256 e5ccabf21e9496dbfe8d1a5fed8f3b0c14f16f619c2987a50c1bd66ab0749dbd
 MISC metadata.xml 2057 RMD160 811d4a824c4e8b85e5817aff1d533425f85ffbab SHA1 be48ada89f6cbf83923cb6b7933a45884dfe1920 SHA256 9aac2a13ac4dcc06f0842a7177a3ea41d00ab452f9492064cd6620c3c6b8477e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4yVbIACgkQmWq1bYTyC0OniQEAyBP++t5RNEcqXZRIhEyfYpa5
-CiW9phpa4zoug7rx03wBAKc4SadF5WERLsrdnNLkq2ZhoJgTM5kgBwXEdnil3R54
-=O0gB
+iEYEAREIAAYFAk49yukACgkQlcuUeyFa0U2y7wCfRJAE0gfv4RyBfU5xG2OHytko
+p/0AoIzQBhLsFo7RX4Ru80ZZOJXdeQwi
+=Hh38
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild
index dbcb144452f1..a36ba4186093 100644
--- a/app-admin/conky/conky-1.8.0-r1.ebuild
+++ b/app-admin/conky/conky-1.8.0-r1.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.0-r1.ebuild,v 1.9 2011/07/29 06:40:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.10 2011/08/06 23:14:18 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}/${PN}-1.8.1-curl-headers.patch"
+		"${FILESDIR}/${PN}-1.8.1-curl-headers.patch" \
+		"${FILESDIR}/${PN}-1.8.1-maxinterfaces.patch"
 	eautoreconf
 }
 
diff --git a/app-admin/conky/conky-1.8.1-r2.ebuild b/app-admin/conky/conky-1.8.1-r2.ebuild
index 4e31a8cce1ff..a2c21f88e441 100644
--- a/app-admin/conky/conky-1.8.1-r2.ebuild
+++ b/app-admin/conky/conky-1.8.1-r2.ebuild
@@ -1,10 +1,10 @@
 # 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-r2.ebuild,v 1.7 2011/07/29 06:40:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.8 2011/08/06 23:14:18 billie Exp $
 
 EAPI=2
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="http://conky.sourceforge.net/"
@@ -57,7 +57,9 @@ src_prepare() {
 		"${FILESDIR}/${P}-xmms2.patch" \
 		"${FILESDIR}/${P}-secunia-SA43225.patch" \
 		"${FILESDIR}/${P}-acpitemp.patch" \
-		"${FILESDIR}/${P}-curl-headers.patch"
+		"${FILESDIR}/${P}-curl-headers.patch" \
+		"${FILESDIR}/${P}-maxinterfaces.patch"
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
new file mode 100644
index 000000000000..41bb9584ab12
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
@@ -0,0 +1,13 @@
+Index: conky-1.8.1/configure.ac
+===================================================================
+--- conky-1.8.1.orig/configure.ac
++++ conky-1.8.1/configure.ac
+@@ -790,7 +790,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc",
+ 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.])
+ AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers])
+-AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices])
++AC_DEFINE(MAX_NET_INTERFACES, 64, [Maximum number of network devices])
+ 
+ dnl
+ dnl Some functions