commit:     76c34e790f878108cff93a08f0a90025336776c4
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 09:03:45 2016 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 09:03:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c34e79

app-admin/conky: Remove old.

Package-Manager: portage-2.2.28

 app-admin/conky/Manifest            |   2 -
 app-admin/conky/conky-1.10.1.ebuild | 184 ------------------------------------
 app-admin/conky/conky-1.10.3.ebuild | 183 -----------------------------------
 3 files changed, 369 deletions(-)

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 85b19a9..d639c05 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,4 +1,2 @@
-DIST conky-1.10.1.tar.gz 343393 SHA256 
b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21 SHA512 
bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2
 WHIRLPOOL 
40ab9ecb135e15674a139aef5f98a8e229b38de995b0af7646813a422562b60566ed6125dad376560550e59d9b17f85f755c3f85034c78c6e02f857c966f4d26
-DIST conky-1.10.3.tar.gz 364470 SHA256 
456342fca8e33f1bfce1b4020586e05b7f89953f846c42e6cf570b766bf62bd5 SHA512 
97f4db6bc501d37e0a0684df3cf1bf5a64ad9cf3ba3d7dff7403e80c51654c3b01bb05ad9fd14ef32a1c6a56df2610257cd57fd5d8defe63b30b9437493f79ad
 WHIRLPOOL 
8b0f269d4da0b1468c60a959bf1f542ab0f903a0fd99a6da8a420ab138163ad344dc0a99c24ee2b8ce2b4ab9b6923637ed9fe0d103781c9f8f3e40f7221e7603
 DIST conky-1.10.4.tar.gz 365145 SHA256 
ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 
665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 WHIRLPOOL 
6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
 DIST conky-1.9.0.tar.bz2 626555 SHA256 
baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 
98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889
 WHIRLPOOL 
41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a

