* [gentoo-commits] gentoo-x86 commit in app-admin/conky: ChangeLog conky-1.8.0-r2.ebuild
@ 2010-07-24 21:44 Daniel Pielmeier (billie)
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-07-24 21:44 UTC (permalink / raw
To: gentoo-commits
billie 10/07/24 21:44:53
Modified: ChangeLog conky-1.8.0-r2.ebuild
Log:
Add patch from upstream to fix if_existing. See bug #328891.
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.138 app-admin/conky/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?r1=1.137&r2=1.138
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- ChangeLog 14 Jul 2010 14:06:42 -0000 1.137
+++ ChangeLog 24 Jul 2010 21:44:53 -0000 1.138
@@ -1,6 +1,10 @@
# 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.137 2010/07/14 14:06:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.138 2010/07/24 21:44:53 billie Exp $
+
+ 24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild,
+ +files/conky-1.8.0-if-existing.patch:
+ Add patch from upstream to fix if_existing. See bug #328891.
14 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
conky-1.8.0-r1.ebuild:
1.2 app-admin/conky/conky-1.8.0-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild?r1=1.1&r2=1.2
Index: conky-1.8.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conky-1.8.0-r2.ebuild 3 Jul 2010 20:07:57 -0000 1.1
+++ conky-1.8.0-r2.ebuild 24 Jul 2010 21:44:53 -0000 1.2
@@ -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.1 2010/07/03 20:07:57 billie Exp $
+# $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 $
EAPI="2"
@@ -54,7 +54,8 @@
src_prepare() {
epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
- "${FILESDIR}/conky-1.8.0-audacious-2.3.patch"
+ "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \
+ "${FILESDIR}/conky-1.8.0-if-existing.patch"
eautoreconf
}
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-admin/conky: ChangeLog conky-1.8.0-r2.ebuild
@ 2010-08-13 19:30 Daniel Pielmeier (billie)
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier (billie) @ 2010-08-13 19:30 UTC (permalink / raw
To: gentoo-commits
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án Čavojský for the report and Brenden Matthews for the fix. Also fixes other issues related to USE="-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/ChangeLog?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/ChangeLog?r1=1.138&r2=1.139
Index: ChangeLog
===================================================================
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 2010/07/24 21:44:53 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.139 2010/08/13 19:30:33 billie Exp $
+
+ 13 Aug 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild:
+ Add patch to fix bug #331171. Thanks to Marián Čavojský for the report
+ and Brenden Matthews for the fix. Also fixes other issues related to
+ USE="-X".
24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild,
+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/conky-1.8.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild?r1=1.2&r2=1.3
Index: conky-1.8.0-r2.ebuild
===================================================================
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 $
EAPI="2"
@@ -25,8 +25,9 @@
x11-libs/libX11
x11-libs/libXdamage
x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+ xmms2? ( media-sound/xmms2 )
)
- audacious? ( >=media-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="
${DEPEND_COMMON}
@@ -53,30 +53,32 @@
"
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
}
src_configure() {
local myconf
+
if use X; then
- myconf="--enable-x11 --enable-double-buffer --enable-xdamage --enable-argb"
- myconf="${myconf} --enable-own-window"
+ myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+ myconf="${myconf} --enable-argb --enable-own-window"
myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
- myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
+ myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
+ myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
else
myconf="--disable-x11 --disable-own-window --disable-argb"
- myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
- myconf="${myconf} --disable-nvidia --disable-xft"
+ myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
+ myconf="${myconf} --disable-audacious --disable-xmms2"
fi
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)
}
src_install() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-13 19:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-24 21:44 [gentoo-commits] gentoo-x86 commit in app-admin/conky: ChangeLog conky-1.8.0-r2.ebuild Daniel Pielmeier (billie)
-- strict thread matches above, loose matches on Subject: below --
2010-08-13 19:30 Daniel Pielmeier (billie)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox