gentoo resync : 18.11.2019

2 files changed, 0 insertions, 186 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index bc7ab071d9ea..2be145014973 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,10 +2,8 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
 AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-DIST conky-1.11.4.tar.gz 2400814 BLAKE2B ad12ade96de5ed3575eba3d8a6e06cb8d30ed686e002f36c3a52a1d4351379546bcea2237792929de36d8c0c402eda977a8c0b5b36a0878fe001056d8d2c34b7 SHA512 191ffe4a50a8876a658163c83a45f722f07ca6a0b86ea3ebad369d58f4c2bb798e8afaef6c0643bcca90de546a7f3de4acf9d2e4b4a2b6366bf42de0ccaade3d
 DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
 EBUILD conky-1.10.8-r4.ebuild 4721 BLAKE2B d9c89dffa7d58e01261168329bf3ff262b0fea01d319b7e00da36d9a912198ca197e8895dd1e267fdd33e650cd52ac0857ccd7e0e30c79ebeb38fed05f181c1b SHA512 8d938d25188f1d16b088ec5b248ace639e52f23380a11ce725bb20ecf4417ab650f5699510d6229beb48c699763ab0ba9fc43cb9cfdb6c7b4081be3fa9ef6dbc
 EBUILD conky-1.10.8-r8.ebuild 4772 BLAKE2B b8b7eb6a6dc3e381890663337613fa334d301bbf5192ad4d42b6f6fcdcd80971f6453f444f70e6da354cb745567a78f92d320de5deb87745e1e2b0ed9087d5f7 SHA512 c7771bf49e134d9a50c94df85f136814aa96507117812c99b05effa86d28be800479c04f5f6a4659f73ec03b374de7bae0ed1a12c216b3c5fcf7841153d1b023
-EBUILD conky-1.11.4.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
 EBUILD conky-1.11.5.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.4.ebuild b/app-admin/conky/conky-1.11.4.ebuild
deleted file mode 100644
index a52ce080d2f9..000000000000
--- a/app-admin/conky/conky-1.11.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils linux-info readme.gentoo-r1 xdg
-
-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 bundled-toluapp cmus curl doc 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 webserver wifi X xmms2"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	xmms2? ( media-sound/xmms2 )
-	|| ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	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="
-	${COMMON_DEPEND}
-	doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
-	imlib? ( X )
-	nvidia? ( X )
-	truetype? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-"
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md 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 when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	xdg_environment_reset
-
-	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_ARGB=ON
-			-DBUILD_X11=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XSHAPE=ON
-			-DOWN_WINDOW=ON
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=ON
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=OFF
-		-DRELEASE=ON
-	)
-
-	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
-
-	xdg_pkg_postinst
-}