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 ++ app-admin/entr/Manifest | 5 +- app-admin/entr/entr-3.7.ebuild | 23 --- app-admin/entr/entr-3.8.ebuild | 23 --- app-admin/entr/entr-3.9-r1.ebuild | 35 ++++ app-admin/logrotate/Manifest | 2 +- app-admin/logrotate/logrotate-3.13.0.ebuild | 2 +- 12 files changed, 283 insertions(+), 243 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 delete mode 100644 app-admin/entr/entr-3.7.ebuild delete mode 100644 app-admin/entr/entr-3.8.ebuild create mode 100644 app-admin/entr/entr-3.9-r1.ebuild (limited to 'app-admin') 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 + diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest index af535daf14aa..34c0d83c361f 100644 --- a/app-admin/entr/Manifest +++ b/app-admin/entr/Manifest @@ -1,8 +1,5 @@ -DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8 -DIST entr-3.8.tar.gz 24251 SHA256 ebb1e793d948db76481f081011bf1dad8b4449e067f4e5fe68176191f84b26bd SHA512 8530a40eefc78571f3a2ab09f63d25d880167ec2d76e0c32fb25dce40e22b3f9f3b5f27874c1b95480206628e314298f001a4c0b487485ac88f2996002b41a2a WHIRLPOOL 27ccd2d4be2758c765ccf834df45b53db8ca7a0de1c880dee5183f37e6838b1a2764801b33b4ecbb4ec890b97b90c720aba0dbc66d37c4dc943ffb61b21af320 DIST entr-3.9.tar.gz 24554 SHA256 02d78f18ae530e64bfbb9d8e0250962f85946e10850dd065899d03af15f26876 SHA512 e0d58b7f4dc20ba9cfb12a165172817dfd647e859e2133b01b59427f9bb9612ee5b8e8f6563f31cc15b57251e60b2cb639c764f65d6daeb4456ecbccc7b39c12 WHIRLPOOL 46ca452280537e08b04616b6ce31dde463788328fb6e283d6a55d486dda97ec2dc4b0a23f67e925be66dd76bebb6e5a1aad19c8d8973e3c2faa19f5397082b19 -EBUILD entr-3.7.ebuild 494 SHA256 eedfa642f37a6da546d59443fd28b2c0210284de4c93a925775654e78f68f4ac SHA512 55c8fd3f5ac2f7ae70e361305b13c47da886355b226bb44165414bc70ab704825bfcf1c9eb3753f24e132d0105c6200c4b609c5e7bf69fc9aa35ffdf6083daf0 WHIRLPOOL 9ac9d2044d013033e83c69d2eaf2b27d8644951caeb18d5086678130f002da179f31d36803d63697c6763721f568e41528554b0f1f1574de37fc51c06555af76 -EBUILD entr-3.8.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4 +EBUILD entr-3.9-r1.ebuild 634 SHA256 4e012b253ce54209add4c3fc220a8becbf5bc805566e87391ec683d618220083 SHA512 0ab51ed5730ceb722f333c221f533a95732adb820cd3571130fa3d0b67b8ca663696a05900fc2859c670a0ddf7319a7fa26b59afbd117fdb18425fb837752910 WHIRLPOOL 43eacd586ddfe06bc5c0b10ac8bfb658d8ef2be7ea7a0db6ae3281c7fe781bf3af56160b2a6e41f97be0b5aa3f156160aebbb5624db13ebb70862efbb5c71098 EBUILD entr-3.9.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4 MISC ChangeLog 2314 SHA256 9a8785a05834cf43f24194acf41d833d54944b38c8fda098b58b9a38a0709a5b SHA512 4f2c635609b7dc022a58bce143f7851b4b2692eb3ac1c4c1aa2be9835fb798c4c1dcecd63dafcddfba5a5ffc24e5ca74c05c2d2396cd56fcba79427911059dc3 WHIRLPOOL 82c4b02c27f5f6d4d070bc2145a8b4224065507fb4f44bd21b2b3bc208c8a9dbdd6ba786b12e772cc813ff0bac6cf5e0454f36287b2ffbffbfc01436c1c63827 MISC metadata.xml 377 SHA256 3684c43060a9b340ca7710c1697b9c3cd8b6218f6bda4ebadd23cc6661dc4748 SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6 WHIRLPOOL c704ca2f5573778786616e592f36f8cd6ed3003f981ecdb5287bfbd882fff0d93e423f38999fb24e7f0e5e813e922e7f64c0de7c364974637141514062af6b61 diff --git a/app-admin/entr/entr-3.7.ebuild b/app-admin/entr/entr-3.7.ebuild deleted file mode 100644 index 448abf84b1fb..000000000000 --- a/app-admin/entr/entr-3.7.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Run arbitrary commands when files change" -HOMEPAGE="http://entrproject.org" -SRC_URI="http://entrproject.org/code/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="test" - -src_unpack() { - unpack "${P}.tar.gz" - mv eradman-* "${P}" || die -} - -src_configure() { - sh configure || die - sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die -} diff --git a/app-admin/entr/entr-3.8.ebuild b/app-admin/entr/entr-3.8.ebuild deleted file mode 100644 index 3acbed282720..000000000000 --- a/app-admin/entr/entr-3.8.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Run arbitrary commands when files change" -HOMEPAGE="http://entrproject.org" -SRC_URI="http://entrproject.org/code/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="test" - -src_unpack() { - unpack "${P}.tar.gz" - mv eradman-* "${P}" || die -} - -src_configure() { - sh configure || die - sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die -} diff --git a/app-admin/entr/entr-3.9-r1.ebuild b/app-admin/entr/entr-3.9-r1.ebuild new file mode 100644 index 000000000000..a0df05becf54 --- /dev/null +++ b/app-admin/entr/entr-3.9-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Run arbitrary commands when files change" +HOMEPAGE="http://entrproject.org" +SRC_URI="http://entrproject.org/code/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="test" + +src_unpack() { + unpack "${P}.tar.gz" + mv eradman-* "${P}" || die +} + +src_configure() { + sh configure || die + sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die +} + +src_compile() { + export CC=$(tc-getCC) + default +} + +src_test() { + export CC=$(tc-getCC) + default +} diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index bb990dcd06f8..e615abacff67 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -14,7 +14,7 @@ DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17 EBUILD logrotate-3.12.3-r1.ebuild 2485 SHA256 2863ca598d152971453f9d3b47c64c9859e7427afab3602f9a3a7dcb40238df0 SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4 WHIRLPOOL 3c4e9ccf4da2ae3e2d468a178cd9370be0c570edfc3473d8ff00c09973f17afe46f447826f5f51de10dd67a8820ad996be97a8d8bbcaaaea51762be87b4a62c6 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754 -EBUILD logrotate-3.13.0.ebuild 2545 SHA256 6dcd37ca8ab6e243b333650d2c5afc0b391a2bcc0587502d50230c273047f592 SHA512 a8e071ee12e58331ab01fa85369213ae8ca2c4a64fdc0f7ceaddc35ef56a33acc2090929c8c0133226872b644141df9070b6c94554e5481df9a096185635b827 WHIRLPOOL 5ccaf842f17e818b2b9a89e0d7c7925cc024b03fee04452e53007b91da90bdd1d9df453aac1951aa298e8da70044da1e0c502c789cc720fef77d7c7743d5961e +EBUILD logrotate-3.13.0.ebuild 2544 SHA256 6882342b7ef1754651a97c670ea6581e799563f8e886187b148c37e1b71eb043 SHA512 75267fb36c030ecfa59772a28d5353787a9c9f624ee49970b4378a51c044506d55fb8995bbcccd2e2e102d6a27525fe0a101881aef912ad28d9b2f3debca31d7 WHIRLPOOL e9d16fcd2ca1859c5a8323a3256a2be02d88a10631a4cdf6fa4f3973538113ff0385e9653faebb3b33fa1bf4e6e9adfd9dd30cf5a309c6b3012097d95671452b EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687 diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild index 352c38fa9e38..bd3fbe4b720c 100644 --- a/app-admin/logrotate/logrotate-3.13.0.ebuild +++ b/app-admin/logrotate/logrotate-3.13.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="acl +cron selinux" CDEPEND=" -- cgit v1.2.3