diff --git a/app-admin/conky/conky-1.10.1.ebuild 
b/app-admin/conky/conky-1.10.1.ebuild
deleted file mode 100644
index 39d264c..00000000
--- a/app-admin/conky/conky-1.10.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils linux-info
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky";
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
-       ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
-       ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
-       weather-xoap webserver wifi X xmms2"
-
-DEPEND_COMMON="
-       X? (
-               imlib? ( media-libs/imlib2[X] )
-               lua-cairo? (
-                       >=dev-lua/toluapp-1.0.93
-                       x11-libs/cairo[X] )
-               lua-imlib? (
-                       >=dev-lua/toluapp-1.0.93
-                       media-libs/imlib2[X] )
-               lua-rsvg? (
-                       >=dev-lua/toluapp-1.0.93
-                       gnome-base/librsvg )
-               nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] 
media-video/nvidia-settings ) )
-               truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-               x11-libs/libX11
-               x11-libs/libXdamage
-               x11-libs/libXfixes
-               x11-libs/libXext
-               audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
-               xmms2? ( media-sound/xmms2 )
-       )
-       cmus? ( media-sound/cmus )
-       curl? ( net-misc/curl )
-       eve? ( net-misc/curl dev-libs/libxml2 )
-       ical? ( dev-libs/libical )
-       iconv? ( virtual/libiconv )
-       irc? ( net-libs/libircclient )
-       mysql? ( >=virtual/mysql-5.0 )
-       ncurses? ( sys-libs/ncurses:= )
-       rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-       wifi? ( net-wireless/wireless-tools )
-       weather-metar? ( net-misc/curl )
-       weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-       webserver? ( net-libs/libmicrohttpd )
-       >=dev-lang/lua-5.1.4-r8:0
-       "
-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}
-       app-text/docbook2X
-       "
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-pkg_setup() {
-       use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-includewlan.patch" \
-               "${FILESDIR}/${P}-ncurses-tinfo.patch"
-
-       # Allow user patches #478482
-       epatch_user
-}
-
-src_configure() {
-       local mycmakeargs
-
-       if use X; then
-               mycmakeargs=(
-                       -DBUILD_X11=ON
-                       -DOWN_WINDOW=ON
-                       -DBUILD_XDAMAGE=ON
-                       -DBUILD_XDBE=ON
-                       $(cmake-utils_use_build truetype XFT)
-                       $(cmake-utils_use_build imlib IMLIB2)
-                       -DBUILD_XSHAPE=ON
-                       -DBUILD_ARGB=ON
-                       $(cmake-utils_use_build lua-cairo LUA_CAIRO)
-                       $(cmake-utils_use_build lua-imlib LUA_IMLIB2)
-                       $(cmake-utils_use_build lua-rsvg LUA_RSVG)
-                       $(cmake-utils_use_build nvidia)
-                       $(cmake-utils_use_build audacious)
-                       $(cmake-utils_use_build xmms2)
-               )
-       else
-               mycmakeargs=(
-                       -DBUILD_X11=OFF
-                       -DBUILD_NVIDIA=OFF
-                       -DBUILD_LUA_CAIRO=OFF
-                       -DBUILD_LUA_IMLIB2=OFF
-                       -DBUILD_LUA_RSVG=OFF
-                       -DBUILD_AUDACIOUS=OFF
-                       -DBUILD_XMMS2=OFF
-               )
-       fi
-
-       mycmakeargs+=(
-               $(cmake-utils_use_build apcupsd)
-               $(cmake-utils_use_build debug)
-               $(cmake-utils_use_build cmus)
-               $(cmake-utils_use_build curl)
-               $(cmake-utils_use_build eve)
-               $(cmake-utils_use_build hddtemp)
-               $(cmake-utils_use_build iostats)
-               $(cmake-utils_use_build ical)
-               $(cmake-utils_use_build iconv)
-               $(cmake-utils_use_build ipv6)
-               $(cmake-utils_use_build irc)
-               $(cmake-utils_use_build math)
-               $(cmake-utils_use_build moc)
-               $(cmake-utils_use_build mpd)
-               $(cmake-utils_use_build mysql)
-               $(cmake-utils_use_build ncurses)
-               $(cmake-utils_use_build portmon PORT_MONITORS)
-               $(cmake-utils_use_build rss)
-               $(cmake-utils_use_build thinkpad IBM)
-               $(cmake-utils_use_build weather-metar WEATHER_METAR)
-               $(cmake-utils_use_build weather-xoap WEATHER_XOAP)
-               $(cmake-utils_use_build webserver HTTP)
-               $(cmake-utils_use_build wifi WLAN)
-               -DBUILD_BUILTIN_CONFIG=ON
-               -DBUILD_OLD_CONFIG=ON
-               -DBUILD_I18N=ON
-               -DMAINTAINER_MODE=OFF
-               -DRELEASE=ON
-               -DBUILD_AUDACIOUS_LEGACY=OFF
-               -DBUILD_BMPX=OFF
-               -DDOC_PATH=/usr/share/doc/${PF}
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       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() {
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               elog "You can find sample configurations at 
${ROOT%/}/usr/share/doc/${PF}."
-               elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf"
-               elog "and edit it to your liking."
-               elog
-               elog "There are pretty html docs available at the conky 
homepage"
-               elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
-               elog
-               elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO";
-               elog
-       fi
-}

diff --git a/app-admin/conky/conky-1.10.3.ebuild 
b/app-admin/conky/conky-1.10.3.ebuild
deleted file mode 100644
index a660756..00000000
--- a/app-admin/conky/conky-1.10.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky";
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-       lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-       nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-       weather-metar weather-xoap webserver wifi X xmms2"
-
-DEPEND_COMMON="
-       X? (
-               imlib? ( media-libs/imlib2[X] )
-               lua-cairo? (
-                       >=dev-lua/toluapp-1.0.93
-                       x11-libs/cairo[X] )
-               lua-imlib? (
-                       >=dev-lua/toluapp-1.0.93
-                       media-libs/imlib2[X] )
-               lua-rsvg? (
-                       >=dev-lua/toluapp-1.0.93
-                       gnome-base/librsvg )
-               nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] 
media-video/nvidia-settings ) )
-               truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-               x11-libs/libX11
-               x11-libs/libXdamage
-               x11-libs/libXinerama
-               x11-libs/libXfixes
-               x11-libs/libXext
-               audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
-               xmms2? ( media-sound/xmms2 )
-       )
-       cmus? ( media-sound/cmus )
-       curl? ( net-misc/curl )
-       eve? ( net-misc/curl dev-libs/libxml2 )
-       ical? ( dev-libs/libical )
-       iconv? ( virtual/libiconv )
-       irc? ( net-libs/libircclient )
-       mysql? ( >=virtual/mysql-5.0 )
-       ncurses? ( sys-libs/ncurses:= )
-       pulseaudio? ( media-sound/pulseaudio )
-       rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-       systemd? ( sys-apps/systemd )
-       wifi? ( net-wireless/wireless-tools )
-       weather-metar? ( net-misc/curl )
-       weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-       webserver? ( net-libs/libmicrohttpd )
-       >=dev-lang/lua-5.1.4-r8:0
-       "
-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}
-       app-text/docbook2X
-       "
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at 
${ROOT%/}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT%/}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO";
-
-pkg_setup() {
-       use ipv6 && linux-info_pkg_setup
-}
-
-src_configure() {
-       local mycmakeargs
-
-       if use X; then
-               mycmakeargs=(
-                       -DBUILD_X11=ON
-                       -DOWN_WINDOW=ON
-                       -DBUILD_XDAMAGE=ON
-                       -DBUILD_XINERAMA=ON
-                       -DBUILD_XDBE=ON
-                       -DBUILD_XFT=$(usex truetype)
-                       -DBUILD_IMLIB2=$(usex imlib)
-                       -DBUILD_XSHAPE=ON
-                       -DBUILD_ARGB=ON
-                       -DBUILD_LUA_CAIRO=$(usex lua-cairo)
-                       -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-                       -DBUILD_LUA_RSVG=$(usex lua-rsvg)
-                       -DBUILD_NVIDIA=$(usex nvidia)
-                       -DBUILD_AUDACIOUS=$(usex audacious)
-                       -DBUILD_XMMS2=$(usex xmms2)
-               )
-       else
-               mycmakeargs=(
-                       -DBUILD_X11=OFF
-                       -DBUILD_NVIDIA=OFF
-                       -DBUILD_LUA_CAIRO=OFF
-                       -DBUILD_LUA_IMLIB2=OFF
-                       -DBUILD_LUA_RSVG=OFF
-                       -DBUILD_AUDACIOUS=OFF
-                       -DBUILD_XMMS2=OFF
-               )
-       fi
-
-       mycmakeargs+=(
-               -DBUILD_APCUPSD=$(usex apcupsd)
-               -DBUILD_CMUS=$(usex cmus)
-               -DBUILD_CURL=$(usex curl)
-               -DBUILD_EVE=$(usex eve)
-               -DBUILD_HDDTEMP=$(usex hddtemp)
-               -DBUILD_IOSTATS=$(usex iostats)
-               -DBUILD_ICAL=$(usex ical)
-               -DBUILD_ICONV=$(usex iconv)
-               -DBUILD_IPV6=$(usex ipv6)
-               -DBUILD_IRC=$(usex irc)
-               -DBUILD_MATH=$(usex math)
-               -DBUILD_MOC=$(usex moc)
-               -DBUILD_MPD=$(usex mpd)
-               -DBUILD_MYSQL=$(usex mysql)
-               -DBUILD_NCURSES=$(usex ncurses)
-               -DBUILD_PORT_MONITORS=$(usex portmon)
-               -DBUILD_PULSEAUDIO=$(usex pulseaudio)
-               -DBUILD_RSS=$(usex rss)
-               -DBUILD_JOURNAL=$(usex systemd)
-               -DBUILD_IBM=$(usex thinkpad)
-               -DBUILD_WEATHER_METAR=$(usex weather-metar)
-               -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
-               -DBUILD_HTTP=$(usex webserver)
-               -DBUILD_WLAN=$(usex wifi)
-               -DBUILD_BUILTIN_CONFIG=ON
-               -DBUILD_OLD_CONFIG=ON
-               -DBUILD_I18N=ON
-               -DMAINTAINER_MODE=OFF
-               -DRELEASE=ON
-               -DBUILD_BMPX=OFF
-               -DDOC_PATH=/usr/share/doc/${PF}
-       )
-       # -DMAINTAINER_MODE=OFF disables building documentation and fixes bug 
#486270
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       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
-
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-}

Reply via email to