correct dependencies for USE="-X -ipv6" (bug #169595). Fix for USE=-X (bug #166500). Cleanout of old versions

(Portage version: 2.1.2-r11)

10 files changed, 21 insertions, 546 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index ab18db2ff356..bb8610c04185 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.45 2007/02/07 18:55:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.46 2007/03/08 12:19:40 dragonheart Exp $
+
+  08 Mar 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/conky-sigaction.patch, -files/portmon-mpd.patch,
+  -conky-1.4.0-r1.ebuild, -conky-1.4.2.ebuild, -conky-1.4.4.ebuild,
+  conky-1.4.5.ebuild:
+  correct dependencies for USE="-X -ipv6" thanks to Pavel Denisov (bug
+  #169595). Fix for USE=-X thanks to Brenden and Philip and Anthony (bug
+  #166500). Cleanout of old versions
 
   07 Feb 2007; Simon Stelling <blubb@gentoo.org> conky-1.4.5.ebuild:
   stable on amd64; bug 158886
diff --git a/app-admin/conky/conky-1.4.0-r1.ebuild b/app-admin/conky/conky-1.4.0-r1.ebuild
deleted file mode 100644
index a1cf469d8a99..000000000000
--- a/app-admin/conky/conky-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0-r1.ebuild,v 1.9 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="truetype X ipv6 audacious"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( media-sound/audacious )
-	)"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)
-	sys-apps/grep
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/portmon-mpd.patch || die "epatch failed"
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey --disable-bmpx"
-	econf \
-		${myconf} \
-		--disable-xmms --disable-infopipe \
-		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(use_enable audacious) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-	emake ${mymake} || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "you can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.gz"
-	elog "/usr/share/doc/${PF}/ChangeLog.gz"
-	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
-	elog
-	elog "Check out app-vim/conky-syntax for conkyrc"
-	elog "syntax highlighting in Vim"
-	elog
-}
diff --git a/app-admin/conky/conky-1.4.2.ebuild b/app-admin/conky/conky-1.4.2.ebuild
deleted file mode 100644
index 125f3615a5a2..000000000000
--- a/app-admin/conky/conky-1.4.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.2.ebuild,v 1.5 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx audacious"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
-		audacious? ( media-sound/audacious )
-	)"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)
-	sys-apps/grep
-	sys-apps/sed"
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey"
-	econf \
-		${myconf} \
-		--disable-xmms --disable-infopipe \
-		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(use_enable bmpx) \
-		$(use_enable audacious) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-	emake ${mymake} || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html
-}
-
-pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "you can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.gz"
-	elog "/usr/share/doc/${PF}/ChangeLog.gz"
-	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
-	elog "Check out app-vim/conky-syntax for conkyrc"
-	elog "syntax highlighting in Vim"
-	elog
-}
diff --git a/app-admin/conky/conky-1.4.4.ebuild b/app-admin/conky/conky-1.4.4.ebuild
deleted file mode 100644
index 4a4a75178740..000000000000
--- a/app-admin/conky/conky-1.4.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.4.ebuild,v 1.3 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-# used for epause
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 audacious bmpx hddtemp mpd vim-syntax"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXdamage
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-0.1 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
-	)"
-
-RDEPEND="${DEPEND_COMMON}
-	hddtemp? ( app-admin/hddtemp )
-	mpd? ( media-sound/mpd )
-	vim-syntax? ( || ( app-editors/vim
-		app-editors/gvim ) )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)"
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "the ipv6 USE flag with Conky disables the port monitor."
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-own-window --enable-proc-uptime"
-	use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable audacious) \
-		$(use_enable bmpx) \
-		$(use_enable hddtemp ) \
-		$(use_enable mpd) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-	emake ${mymake} || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-}
-
-pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "You can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.gz"
-	elog "/usr/share/doc/${PF}/ChangeLog.gz"
-	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
-	elog "Vim syntax highlighting for conkyrc now enabled with"
-	elog "USE=vim-syntax"
-	elog
-}
diff --git a/app-admin/conky/conky-1.4.5.ebuild b/app-admin/conky/conky-1.4.5.ebuild
index 7b4cc8d17a0a..d16cf06dcea6 100644
--- a/app-admin/conky/conky-1.4.5.ebuild
+++ b/app-admin/conky/conky-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.5.ebuild,v 1.7 2007/02/07 18:55:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.5.ebuild,v 1.8 2007/03/08 12:19:40 dragonheart Exp $
 
 inherit eutils
 # used for epause
