rename gentoo svn ebuild

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@788 7f574dfc-610e-0410-a909-a81674777703

diff --git a/app-admin/conky/conky-1.999.ebuild b/app-admin/conky/conky-1.999.ebuild
new file mode 100644 (file)
index 0000000..a124500
--- /dev/null
+++ b/app-admin/conky/conky-1.999.ebuild
@@ -0,0 +1,112 @@
+# Subversion repository ebuild for conky by drphibes
+# $Header: $
+
+ESVN_REPO_URI="https://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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="truetype X ipv6 audacious bmpx hddtemp mpd vim-syntax"
+
+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
+                               )
+                               virtual/x11
+               )
+               truetype? ( >=media-libs/freetype-2 )
+               audacious? ( >=media-sound/audacious-0.1 )
+               bmpx? ( media-sound/bmpx
+                               >=sys-apps/dbus-0.35
+                       )
+       )"
+
+RDEPEND="${DEPEND_COMMON}
+       hddtemp? ( app-admin/hddtemp )
+       mpd? ( media-sound/mpd )
+       vim-syntax? ( || ( app-editors/vim
+               app-editors/gvim ) )"
+
+DEPEND="
+       ${DEPEND_COMMON}
+       X? (
+               || ( ( x11-libs/libXt
+                               x11-proto/xextproto
+                               x11-proto/xproto
+                               )
+                               virtual/x11
+               )
+       )"
+
+S=${WORKDIR}/conky
+
+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
+       else
+               mymake="MPD_NO_IPV6=noipv6"
+       fi
+       local myconf
+       myconf="--enable-own-window --enable-proc-uptime"
+       use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
+       econf \
+               ${myconf} \
+               $(use_enable truetype xft) \
+               $(use_enable audacious) \
+               $(use_enable bmpx) \
+               $(use_enable hddtemp ) \
+               $(use_enable mpd) \
+               $(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
+       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
+}
+
+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
+}

diff --git a/app-admin/conky/conky-1.9999.ebuild b/app-admin/conky/conky-1.9999.ebuild
deleted file mode 100644 (file)
index a124500..0000000
--- a/app-admin/conky/conky-1.9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Subversion repository ebuild for conky by drphibes
-# $Header: $
-
-ESVN_REPO_URI="https://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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 audacious bmpx hddtemp mpd vim-syntax"
-
-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
-                               )
-                               virtual/x11
-               )
-               truetype? ( >=media-libs/freetype-2 )
-               audacious? ( >=media-sound/audacious-0.1 )
-               bmpx? ( media-sound/bmpx
-                               >=sys-apps/dbus-0.35
-                       )
-       )"
-
-RDEPEND="${DEPEND_COMMON}
-       hddtemp? ( app-admin/hddtemp )
-       mpd? ( media-sound/mpd )
-       vim-syntax? ( || ( app-editors/vim
-               app-editors/gvim ) )"
-
-DEPEND="
-       ${DEPEND_COMMON}
-       X? (
-               || ( ( x11-libs/libXt
-                               x11-proto/xextproto
-                               x11-proto/xproto
-                               )
-                               virtual/x11
-               )
-       )"
-
-S=${WORKDIR}/conky
-
-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
-       else
-               mymake="MPD_NO_IPV6=noipv6"
-       fi
-       local myconf
-       myconf="--enable-own-window --enable-proc-uptime"
-       use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
-       econf \
-               ${myconf} \
-               $(use_enable truetype xft) \
-               $(use_enable audacious) \
-               $(use_enable bmpx) \
-               $(use_enable hddtemp ) \
-               $(use_enable mpd) \
-               $(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
-       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
-}
-
-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
-}

diff --git a/configure.ac.in b/configure.ac.in
index 4e45262..10787d3 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,7 +13,7 @@ m4_define([conky_version],
          [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
                conky_version_tag(), [svn], 
                        [-conky_version_tag()-conky_version_revision()], 
-                       [conky_version_tag()])])
+                       [-conky_version_tag()])])
 
 AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])