gentoo resync : 11.02.2018

10 files changed, 2 insertions, 546 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 9eba7e5f034e..90c00f22ca9a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,15 +1,6 @@
 AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
-AUX conky-1.10.6-cpu-hotplug.patch 683 BLAKE2B 770cda24a35ea2e1e559805fcb6b4cfb665dab090abe9dfb68eb4a49f78b659896b5d705592fcd19bfc59a4c8839115239db84eaafa62a9950da30b040f2aaab SHA512 728edde1271d5c4f65e22b6b406ffc693018a01505f0162fc8b352ed3a6eb490386b382372ed2f00a076cc5d0752fced813727888459a5e452edda42c57967ed
-AUX conky-1.10.6-fix-text-shades.patch 401 BLAKE2B 2ea47d75e5b706f9af50fd0acbf56c59ffba95759c9ff76fb12a00a53874864d2af454ff13559e289433b5d0edfa752e3436cbd57e8a57114b2f7c0c4e0f4f94 SHA512 a18a0d8d523850ba5fb94f0de7eeff0764a8c73a7ca3e788c676f3a8c11836bc100bb39e85b58e6e8d501b6107dd2aa52bb404295d5bb8f951d668dadb7d73d5
-AUX conky-1.10.6-gcc-7.patch 279 BLAKE2B 139c76201d947c19a2fdde3e192611192475f7e2cd3d0501e6de00ff99cf12eb4a4d0f032540e05a5bd3815c384d45cd8059b27962ff373b1a97b24333696ed9 SHA512 a9a7b358af47cbb1366c29f2af669efec927ed61b3d0d5595ac95a8d316a98b1761ee0875cb06230d5e456aceefc7912438b0fad90b145fe07d6a71cfd13e592
-AUX conky-1.10.6-new_graph-oor.patch 1312 BLAKE2B 6afc8d2e72797155123d28081e7c8a1bea7b85a9cd22cc45f9dda802949de27c567db3afd4927d18ea45ea1fa1ad3e9a07bd2ac2a1a44ba9aa87fdd5d7ee4e8e SHA512 ef7e15601251b846766dacad6bf1ff6f8d66b6c8fec2c40222ea7f072679ecacbceac297d516f0764aa9b4e9caac7f1deeea0b4365e89ba5733f7c8412658ec1
-AUX conky-1.10.7-cpu-hotplug.patch 464 BLAKE2B 7a36582e08d919bf589a7f6ad83867636f1c58fc4472c3455e287a2bbbe34f1960632c6e3377e02091811c8fdaa36ad667396cded5b8d41d11973e21c8a668fa SHA512 abafa1ed19b5aa4855958d0bd204c36ec7bbb06f8f5d3303348e8beb437312137b94583613007b79259159f2fc3c4c42577bca3ccbb53340c44e11715b703f8f
-AUX conky-1.10.7-out_to_x-segfault.patch 1769 BLAKE2B c9669f325c7ed4bddf2761d8246f317da7c01942a859dca3ff2e829c7d2adfecc4d38887a3fa1f215a9d7efd9251a118b820da42e251f27e4195dcc20fc8b543 SHA512 804bac365e54ee3ca817062eb29aeca5538d2ac651c6446154fd63c8e668aa15cf97e1c8c1e8898632ab77cb7aebd5ffe30d9effb78465128decd956af814c66
 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
-DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
-DIST conky-1.10.7.tar.gz 371881 BLAKE2B f1a1dd0d67efe1658d3a3da7ddb121c31ae34c347f7bce7fcecb57d7311ddcf80fb391055fefb92fd235b702c3e5b17362821565aba7a911931542ea714d8d76 SHA512 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4
+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.6-r6.ebuild 5075 BLAKE2B 2faac63d87f6c12e9077f2915b9d451b02b7f014de627d7a7881f837cfac9e3280bd1f0eb744437023c4247f3959ad87ec8cbc183736d68015d51842f298d492 SHA512 011b6142f50f1cd9addd30df888e7186ff370c6c5046091998af61e7aa1ddf8f7f18f1469c6f9ceb5795c803b26513cf01c0e8dfcd1637ab3a2ecc84ac37fa22
-EBUILD conky-1.10.7-r1.ebuild 5006 BLAKE2B 858f732901802c8c35ac47f05b9e80ede6b9a4a3176e2333b98d6abf07944413764f238ff0b8cb9673388488793d0b4e2fe8018d64298a42e0d0067676263ac4 SHA512 a8af114c309b2b42e36b6b582336012dee9589c08c881f198765d5007022c5a91a3a7ea683179e66bf96b4a4df19cbc1304d9d5b9bb904a154a9c36bf33ab57b
-EBUILD conky-1.10.7.ebuild 4962 BLAKE2B f73d4b96e9eb983194f599fcfa1e4b81b2bba17d5ec28d841df8b1c0b24b66bab768438b0328e57b16cb80bf83c154c735faffec7e750251d049fc0fed037b77 SHA512 bae107f0e3b506778dc16f0ed34aaddf9487210cd137f7a304ea9a8938a3a1bcffd74d6ea8d0eee288df32b9687553b3166ac63b86fd14f2e4997bbc6b3905a8
+EBUILD conky-1.10.8.ebuild 4911 BLAKE2B efb1279166ce96dc20b6aeaa829469c6258b7fbe172a77d09cfe51c70d8399b5f88e085a600cb73eaa7d662287fa88f21916f8fe18333926f46bedbe8d161f14 SHA512 e85637fa8a03ba611bd4f0f4eb243e737ed1479ba7db460393da8ab1565b34e82441e295913fbfa63b3c4e5b5c25988e1a658828cdd6125087ac351250a53c9c
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.6-r6.ebuild b/app-admin/conky/conky-1.10.6-r6.ebuild
deleted file mode 100644
index e72ff2d735ab..000000000000
--- a/app-admin/conky/conky-1.10.6-r6.ebuild
+++ /dev/null
@@ -1,195 +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}-new_graph-oor.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-fix-text-shades.patch
-	"${FILESDIR}"/${P}-cpu-hotplug.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
-
-	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=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/conky-1.10.7-r1.ebuild b/app-admin/conky/conky-1.10.7-r1.ebuild
deleted file mode 100644
index 249fdc2045b8..000000000000
--- a/app-admin/conky/conky-1.10.7-r1.ebuild
+++ /dev/null
@@ -1,193 +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}-cpu-hotplug.patch
-	"${FILESDIR}"/${P}-out_to_x-segfault.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
-
-	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=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/conky-1.10.7.ebuild b/app-admin/conky/conky-1.10.8.ebuild
index dd9490808193..2679d6611621 100644
--- a/app-admin/conky/conky-1.10.7.ebuild
+++ b/app-admin/conky/conky-1.10.8.ebuild
@@ -73,10 +73,6 @@ CONFIG_CHECK=~IPV6
 
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cpu-hotplug.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
diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
deleted file mode 100644
index 00e1003617ef..000000000000
--- a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001
-From: Daniel Pielmeier <billie80@users.noreply.github.com>
-Date: Sat, 18 Feb 2017 16:55:35 +0100
-Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127
-
----
- src/linux.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/linux.cc b/src/linux.cc
-index 664ddf5e..63b3ea40 100644
---- a/src/linux.cc
-+++ b/src/linux.cc
-@@ -900,6 +900,9 @@ int update_stat(void)
- 			} else {
- 				idx = 0;
- 			}
-+			if (idx > info.cpu_count) {
-+				continue;
-+			}
- 			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
- 				&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
- 				&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),
diff --git a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
deleted file mode 100644
index 70b0c52d2a14..000000000000
--- a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/conky.cc	2017-02-21 18:00:40.157275779 -0800
-+++ b/src/conky.cc	2017-02-21 18:05:16.137077877 -0800
-@@ -1930,7 +1930,9 @@
- 
- static void draw_stuff(void)
- {
-+#ifndef BUILD_X11
- 	static int text_offset_x, text_offset_y; /* offset for start position */
-+#endif
- 	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.6-gcc-7.patch b/app-admin/conky/files/conky-1.10.6-gcc-7.patch
deleted file mode 100644
index 6784129d39c4..000000000000
--- a/app-admin/conky/files/conky-1.10.6-gcc-7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/src/luamm.hh b/src/luamm.hh
---- a/src/luamm.hh	2017-07-07 15:05:28.250032963 +0200
-+++ b/src/luamm.hh	2017-07-07 15:05:43.230033134 +0200
-@@ -28,6 +28,7 @@
- #include <exception>
- #include <stdexcept>
- #include <string>
-+#include <functional>
- 
- #include <lua.hpp>
- 
diff --git a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
deleted file mode 100644
index 18091702f681..000000000000
--- a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001
-From: labath <pavelo@centrum.sk>
-Date: Tue, 31 Jan 2017 01:31:09 +0000
-Subject: [PATCH] Fix an out-of-range error in new_graph (#356)
-
-The code was multiplying the index with the size of the element, and
-then adding it to the typed pointer (resulting in a double
-multiplication and an OOB access).
-
-Replace the buggy code with a slightly safer c++ alternative.
----
- src/specials.cc | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/specials.cc b/src/specials.cc
-index ee941eb..73bd2a2 100644
---- a/src/specials.cc
-+++ b/src/specials.cc
-@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val)
- 		DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width);
- 		if (!s->graph) {
- 			/* initialize */
--			memset(graph, 0, s->graph_width * sizeof(double));
-+			std::fill_n(graph, s->graph_width, 0.0);
- 			s->scale = 100;
- 		} else {
- 			if (s->graph_width > s->graph_allocated) {
- 				/* initialize the new region */
--				memset(graph + (s->graph_allocated * sizeof(double)), 0,
--						(s->graph_width - s->graph_allocated) *
--						sizeof(double));
-+				std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0);
- 			}
- 		}
- 		s->graph = graph;
diff --git a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
deleted file mode 100644
index 18394828105c..000000000000
--- a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc
---- conky-1.10.7_old/src/linux.cc	2018-01-19 16:59:14.158830825 +0100
-+++ conky-1.10.7/src/linux.cc	2018-01-19 16:59:44.796144615 +0100
-@@ -923,6 +923,9 @@
- 			} else {
- 				idx = 0;
- 			}
-+			if (idx > info.cpu_count) {
-+				continue;
-+			}
- 			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
- 				&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
- 				&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),
diff --git a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
deleted file mode 100644
index fef22ac46e50..000000000000
--- a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Tue, 23 Jan 2018 13:52:11 -0500
-Subject: [PATCH] Fix segfault when out_to_x = false. (#455)
-
-This resolves #454.
----
- src/conky.cc | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 48256ecc..f10d08fb 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -2076,20 +2076,24 @@ static void main_loop(void)
- 	sigaddset(&newmask, SIGUSR1);
- #endif
- 
-+#ifdef BUILD_X11
- #ifdef BUILD_XSHAPE
--	/* allow only decorated windows to be given mouse input */
--	int major_version, minor_version;
--	if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
--		NORM_ERR("Input shapes are not supported");
--	} else {
--		if (own_window.get(*state) &&
--		    (own_window_type.get(*state) != TYPE_NORMAL ||
--		     (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
--			XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
--			   NULL, 0, ShapeSet, Unsorted);
-+	if (out_to_x.get(*state)) {
-+		/* allow only decorated windows to be given mouse input */
-+		int major_version, minor_version;
-+		if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
-+			NORM_ERR("Input shapes are not supported");
-+		} else {
-+			if (own_window.get(*state) &&
-+					(own_window_type.get(*state) != TYPE_NORMAL ||
-+					 (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
-+				XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
-+						NULL, 0, ShapeSet, Unsorted);
-+			}
- 		}
- 	}
- #endif /* BUILD_XSHAPE */
-+#endif /* BUILD_X11 */
- 
- 	last_update_time = 0.0;
- 	next_update_time = get_time() - fmod(get_time(), active_update_interval());