summaryrefslogtreecommitdiff
path: root/app-admin/conky
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
commitd87262dd706fec50cd150aab3e93883b6337466d (patch)
tree246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/conky
parent71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/Manifest7
-rw-r--r--app-admin/conky/conky-1.10.4.ebuild184
-rw-r--r--app-admin/conky/conky-1.10.8-r1.ebuild205
-rw-r--r--app-admin/conky/files/conky-1.10.4-x11-build.patch31
-rw-r--r--app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch34
-rw-r--r--app-admin/conky/metadata.xml40
6 files changed, 0 insertions, 501 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
deleted file mode 100644
index 3e724c483054..000000000000
--- a/app-admin/conky/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
-AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
-DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
-DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
-EBUILD conky-1.10.8-r1.ebuild 5185 BLAKE2B f35554a27175e3b728281b781e1dbb654d4c9d8aa7d5c84825dbbc9ed4c097ffb290daa2e5a19d7650870de2e9aaaec80784454efb465765a66e4c12d0fdc8e1 SHA512 89a46bd70e5565cc03bed1fc9ff10f95d1479edf9e5ca65f5bd663912731c412ba97ea568e273cecaa7bf5cd3d5ae3c9a172618e9e37cd3e7c3cf7289fcdc348
-MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
deleted file mode 100644
index 38f3c714f274..000000000000
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ppc64 sparc 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 )
-
-PATCHES=( "${FILESDIR}"/${P}-x11-build.patch )
-
-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
-}
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
deleted file mode 100644
index f9d5660cd0cd..000000000000
--- a/app-admin/conky/conky-1.10.8-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ppc64 sparc 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 )
-
-PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch )
-
-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_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
-}
-
-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
-
- if use weather-xoap; then
- mycmakeargs+=(
- -DBUILD_WEATHER_XOAP=ON
- -DBUILD_WEATHER_METAR=ON
- )
- elif use weather-metar; then
- mycmakeargs+=(
- -DBUILD_WEATHER_METAR=ON
- -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
- )
- else
- mycmakeargs+=(
- -DBUILD_WEATHER_XOAP=OFF
- -DBUILD_WEATHER_METAR=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_HTTP=$(usex webserver)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_BUILTIN_CONFIG=ON
- -DBUILD_OLD_CONFIG=OFF
- -DBUILD_I18N=ON
- -DMAINTAINER_MODE=ON
- -DRELEASE=ON
- -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
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
deleted file mode 100644
index eb113a47fd57..000000000000
--- a/app-admin/conky/files/conky-1.10.4-x11-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
-From: shizeeg <shizeeque@gmail.com>
-Date: Thu, 8 Sep 2016 18:24:29 +0300
-Subject: [PATCH] Fix build without X11 (#317)
-
----
- src/conky.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 0a812fc..4c5da94 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
-
- int draw_each_line_inner(char *s, int special_index, int last_special_applied)
- {
-+#ifndef BUILD_X11
-+ static int cur_x, cur_y; /* current x and y for drawing */
-+#endif
- #ifdef BUILD_X11
- int font_h = 0;
- int cur_y_add = 0;
-@@ -1934,6 +1937,7 @@ static void draw_text(void)
-
- static void draw_stuff(void)
- {
-+ static int text_offset_x, text_offset_y; /* offset for start position */
- text_offset_x = text_offset_y = 0;
- #ifdef BUILD_IMLIB2
- cimlib_render(text_start_x, text_start_y, window.width, window.height);
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
deleted file mode 100644
index 97e6bd02323f..000000000000
--- a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Reversed patch
-
-From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 12:56:06 -0500
-Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
-
-This should resolve #217.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index c5b39b2f..19ec7b9b 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -129,12 +129,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
-
- if(BUILD_NCURSES)
-+ pkg_check_modules(NCURSES ncurses)
-+ if(NOT NCURSES_FOUND)
-- include(FindCurses)
-- if(NOT CURSES_FOUND)
- message(FATAL_ERROR "Unable to find ncurses library")
-+ endif(NOT NCURSES_FOUND)
-+ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
-- endif(NOT CURSES_FOUND)
-- set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
-- set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
- endif(BUILD_NCURSES)
-
- if(BUILD_MYSQL)
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
deleted file mode 100644
index 3bdd546109e7..000000000000
--- a/app-admin/conky/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>billie@gentoo.org</email>
- <name>Daniel Pielmeier</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>brenden@rty.ca</email>
- <name>Brenden Matthews</name>
- </maintainer>
- <remote-id type="sourceforge">conky</remote-id>
- <remote-id type="github">brndnmtthws/conky</remote-id>
- </upstream>
- <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="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
- <flag name="audacious">Enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
- <flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
- <flag name="eve">Enable support for the eve-online skill monitor</flag>
- <flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
- <flag name="iostats">Enable support for per-task I/O statistics</flag>
- <flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
- <flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
- <flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
- <flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
- <flag name="math">Enable support for glibc's libm math library</flag>
- <flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
- <flag name="mpd">Enable monitoring of music controlled by <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="portmon">Enable support for tcp (ip4) port monitoring</flag>
- <flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag>
- <flag name="weather-metar">Enable support for metar weather service</flag>
- <flag name="weather-xoap">Enable support for metar and xoap weather service</flag>
- <flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
- <flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
- </use>
-</pkgmetadata>