Version bump; new release introduces moc USE flag.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.24-gentoo-r3 x86_64

4 files changed, 172 insertions, 32 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9a7a0222585f..79a2a466e3a6 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.99 2008/09/22 00:38:10 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.100 2008/09/25 09:53:46 omp Exp $
+
+*conky-1.6.2_pre01258 (25 Sep 2008)
+
+  25 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml,
+  +conky-1.6.2_pre01258.ebuild:
+  Version bump; new release introduces moc USE flag.
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> Manifest:
   Remove older version; 1.6.1 fixes compile error. (bug #237868)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 17c5199af3fe..6ab2c6d768e6 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
 DIST conky-1.6.2_pre01247.tar.bz2 449301 RMD160 934246a1eeeba6652b9a7e7df42f8539429947ce SHA1 9b721c481f528cda66da12aa4dae2a28c1a9fc3e SHA256 84938ad669c8b6e194b91d9384a72eb96ad3bb7d61149e5dd3e81e3a60df78cb
+DIST conky-1.6.2_pre01258.tar.bz2 454622 RMD160 f4d6d567f8a983fdbf59865d74f560301a6f12c8 SHA1 2dc65a409f681c1c330ab54aa07eb4fb987ceda8 SHA256 9ee5243d3525a02ed293cdfaa5b43a502ab861839ec9d50400c46667a06c0a3f
 EBUILD conky-1.6.1.ebuild 3851 RMD160 dafda7d5978077c3e90ecdf22cd4051835548ba5 SHA1 1b3f9d5afa78a3dcecd6a7b1288c6596fd3fa185 SHA256 5c09f0270a52cfaa446ef09798eb35d5251e3d3d889a33e4ec532229c72e16d2
 EBUILD conky-1.6.2_pre01247.ebuild 3780 RMD160 02a43aad4f08ac959841a66da968c6f6c361206f SHA1 efa9f202f557a11a397a3510884c3f19bd560ee8 SHA256 12b56312b700ff4ad55bb9e167094c2e087830a582e3f04b6170ad3ce031d083
-MISC ChangeLog 14927 RMD160 bdcb945f39a3c3647ecc73d7ec898cbcd60738f3 SHA1 74a40e3682b6f2ad0eeabd495f077c45e9a27f5d SHA256 0dc1f1b6b1097b2d135ebb2907df3a1c6a62ae34e00d426df6e8bbf5bcf6b320
-MISC metadata.xml 1245 RMD160 8687ae754d8009e27e73e6131b53e892d144c3ef SHA1 64ad866497f84a57e8177319d2dfc20d15138aba SHA256 e937f9a2ba74c5570dc429fa23a8adffc64e82045bcb5f7a39763e4132ed47b5
+EBUILD conky-1.6.2_pre01258.ebuild 3806 RMD160 75732b48ab18718b34da5a8dd4182b5b7cfaf835 SHA1 b8821ee2f09d807ccf87a2e2228519fa1d67d973 SHA256 33148bcb195ed1204042fa375644de5a0d49fb49ae7f64ae42d813a76e6d3212
+MISC ChangeLog 15113 RMD160 a32b8d08612822e27bb4fdfbcab9fc1f2acef20e SHA1 001a956b83ef52daf3aa8cbf982ef6a5808ca771 SHA256 d7035b5356cc22bf362d60daed9328652f3557a675be08146a21011d9c095a4c
+MISC metadata.xml 1325 RMD160 1214f29dc5bd4c5e34278b7bc1fdc41c282f09ac SHA1 0f7d6cc5c2adb768dcd54a20b79d1cf9e43b1f0f SHA256 0e5dd4c28282fcfbf5e4aab9c7dcf6decee2ad06327d6766c2247ea53d9ae5d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjW6P4ACgkQvSApE0uP4UtDjwCdFWngD+2Nd1r5t6gU1uylG4uq
-TAgAn3dOfJwM6CIBMN3SgjSvfSDx9ISp
-=aSTG
+iEYEARECAAYFAkjbX74ACgkQvSApE0uP4Usp2gCfbdn+8FXciHnLt5qAvU+wsk1v
+bh0An0gghHy+vxLbwBkBJdGMpbLfXFK6
+=n8B9
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.6.2_pre01258.ebuild b/app-admin/conky/conky-1.6.2_pre01258.ebuild
new file mode 100644
index 000000000000..78b637fa9ce6
--- /dev/null
+++ b/app-admin/conky/conky-1.6.2_pre01258.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre01258.ebuild,v 1.1 2008/09/25 09:53:46 omp Exp $
+
+inherit eutils
+# used for epause
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious bmpx debug hddtemp ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
+
+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
+		truetype? ( >=media-libs/freetype-2 )
+		audacious? ( >=media-sound/audacious-1.4.0 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+			)
+	)
+	rss? ( dev-libs/libxml2
+			net-misc/curl
+			)
+	wifi? ( net-wireless/wireless-tools )
+	nvidia? ( media-video/nvidia-settings )
+	!ipv6? ( >=dev-libs/glib-2.0 )"
+RDEPEND="${DEPEND_COMMON}
+	hddtemp? ( app-admin/hddtemp )
+	vim-syntax? ( || ( app-editors/vim
+	app-editors/gvim ) )
+	nano-syntax? ( app-editors/nano )"
+DEPEND="
+	${DEPEND_COMMON}
+	dev-util/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+pkg_setup() {
+	if use audacious; then
+		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
+			eerror "media-sound/audacious is not built with dbus USE flag."
+			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
+			die "media-sound/audacious needs USE=dbus"
+		fi
+	fi
+}
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		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-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 audacious) \
+		$(use_enable bmpx) \
+		$(use_enable debug) \
+		$(use_enable hddtemp ) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable nvidia) \
+		$(use_enable rss) \
+		$(use_enable smapi) \
+		$(use_enable wifi wlan) \
+		$(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
+	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
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+}
+
+pkg_postinst() {
+	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:"
+	elog "/usr/share/doc/${PF}/README.bz2"
+	elog "/usr/share/doc/${PF}/ChangeLog.bz2"
+	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, for Nano with USE=nano-syntax"
+	elog
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 50da4b8fcc63..6cede218d28f 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>omp@gentoo.org</email>
-    <name>David Shakaryan</name>
-</maintainer>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-</maintainer>
-<maintainer>
-  <email>brenden@rty.ca</email>
-    <name>Brenden Matthews</name>
-    <description>Upstream author and gentoo user</description>
-</maintainer>
-<longdescription>
-Conky is a system monitor that sits in the corner of your desktop.
-It is a fork of Torsmo that is actually maintained.
-</longdescription>
-<use>
-	<flag name='audacious'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
-	<flag name='bmpx'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
-	<flag name='mpd'>enable monitoring mpd controlled music <pkg>media-sound/mpd</pkg></flag>
-	<flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
-	<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
-	<flag name='smapi'>enable support for smapi</flag>
-</use>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>omp@gentoo.org</email>
+		<name>David Shakaryan</name>
+	</maintainer>
+	<maintainer>
+		<email>dragonheart@gentoo.org</email>
+		<name>Daniel Black</name>
+	</maintainer>
+	<maintainer>
+		<email>brenden@rty.ca</email>
+		<name>Brenden Matthews</name>
+		<description>Upstream author</description>
+	</maintainer>
+	<longdescription>Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.</longdescription>
+	<use>
+		<flag name='audacious'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
+		<flag name='bmpx'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
+		<flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
+		<flag name='mpd'>enable monitoring mpd controlled music <pkg>media-sound/mpd</pkg></flag>
+		<flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
+		<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
+		<flag name='smapi'>enable support for smapi</flag>
+	</use>
 </pkgmetadata>