From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ojzxh-0005j2-2C for garchives@archives.gentoo.org; Fri, 13 Aug 2010 19:30:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C1E4E0883; Fri, 13 Aug 2010 19:30:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B4478E0883 for ; Fri, 13 Aug 2010 19:30:38 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 319A41B4114 for ; Fri, 13 Aug 2010 19:30:35 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2248) id 3A5502CE15; Fri, 13 Aug 2010 19:30:34 +0000 (UTC) From: "Daniel Pielmeier (billie)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, billie@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-admin/conky: ChangeLog conky-1.8.0-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog conky-1.8.0-r2.ebuild X-VCS-Directories: app-admin/conky X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier Content-Type: text/plain; charset=utf8 Message-Id: <20100813193034.3A5502CE15@corvid.gentoo.org> Date: Fri, 13 Aug 2010 19:30:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 25de5cad-1309-4a56-b26f-8606dddc1d2f X-Archives-Hash: 3502d8b3fff8e1ab158dff3104eddf2b billie 10/08/13 19:30:33 Modified: ChangeLog conky-1.8.0-r2.ebuild Log: Add patch to fix bug #331171. Thanks to Mari=C3=A1n =C4=8Cavojsk=C3=BD = for the report and Brenden Matthews for the fix. Also fixes other issues = related to USE=3D"-X". (Portage version: 2.1.8.3/cvs/Linux i686) Revision Changes Path 1.139 app-admin/conky/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/Ch= angeLog?rev=3D1.139&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/Ch= angeLog?rev=3D1.139&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/Ch= angeLog?r1=3D1.138&r2=3D1.139 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- ChangeLog 24 Jul 2010 21:44:53 -0000 1.138 +++ ChangeLog 13 Aug 2010 19:30:33 -0000 1.139 @@ -1,6 +1,11 @@ # ChangeLog for app-admin/conky # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.138 201= 0/07/24 21:44:53 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.139 201= 0/08/13 19:30:33 billie Exp $ + + 13 Aug 2010; Daniel Pielmeier conky-1.8.0-r2.ebuil= d: + Add patch to fix bug #331171. Thanks to Mari=C3=A1n =C4=8Cavojsk=C3=BD= for the report + and Brenden Matthews for the fix. Also fixes other issues related to + USE=3D"-X". =20 24 Jul 2010; Daniel Pielmeier conky-1.8.0-r2.ebuil= d, +files/conky-1.8.0-if-existing.patch: 1.3 app-admin/conky/conky-1.8.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/co= nky-1.8.0-r2.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/co= nky-1.8.0-r2.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/co= nky-1.8.0-r2.ebuild?r1=3D1.2&r2=3D1.3 Index: conky-1.8.0-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- conky-1.8.0-r2.ebuild 24 Jul 2010 21:44:53 -0000 1.2 +++ conky-1.8.0-r2.ebuild 13 Aug 2010 19:30:33 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2010 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-r2.ebuild= ,v 1.2 2010/07/24 21:44:53 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild= ,v 1.3 2010/08/13 19:30:33 billie Exp $ =20 EAPI=3D"2" =20 @@ -25,8 +25,9 @@ x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext + audacious? ( >=3Dmedia-sound/audacious-1.5 dev-libs/glib ) + xmms2? ( media-sound/xmms2 ) ) - audacious? ( >=3Dmedia-sound/audacious-1.5 dev-libs/glib ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) @@ -37,7 +38,6 @@ weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv - xmms2? ( media-sound/xmms2 ) " RDEPEND=3D" ${DEPEND_COMMON} @@ -53,30 +53,32 @@ " =20 src_prepare() { - epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \ - "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \ - "${FILESDIR}/conky-1.8.0-if-existing.patch" + epatch "${FILESDIR}/${P}-ncurses.patch" \ + "${FILESDIR}/${P}-audacious-2.3.patch" \ + "${FILESDIR}/${P}-if-existing.patch" \ + "${FILESDIR}/${P}-ibm-x.patch" eautoreconf } =20 src_configure() { local myconf + if use X; then - myconf=3D"--enable-x11 --enable-double-buffer --enable-xdamage --enabl= e-argb" - myconf=3D"${myconf} --enable-own-window" + myconf=3D"--enable-x11 --enable-double-buffer --enable-xdamage" + myconf=3D"${myconf} --enable-argb --enable-own-window" myconf=3D"${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)= " myconf=3D"${myconf} $(use_enable lua-imlib lua-imlib2)" - myconf=3D"${myconf} $(use_enable nvidia) $(use_enable truetype xft)" + myconf=3D"${myconf} $(use_enable nvidia) $(use_enable truetype xft)" + myconf=3D"${myconf} $(use_enable audacious) $(use_enable xmms2)" else myconf=3D"--disable-x11 --disable-own-window --disable-argb" - myconf=3D"${myconf} --disable-imlib --disable-lua-cairo --disable-lua-= imlib" - myconf=3D"${myconf} --disable-nvidia --disable-xft" + myconf=3D"${myconf} --disable-lua-cairo --disable-nvidia --disable-xft= " + myconf=3D"${myconf} --disable-audacious --disable-xmms2" fi =20 econf \ ${myconf} \ $(use_enable apcupsd) \ - $(use_enable audacious) \ $(use_enable curl) \ $(use_enable debug) \ $(use_enable eve) \ @@ -92,8 +94,7 @@ $(use_enable rss) \ $(use_enable weather-metar) \ $(use_enable weather-xoap) \ - $(use_enable wifi wlan) \ - $(use_enable xmms2) + $(use_enable wifi wlan) } =20 src_install() {