From a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 Nov 2017 18:38:22 +0000 Subject: gentoo resync : 18.11.2017 --- app-admin/conky/Manifest | 5 +- app-admin/conky/conky-1.10.6-r2.ebuild | 190 -------------------- app-admin/conky/conky-1.10.6-r4.ebuild | 195 +++++++++++++++++++++ .../conky/files/conky-1.10.6-cpu-hotplug.patch | 23 +++ .../conky/files/conky-1.10.6-fix-text-shades.patch | 12 ++ app-admin/conky/files/conky-1.10.6-gcc-7.patch | 11 ++ 6 files changed, 245 insertions(+), 191 deletions(-) delete mode 100644 app-admin/conky/conky-1.10.6-r2.ebuild create mode 100644 app-admin/conky/conky-1.10.6-r4.ebuild create mode 100644 app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch create mode 100644 app-admin/conky/files/conky-1.10.6-fix-text-shades.patch create mode 100644 app-admin/conky/files/conky-1.10.6-gcc-7.patch (limited to 'app-admin/conky') diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 69d22591a899..004fe5d0d9fb 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,9 +1,12 @@ AUX conky-1.10.4-x11-build.patch 944 SHA256 e5e16ba54b6d0f80a9ecfb309e77f2e065836daf66f6417549fb76aa08043be1 SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa WHIRLPOOL d16a08cba155096ad70f59ee8f8bba852692b787ce09e421816e20ac7301cada2a2ea91217635b98cc6a84c7a7ca3aae6ba6407fa9dbdd16252d2a4648302017 +AUX conky-1.10.6-cpu-hotplug.patch 684 SHA256 d6eda7daded00aa35fd6e621a50d99bd3ebd177eb55c006850f19acddac34f83 SHA512 044918683e3e42b1c9feceda697c92e3cec89daad02e79b8b207aedcc9b7dd970f3154a411fb4f4768c43b4c90fab6d0c6a26be76b5de842880ff4c3e01110e0 WHIRLPOOL e69035b1c0fe782c2c4917d9c8dcd31aacb99e5b311504d67a2fc1419f200375a0f2b20a5fa47d9825c20e5a73babd66e1e2d22d791b10656aa9dddaab927e9b +AUX conky-1.10.6-fix-text-shades.patch 401 SHA256 fcb596f6dde810d22c697b77ee8e0cf10b9b74f8c6f793abb15527034e8884ec SHA512 a18a0d8d523850ba5fb94f0de7eeff0764a8c73a7ca3e788c676f3a8c11836bc100bb39e85b58e6e8d501b6107dd2aa52bb404295d5bb8f951d668dadb7d73d5 WHIRLPOOL 467699b8dd6816a146b175d32eda0489ad46071361247018fa3985d17172989bc4d4388d01f077536fc85b81b57e16f8dcba6c919ee1c76d76f35dba3ab1b826 +AUX conky-1.10.6-gcc-7.patch 279 SHA256 c73c3c7211f05006be3d79bbac8bd6f7cc15105080369d8c1eb9e8eb91681d24 SHA512 a9a7b358af47cbb1366c29f2af669efec927ed61b3d0d5595ac95a8d316a98b1761ee0875cb06230d5e456aceefc7912438b0fad90b145fe07d6a71cfd13e592 WHIRLPOOL 1b5fa3ea034d51686f8e8e6c7bc80a6e21b0ad98ab191717bb357b94036f3bc978b405e3b3ab1a7f5e5f333d6e58243a3f67db6f5cc07328768c46dcb740f844 AUX conky-1.10.6-new_graph-oor.patch 1312 SHA256 09790582195c65df29b55e19e18182382deced171d13726c893c6394936080f3 SHA512 ef7e15601251b846766dacad6bf1ff6f8d66b6c8fec2c40222ea7f072679ecacbceac297d516f0764aa9b4e9caac7f1deeea0b4365e89ba5733f7c8412658ec1 WHIRLPOOL 6757df1ee8915da7af6574921b13eac7efc21c8aaaf923cf120a685d6c3e11809790017a356619d9b45f9ea1a2edacfa50a334379aab2e174670a713ae188a41 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 EBUILD conky-1.10.4.ebuild 4850 SHA256 4f1d8cf0ab5523ffd916a8471ffbee24575720585be684bd61690a54e336e275 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663 WHIRLPOOL b706caf820c1905dc1a76e6e9c559b01d50365afa82b6bfbd7ce0c76a0df4590e0c094f72296ffed0ca88bef194bd1984ad4882a12f2f46bdbbcbceb22049ae1 -EBUILD conky-1.10.6-r2.ebuild 4955 SHA256 8b764836fdc624b00cdcb9344cafe754dfb802f57613ce23e56263041bf9c734 SHA512 28786f8158faec2ddb9a78375e7af340f57f12575b44aaececc77181efdb1c5fdaea1df63af2ef39cbcc9caac6af6fcf8df17665bef68ab411ba77bebce56fec WHIRLPOOL 4ae71163f6c2660ebd6ba8bac52976ff3511fb4f371b0ef4370e7759357b835b02c60cbef7c4c3386c204e7c5d7a2f60c5ff41bccda5f89203b99e88e283ab48 +EBUILD conky-1.10.6-r4.ebuild 5068 SHA256 af9a4a6fb7da099d6c30527b496d53cc97783c2ebb1780aee84900d871dde1fe SHA512 32aac380a6093b2542c2d8b499450a0f51adbb96b3b05d00b0f13c1f62546f44ab9bf7669f59a3fd0858434c7b59d84692071df99b2a4bbe79666cb67025080b WHIRLPOOL c43cb73defaeae42649963d1e2ad34fa9684bf7f0ea12030d0b4d4b7fec07f8f86de26619526d9c309b8c9050ef287b1f99bc0722edd505b3d7ace004d9b2ce0 MISC ChangeLog 8668 SHA256 3e1697a626614dcaecef4ac12727962b62fdf1c23a2021424f7a386a40729b38 SHA512 7f686cace9e9915e1772a7288f32b382ffa7170650271f3a967d816d0357f7156dac09c9996e104112d7b97b5764c7923a0bd2fa5ca1b86b9a5a474b6c9a9d22 WHIRLPOOL 3d40e13840be1cc68501c748a415028ab040114fe874387fc6d559a1908faf88e1083cc415a24d4d7797fda9a6366840e4b369285ee95642a32fa670a6e4d394 MISC ChangeLog-2015 34218 SHA256 adc2023620bd75ca1fd201ebcda63137f7a678b63c5f6d609f5af34f383b4592 SHA512 c0ede6c537e264edf8308ac7bc115de278bd4aff510a061012d358c0c1776bb5f67d40d0600a4e92d91ea11ed0645535ebbcd0aa77fa125cfd6ece7ae0537b15 WHIRLPOOL 7648aeacb920d81f71bf8fed75c21ecca7cdb16511c4c18399a87b95dbc1eab510c84da5e1856f6a0bd6385d44b4746ba51b042fca6027fe3044447fe8420000 MISC metadata.xml 2525 SHA256 65554345e355ca9ec2e72dd6c5169954ccf421ca3bce2385aec7909c384f000b SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb WHIRLPOOL b9081e8c70902af80147904eafc94bc2f626a1f580843c408b0dce613ac835af5b0bd5b79dfd330c15c67ccb444cceacb90698475c5ce9987c52223748d9092c diff --git a/app-admin/conky/conky-1.10.6-r2.ebuild b/app-admin/conky/conky-1.10.6-r2.ebuild deleted file mode 100644 index 12ba1da0f256..000000000000 --- a/app-admin/conky/conky-1.10.6-r2.ebuild +++ /dev/null @@ -1,190 +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 ) - -PATCHES=( "${FILESDIR}"/${P}-new_graph-oor.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=ON - -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.6-r4.ebuild b/app-admin/conky/conky-1.10.6-r4.ebuild new file mode 100644 index 000000000000..0f6c02c40c02 --- /dev/null +++ b/app-admin/conky/conky-1.10.6-r4.ebuild @@ -0,0 +1,195 @@ +# 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 ) + +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=ON + -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.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch new file mode 100644 index 000000000000..16adbd8a6908 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch @@ -0,0 +1,23 @@ +From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001 +From: Daniel Pielmeier +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 new file mode 100644 index 000000000000..70b0c52d2a14 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..6784129d39c4 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-gcc-7.patch @@ -0,0 +1,11 @@ +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 + #include + #include ++#include + + #include + -- cgit v1.2.3