updating ebuilds
authorBrenden Matthews <brenden1@rty.ca>
Mon, 14 Apr 2008 23:57:15 +0000 (23:57 +0000)
committerBrenden Matthews <brenden1@rty.ca>
Mon, 14 Apr 2008 23:57:15 +0000 (23:57 +0000)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1106 7f574dfc-610e-0410-a909-a81674777703

app-admin/conky/conky-1.5.1.ebuild [new file with mode: 0644]
app-admin/conky/conky-1.999.ebuild

diff --git a/app-admin/conky/conky-1.5.1.ebuild b/app-admin/conky/conky-1.5.1.ebuild
new file mode 100644 (file)
index 0000000..acaab4d
--- /dev/null
@@ -0,0 +1,144 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+# used for epause
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+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
+       dev-util/pkgconfig
+       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 )
+               audacious-legacy? ( <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 )
+       !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}
+       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_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/conky-1.5.0-disable-x11.patch
+}
+
+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
+       if useq audacious-legacy; then
+               myconf="${myconf} --enable-audacious=legacy"
+       elif useq audacious; then
+               myconf="${myconf} --enable-audacious"
+       fi
+       econf \
+               ${myconf} \
+               $(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"
+}
+
+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
+}
index a2e5989..9758cd7 100644 (file)
@@ -1,64 +1,76 @@
 # Subversion repository ebuild for conky by drphibes
 # $Header: $
 
+inherit eutils
+# used for epause
+
 ESVN_REPO_URI="https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1"
 ESVN_PROJECT="conky1"
 inherit subversion
 
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
 
-LICENSE="BSD"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 audacious bmpx hddtemp mpd vim-syntax"
+IUSE="audacious audacious-legacy bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax
+smapi wifi X"
 
 DEPEND_COMMON="
        virtual/libc
+       dev-util/pkgconfig
        X? (
-               || ( ( x11-libs/libICE
-                               x11-libs/libXext
-                               x11-libs/libX11
-                               x11-libs/libSM
-                               x11-libs/libXrender
-                               x11-libs/libXdamage
-                               x11-libs/libXft
-                               )
-                               virtual/x11
-               )
+               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-0.1 )
+               audacious? ( >=media-sound/audacious-1.4.0 )
+               audacious-legacy? ( <media-sound/audacious-1.4.0 )
                bmpx? ( media-sound/bmpx
                                >=sys-apps/dbus-0.35
                        )
-               !ipv6? ( >=dev-libs/glib-2.0 )
-       )"
-
+       )
+       rss? ( dev-libs/libxml2
+                       net-misc/curl
+                       )
+       wifi? ( net-wireless/wireless-tools )
+       !ipv6? ( >=dev-libs/glib-2.0 )"
 RDEPEND="${DEPEND_COMMON}
        hddtemp? ( app-admin/hddtemp )
-       mpd? ( media-sound/mpd )
        vim-syntax? ( || ( app-editors/vim
-               app-editors/gvim ) )"
+       app-editors/gvim ) )
+       nano-syntax? ( app-editors/nano )"
 
 DEPEND="
        ${DEPEND_COMMON}
        X? (
-               || ( ( x11-libs/libXt
-                               x11-proto/xextproto
-                               x11-proto/xproto
-                               )
-                               virtual/x11
-               )
+               x11-libs/libXt
+               x11-proto/xextproto
+               x11-proto/xproto
        )"
 
 S=${WORKDIR}/conky
 
+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() {
        ./autogen.sh ${ESVN_STORE_DIR}/${ESVN_PROJECT}/conky1
 
        local mymake
        if useq ipv6 ; then
-               ewarn
                ewarn "You have the ipv6 USE flag enabled.  Please note that using"
                ewarn "the ipv6 USE flag with Conky disables the port monitor."
                epause
@@ -74,19 +86,27 @@ src_compile() {
                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"
 }
 
 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
@@ -96,23 +116,29 @@ src_install() {
                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() {
-       einfo 'Default configuration file is "~/.conkyrc"'
-       einfo "You can find a sample configuration file in"
-       einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-       einfo
-       einfo "For more info on Conky's new features,"
-       einfo "please look at the README and ChangeLog:"
-       einfo "/usr/share/doc/${PF}/README.gz"
-       einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-       einfo "There are also pretty html docs available"
-       einfo "on Conky's site or in /usr/share/doc/${PF}"
-       einfo
-       einfo "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-       einfo
-       einfo "Vim syntax highlighting for conkyrc now enabled with"
-       einfo "USE=vim-syntax"
-       einfo
+       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
 }