Add patch to build with audacious-2.3. This fixes bug 313161.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9a1d7e0af61222d127471db7749ac4a90a065893..1c532bb44e8001243f801110a9e9971ef8d52fee 100644 (file)
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # 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.133 2010/06/02 06:33:10 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.134 2010/06/12 21:20:55 billie Exp $
+
+*conky-1.8.0-r1 (12 Jun 2010)
+
+  12 Jun 2010; Daniel Pielmeier <billie@gentoo.org> +conky-1.8.0-r1.ebuild,
+  +files/conky-1.8.0-audacious-2.3.patch:
+  Add patch to build with audacious-2.3. This fixes bug 313161.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove omp from metadata.xml (#147119)

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 171d5d123d78caaa9dbf0f053cbe82ce7cebe6a8..12245fd129f7b445c2c5bc259931d8356c1d678f 100644 (file)
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1
+EBUILD conky-1.8.0-r1.ebuild 3968 RMD160 a05a2712bc2d93075a3499f39eb57d424cba06fb SHA1 b45fe976c66d885d636ddfe82b1199bfbbffc8d9 SHA256 28abe151268f993f667af617fc0c5af8a9ff208226d099652f8083240377ffec
 EBUILD conky-1.8.0.ebuild 3876 RMD160 39e78d678c819a9b6c67feb4c3a1ad65b2b9af77 SHA1 6da1a43ce8a54da61e29e4867c057ef81e902df3 SHA256 fd9b7548a87dacda9da0b47c897c329cc78cd0888923a1ef2ffa913032f95c59
-MISC ChangeLog 20531 RMD160 2e71421928751c4a782912fbfbc3206ac3d86776 SHA1 3089a6d0822d02b60f141a16ebe1644c8a7d70cb SHA256 ed50e5e99b4c1362d755a6724140549a5d7685a93bcde0d4594cd7284f0281c9
+MISC ChangeLog 20747 RMD160 31d1779e02690b1af9a4840e838466e2132bc72c SHA1 e523e6d497caa6b622e1bd1688993ffa8c713527 SHA256 22f449ba32a0d0770ecd754c7eaab117e4d8e2379efd99c11b689782ae17282f
 MISC metadata.xml 2060 RMD160 88b9e4aa76eec177f3773e3f8cef6470437d58a6 SHA1 4e2498e15c938127dbd349a46d9c5890815bc7ec SHA256 f4b99e301ade7ca819eb909f041d75be53a26632e4dd04f0132c92d6c73d6352
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+ywACgkQV3J2n04EauwgrwCdGZZ7i06OJpd4k8ll4gNjlbdP
-kswAni/bYX/yXHSSAkdcaYaS0w1GDrJT
-=3nP5
------END PGP SIGNATURE-----

diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild
new file mode 100644 (file)
index 0000000..f9981dd
--- /dev/null
+++ b/app-admin/conky/conky-1.8.0-r1.ebuild
@@ -0,0 +1,126 @@
+# 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-r1.ebuild,v 1.1 2010/06/12 21:20:55 billie Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
+
+DEPEND_COMMON="
+       X? (
+               imlib? ( media-libs/imlib2 )
+               lua-cairo? ( >=dev-lang/toluapp-1.0.93 x11-libs/cairo[X] )
+               lua-imlib? ( >=dev-lang/toluapp-1.0.93 media-libs/imlib2 )
+               nvidia? ( media-video/nvidia-settings )
+               truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+               x11-libs/libX11
+               x11-libs/libXdamage
+               x11-libs/libXext
+       )
+       audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+       curl? ( net-misc/curl )
+       eve? ( net-misc/curl dev-libs/libxml2 )
+       portmon? ( dev-libs/glib )
+       lua? ( >=dev-lang/lua-5.1 )
+       ncurses? ( sys-libs/ncurses )
+       rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+       wifi? ( net-wireless/wireless-tools )
+       weather-metar? ( net-misc/curl )
+       weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+       virtual/libiconv
+       "
+RDEPEND="
+       ${DEPEND_COMMON}
+       apcupsd? ( sys-power/apcupsd )
+       hddtemp? ( app-admin/hddtemp )
+       moc? ( media-sound/moc )
+       nano-syntax? ( app-editors/nano )
+       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+       "
+DEPEND="
+       ${DEPEND_COMMON}
+       dev-util/pkgconfig
+       "
+
+src_prepare() {
+       epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
+               "${FILESDIR}/conky-1.8.0-audacious-2.3.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="${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)"
+       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"
+       fi
+
+       econf \
+               ${myconf} \
+               $(use_enable apcupsd) \
+               $(use_enable audacious) \
+               $(use_enable curl) \
+               $(use_enable debug) \
+               $(use_enable eve) \
+               $(use_enable hddtemp) \
+               $(use_enable iostats) \
+               $(use_enable lua) \
+               $(use_enable thinkpad ibm) \
+               $(use_enable math) \
+               $(use_enable moc) \
+               $(use_enable mpd) \
+               $(use_enable ncurses) \
+               $(use_enable portmon) \
+               $(use_enable rss) \
+               $(use_enable weather-metar) \
+               $(use_enable weather-xoap) \
+               $(use_enable wifi wlan)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "make install failed"
+       dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
+       dohtml doc/docs.html doc/config_settings.html doc/variables.html \
+               || die "dohtml failed"
+
+       if use vim-syntax; then
+               insinto /usr/share/vim/vimfiles/ftdetect
+               doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
+
+               insinto /usr/share/vim/vimfiles/syntax
+               doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
+       fi
+
+       if use nano-syntax; then
+               insinto /usr/share/nano/
+               doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
+       fi
+}
+
+pkg_postinst() {
+       elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
+       elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
+       elog
+       elog "For more info on Conky's features please look at the Changelog in"
+       elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
+       elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
+       elog
+       elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+       elog
+}

diff --git a/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch b/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch
new file mode 100644 (file)
index 0000000..825f5b9
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old   2010-03-30 19:50:36.000000000 +0200
++++ configure.ac       2010-06-12 23:10:51.978440907 +0200
+@@ -149,7 +149,7 @@
+ 
+ AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
+ if test x$want_audacious = xyes; then
+-      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
++      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0])
+       conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS"
+       conky_LIBS="$conky_LIBS $Audacious_LIBS"
+       save_CPPFLAGS="$CPPFLAGS"