gentoo resync : 25.08.2018

3 files changed, 242 insertions, 0 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 59eb76c6f56b..5d474f6af22d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,9 @@
 AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
+AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
 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 5184 BLAKE2B e42508f1ed4d950e287b9e8b5f5d0e7b88dbdbd8b7fb319ee2f4a05c13af28957c88994ffa626d41fdbc12ff895643344ab2f8b8e9272c71d3622c1646474ab5 SHA512 faf1d6431e6516d83a9ad7cae2f62255110fccfc19379bd13f4a41c6bc594a21298d0d5af48bfecd4cb6bc4e16f79cf650834c51d5c287a908f75a3c881022a8
+EBUILD conky-1.10.8-r2.ebuild 5226 BLAKE2B 141b71885b2fde6ba9c1c613527c0e94b4ace5d3fd341f34daace3735e3fc45ba6302f09592cc5bb4a692f60fcfe570f909c3f0e6faa84d2cec68ba4918b758a SHA512 fd863912a5b712cf8ab668ce91a53847c2c3caf4b6fd52fde903b9401d78d5cb6d5b8ae454a71023b126801af37a442b230bec338fcd2a80cbc7d57f0f3efa7f
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.8-r2.ebuild b/app-admin/conky/conky-1.10.8-r2.ebuild
new file mode 100644
index 000000000000..7b5070f6df14
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r2.ebuild
@@ -0,0 +1,208 @@
+# 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
+	"${FILESDIR}"/${P}-libical-3.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.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
new file mode 100644
index 000000000000..032a6d2ef263
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-libical-3.patch
@@ -0,0 +1,32 @@
+From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@suse.de>
+Date: Tue, 6 Mar 2018 13:46:31 +0100
+Subject: [PATCH] Add support for libical 3.x (#465)
+
+In libical3, deprecated icaltime_from_timet is removed
+Use icaltime_from_timet_with_zone instead. This function
+exists in libical 2.x so no need to change requirements
+---
+ src/ical.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ical.cc b/src/ical.cc
+index e4b48511..ef069124 100644
+--- a/src/ical.cc
++++ b/src/ical.cc
+@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
+ 	icaltimetype start;
+ 
+ 	start = icalcomponent_get_dtstart(new_ev);
+-	if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
++	if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
+ 		icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
+ 		if(rrule) {
+ 			icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
+ 			icaltimetype nexttime = icalrecur_iterator_next(ritr);
+ 			while (!icaltime_is_null_time(nexttime)) {
+-				if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
++				if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
+ 					start = nexttime;
+ 					break;
+ 				}