--- conky-1.4.9-r1.ebuild	2008-03-19 01:35:27.000000000 -0600
+++ conky-1.5.0.ebuild	2008-03-23 11:54:24.000000000 -0600
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.9-r1.ebuild,v 1.9 2008/03/19 07:14:26 opfer Exp $
+# $Header: $
 
 inherit eutils
 # used for epause
@@ -11,8 +11,9 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="audacious bmpx hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax wifi X"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious audacious-legacy bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax
+smapi wifi X"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -26,6 +27,7 @@
 		x11-libs/libXft
 		truetype? ( >=media-libs/freetype-2 )
 		audacious? ( >=media-sound/audacious-1.4.0 )
+		audacious-legacy? ( <media-sound/audacious-1.4.0 )
 		bmpx? ( media-sound/bmpx
 				>=sys-apps/dbus-0.35
 			)
@@ -59,6 +61,12 @@
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/conky-1.5.0-disable-x11.patch
+}
+
 src_compile() {
 	local mymake
 	if useq ipv6 ; then
@@ -77,13 +85,19 @@
 		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
 		myconf="${myconf} --disable-xft"
 	fi
+	if useq audacious-legacy; then
+		myconf="${myconf} --enable-audacious=legacy"
+	elif useq audacious; then
+		myconf="${myconf} --enable-audacious"
+	fi
 	econf \
 		${myconf} \
-		$(use_enable audacious) \
 		$(use_enable bmpx) \
+		$(use_enable debug) \
 		$(use_enable hddtemp ) \
 		$(use_enable mpd) \
 		$(use_enable rss) \
+		$(use_enable smapi) \
 		$(use_enable wifi wlan) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
 	emake ${mymake} || die "compile failed"
@@ -91,7 +105,7 @@
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample
+	dodoc ChangeLog AUTHORS README
 	dohtml doc/docs.html doc/config_settings.html doc/variables.html
 
 	if use vim-syntax; then
@@ -109,9 +123,10 @@
 }
 
 pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "You can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.bz2"
+	elog "You can find the sample configuration file at"
+	elog "/etc/conky/conky.conf.  To customize it, copy"
+	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
+	elog "it to your liking."
 	elog
 	elog "For more info on Conky's new features,"
 	elog "please look at the README and ChangeLog:"