version bump (bug #122643) thanks to Brenden and Philip. removed old versions too

Package-Manager: portage-2.1_pre4-r1

5 files changed, 217 insertions, 3 deletions

diff --git a/app-admin/conky/files/digest-conky-1.3.1 b/app-admin/conky/files/digest-conky-1.3.1
deleted file mode 100644
index ae7b28a2c3c6..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dda4829734050293e07b1f0228b1a42 conky-1.3.1.tar.bz2 316741
diff --git a/app-admin/conky/files/digest-conky-1.3.3 b/app-admin/conky/files/digest-conky-1.3.3
deleted file mode 100644
index d818d002c617..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c200d13b31b0c441d0e8ad38161b35e conky-1.3.3.tar.bz2 317987
diff --git a/app-admin/conky/files/digest-conky-1.3.4-r1 b/app-admin/conky/files/digest-conky-1.3.4-r1
deleted file mode 100644
index 3d1c4064a29c..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91f7d4ce29a6bc2d785f13224ea4aaac conky-1.3.4.tar.bz2 332871
diff --git a/app-admin/conky/files/digest-conky-1.4.0 b/app-admin/conky/files/digest-conky-1.4.0
new file mode 100644
index 000000000000..daf49f2cff1c
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.4.0
@@ -0,0 +1,3 @@
+MD5 532e7b8a0d4be31eb8cd29c5dbf92eb5 conky-1.4.0.tar.bz2 361968
+RMD160 dceee3ae83fb1aa34473b61bc1a1287bef38d14c conky-1.4.0.tar.bz2 361968
+SHA256 75480c7cfe1741d7c881e6309e11573b1ce22f9242d35e12f0b3a9d593c6960e conky-1.4.0.tar.bz2 361968
diff --git a/app-admin/conky/files/portmon-mpd.patch b/app-admin/conky/files/portmon-mpd.patch
new file mode 100644
index 000000000000..1f757a7f893b
--- /dev/null
+++ b/app-admin/conky/files/portmon-mpd.patch
@@ -0,0 +1,214 @@
+--- src/libtcp-portmon.c.old	2005-12-05 22:27:16.000000000 -0500
++++ src/libtcp-portmon.c	2006-02-13 00:22:25.000000000 -0500
+@@ -3,7 +3,7 @@
+  *
+  * Copyright (C) 2005  Philip Kovacs kovacsp3@comcast.net
+  * 
+- * $Id: portmon-mpd.patch,v 1.1 2006/02/18 22:50:36 dragonheart Exp $
++ * $Id: portmon-mpd.patch,v 1.1 2006/02/18 22:50:36 dragonheart Exp $
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -231,8 +231,8 @@
+    p_monitor1 = (tcp_port_monitor_t *)p_data1;
+    p_monitor2 = (tcp_port_monitor_t *)p_data2;
+ 
+-   return (p_monitor1->port_range_begin == p_monitor1->port_range_begin &&
+-	   p_monitor2->port_range_end == p_monitor2->port_range_end);
++   return (p_monitor1->port_range_begin == p_monitor2->port_range_begin &&
++	   p_monitor1->port_range_end == p_monitor2->port_range_end);
+ }
+ 
+ /* ---------------------------------------------------------------------------
+--- src/mpd.c.old	2006-02-12 23:11:15.000000000 -0500
++++ src/mpd.c	2006-02-14 13:23:14.000000000 -0500
+@@ -42,22 +42,14 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
+ 		strncpy(current_info->mpd.status, "MPD not responding",	TEXT_BUFFER_SIZE - 1);
+ 		current_info->mpd.bitrate = 0;
+ 		current_info->mpd.progress = 0;
+@@ -97,22 +89,14 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
+ 		strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
+ 		current_info->mpd.bitrate = 0;
+ 		current_info->mpd.progress = 0;
+@@ -158,23 +142,15 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.status, "Unknown",
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
++		strncpy(current_info->mpd.status, "Stopped",
+ 			TEXT_BUFFER_SIZE - 1);
+ 	}
+ 	if (status->state == MPD_STATUS_STATE_PAUSE) {
+@@ -211,24 +187,15 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.status, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
++		*current_info->mpd.status=0;
+ 	}
+ 	if (status->state == MPD_STATUS_STATE_PLAY ||
+ 	    status->state == MPD_STATUS_STATE_PAUSE) {
+@@ -248,14 +215,14 @@
+ 		} else if (status->random == 1) {
+ 			strcpy(current_info->mpd.random, "On");
+ 		} else {
+-			strcpy(current_info->mpd.random, "Unknown");
++			*current_info->mpd.random=0;
+ 		}
+ 		if (status->repeat == 0) {
+ 			strcpy(current_info->mpd.repeat, "Off");
+ 		} else if (status->repeat == 1) {
+ 			strcpy(current_info->mpd.repeat, "On");
+ 		} else {
+-			strcpy(current_info->mpd.repeat, "Unknown");
++			*current_info->mpd.repeat=0;
+ 		}
+ 	}
+ 
+@@ -292,37 +259,37 @@
+ 			strncpy(current_info->mpd.artist, song->artist,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.artist, "Unknown");
++			*current_info->mpd.artist=0;
+ 		}
+ 		if (song->album) {
+ 			strncpy(current_info->mpd.album, song->album,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.album, "Unknown");
++			*current_info->mpd.album=0;
+ 		}
+ 		if (song->title) {
+ 			strncpy(current_info->mpd.title, song->title,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.title, "Unknown");
++			*current_info->mpd.title=0;
+ 		}
+ 		if (song->track) {
+ 			strncpy(current_info->mpd.track, song->track,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.track, "Unknown");
++			*current_info->mpd.track=0;
+ 		}
+ 		if (song->name) {
+ 			strncpy(current_info->mpd.name, song->name,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.name, "Unknown");
++			*current_info->mpd.name=0;
+ 		}
+ 		if (song->file) {
+ 			strncpy(current_info->mpd.file,
+ 				song->file, TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.file, "Unknown");
++			*current_info->mpd.file=0;
+ 		}
+ 		if (entity != NULL) {
+ 			mpd_freeInfoEntity(entity);