@@ -32,14 +32,11 @@ DEPEND_COMMON="
 		bmpx? ( media-sound/bmpx
 				>=sys-apps/dbus-0.35
 			)
-		!ipv6? ( >=dev-libs/glib-2.0 )
-	)"
-
+	)
+	!ipv6? ( >=dev-libs/glib-2.0 )"
 RDEPEND="${DEPEND_COMMON}
-	hddtemp? ( app-admin/hddtemp )
-	mpd? ( media-sound/mpd )
 	vim-syntax? ( || ( app-editors/vim
-		app-editors/gvim ) )"
+	app-editors/gvim ) )"
 
 DEPEND="
 	${DEPEND_COMMON}
@@ -63,11 +60,16 @@ src_compile() {
 		mymake="MPD_NO_IPV6=noipv6"
 	fi
 	local myconf
-	myconf="--enable-own-window --enable-proc-uptime"
-	use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
+	myconf="--enable-proc-uptime"
+	if useq X; then
+		myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
+		myconf="${myconf} $(use_enable truetype xft)"
+	else
+		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
+		myconf="${myconf} --disable-xft"
+	fi
 	econf \
 		${myconf} \
-		$(use_enable truetype xft) \
 		$(use_enable audacious) \
 		$(use_enable bmpx) \
 		$(use_enable hddtemp ) \
diff --git a/app-admin/conky/files/conky-sigaction.patch b/app-admin/conky/files/conky-sigaction.patch
deleted file mode 100644
index 5443b7974da9..000000000000
--- a/app-admin/conky/files/conky-sigaction.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/libmpdclient.c
-===================================================================
---- src/libmpdclient.c	(revision 618)
-+++ src/libmpdclient.c	(working copy)
-@@ -216,9 +216,6 @@
- 	sapipe.sa_handler = mpd_signalHandler;
- //	sapipe.sa_mask = 0;
- 	sapipe.sa_flags = 0;
--#ifdef __linux__
--	sapipe.sa_restorer = NULL;
--#endif /* __linux__ */
- 	sigaction(SIGPIPE,&sapipe,NULL);
- 
- 	/* connect stuff */
diff --git a/app-admin/conky/files/digest-conky-1.4.0-r1 b/app-admin/conky/files/digest-conky-1.4.0-r1
deleted file mode 100644
index daf49f2cff1c..000000000000
--- a/app-admin/conky/files/digest-conky-1.4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-conky-1.4.2 b/app-admin/conky/files/digest-conky-1.4.2
deleted file mode 100644
index b059f021302b..000000000000
--- a/app-admin/conky/files/digest-conky-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 050a53bdb359a96421ef3ddf761f143c conky-1.4.2.tar.bz2 400574
-RMD160 9622c9e5115dc5bfb6995424cfc66d3a6f90002e conky-1.4.2.tar.bz2 400574
-SHA256 e792a1ea4f865225e6f9d1e4cafd405745390a09d48d4a8936d4b0556e6e32b2 conky-1.4.2.tar.bz2 400574
diff --git a/app-admin/conky/files/digest-conky-1.4.4 b/app-admin/conky/files/digest-conky-1.4.4
deleted file mode 100644
index d06d8dec9554..000000000000
--- a/app-admin/conky/files/digest-conky-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c856556d4372226f99cf7e9a888e9118 conky-1.4.4.tar.bz2 386353
-RMD160 15ce90734c7ea9e497b810f12194beca25be1e09 conky-1.4.4.tar.bz2 386353
-SHA256 2986b981fbe1e9c40cc16b4fa58194e7e8e300272633470d264a969a7a9a8140 conky-1.4.4.tar.bz2 386353
diff --git a/app-admin/conky/files/portmon-mpd.patch b/app-admin/conky/files/portmon-mpd.patch
deleted file mode 100644
index 4e4bdd22b5f2..000000000000
--- a/app-admin/conky/files/portmon-mpd.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- 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
-@@ -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);