[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/

[Daniel Pielmeier]

commit:     d2c5251be3f3cc63a50c2449911860736611a979
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 09:18:21 2017 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 09:18:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c5251b

app-admin/conky: Remove old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/conky/Manifest              |   1 -
 app-admin/conky/conky-1.10.6.ebuild   | 182 ----------------------------------
 app-admin/conky/conky-1.9.0-r3.ebuild | 145 ---------------------------
 app-admin/conky/metadata.xml          |   1 -
 4 files changed, 329 deletions(-)

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index a050b17d81a..e9ded135a75 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,3 +1,2 @@
 DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
 DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
-DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a

diff --git a/app-admin/conky/conky-1.10.6.ebuild b/app-admin/conky/conky-1.10.6.ebuild
deleted file mode 100644
index 9011e6dfb2f..00000000000
--- a/app-admin/conky/conky-1.10.6.ebuild
+++ /dev/null
@@ -1,182 +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 ~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
-}

diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild
deleted file mode 100644
index 68cfc2128f4..00000000000
--- a/app-admin/conky/conky-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="alpha ~arm ppc ppc64 sparc"
-IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
-
-DEPEND_COMMON="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? (
-			>=dev-lua/toluapp-1.0.93
-			>=dev-lang/lua-5.1.4-r8:0
-			x11-libs/cairo[X] )
-		lua-imlib? (
-			>=dev-lua/toluapp-1.0.93
-			>=dev-lang/lua-5.1.4-r8:0
-			media-libs/imlib2[X] )
-		nvidia? ( media-video/nvidia-settings )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
-		xmms2? ( media-sound/xmms2 )
-	)
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	portmon? ( dev-libs/glib:2 )
-	lua? ( >=dev-lang/lua-5.1.4-r8: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 )
-	virtual/libiconv
-	"
-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}
-	virtual/pkgconfig
-	"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
-		"${FILESDIR}/${P}-ncurses.patch" \
-		"${FILESDIR}/${P}-lines-fix.patch" \
-		"${FILESDIR}/${P}-update-when-message-count-decreases.patch" \
-		"${FILESDIR}/${P}-apcupsd.patch" \
-		"${FILESDIR}/${P}-default-graph-size.patch" \
-		"${FILESDIR}/${P}-diskio-dmmajor.patch" \
-		"${FILESDIR}/${P}-tinfo.patch" \
-		"${FILESDIR}/${P}-update-noaa-metar-uri.patch"
-
-	# Allow user patches #478482
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --enable-argb --enable-own-window"
-		myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
-		myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
-		myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
-		myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
-	else
-		myconf="--disable-x11 --disable-own-window --disable-argb"
-		myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
-		myconf="${myconf} --disable-audacious --disable-xmms2"
-	fi
-
-	econf \
-		${myconf} \
-		$(use_enable apcupsd) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable eve) \
-		$(use_enable hddtemp) \
-		$(use_enable iostats) \
-		$(use_enable lua) \
-		$(use_enable thinkpad ibm) \
-		$(use_enable math) \
-		$(use_enable moc) \
-		$(use_enable mpd) \
-		$(use_enable ncurses) \
-		$(use_enable portmon) \
-		$(use_enable rss) \
-		$(use_enable weather-metar) \
-		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan)
-}
-
-src_install() {
-	default
-
-	dohtml doc/*.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
-
-	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%/}/etc/conky."
-		elog "To customize, copy to ~/.conkyrc 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/metadata.xml b/app-admin/conky/metadata.xml
index 8b97c35909e..3bdd546109e 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -22,7 +22,6 @@
 		<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">Enable if you want Lua scripting support</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>