gentoo resync : 22.10.2018

5 files changed, 20 insertions, 41 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 3979c06ce714..19c7b1aac98b 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,11 +1,10 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
-AUX weechat-2.1-tinfo.patch 910 BLAKE2B 706949f07bac5e191e045bc6dfbb6e6b1dc4ec2e7347ff7c3f8b3f8af67e5d50b27a31368bf3d2a143eb7b0ec0dc0902fd787d803da8b604793d2b1b912e1dee SHA512 a1df83dc71c75047a8d898401551adc727df581b6e2a0fca366b67b380e688f95a375cdd9246cc4fff7a1cce22bf50e2bc3022a843e8994f8ee8660c7be77a15
 AUX weechat-2.2-tinfo.patch 910 BLAKE2B 37a02f7c56d6bdc42c01a5a9b622c79501d4ffb73152f7eb4c14182bf507319d9667fc2b64ebe33992fe6a1a88712ee37844278c802712412048ea6d6ba9d4fe SHA512 46ea2b0b6f03c3656d062a68e2d80edd2566dd8edc7ba6f3df0f29ae3222b8c1702378ff7d3b8cbcab917ec4310b7f2699e3f0f113671af778ad1e1f681c4c52
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
-DIST weechat-2.1.tar.xz 1990748 BLAKE2B 5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661 SHA512 4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
 DIST weechat-2.2.tar.xz 2007944 BLAKE2B 2892e50fcccf64fa34e4c7bd476323ad7a98d6b5d483254ffbed659a5997d3077a7347a1a9c006f50d52daf7808fe61cf5b396416d62da7f9260f717191b2a86 SHA512 bb5103c266f6e6850250a5e0602ff26be06289ea1e13511b111f975eb492a0bbe508b2a6088b15e5bfd5278341e9dd5ee0facfb08d23ff7335c5c18bc21e4b02
+DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
 EBUILD weechat-2.0.1.ebuild 3990 BLAKE2B da9076276439f03b616f711cd2af8189d0d131d1eefd2411e21a4aa917ce588cd3eb55a4e3fbf1346e6979f860ce013752450c39e8b342a7b1bba70161f13370 SHA512 4ec868198c7578d54247ae7e47cd2b9d12d50a99b2479b84b011298245107d5a4d8a3b0a38dc0973ed02d508619efc502db3af28538fd25f79ff0d2f0c12bd74
-EBUILD weechat-2.1.ebuild 4010 BLAKE2B b6c5ef8285055540e65fbd5e4c2e883c0b3aa72b0859a577a82af5dbbf6942a0b1271a14ee4e3602c3a7d1b07647156d4084f442ab86e8d3ef3d7e81bb0ae513 SHA512 eff92a3a9f57e8ab8e573b9709ba5257203cf4762355ff7d1927bcacbeceac88f0747e42cfcb870c8b09213b7bebba3f0119e564f3906a443cc9c8b42358bd8b
-EBUILD weechat-2.2-r1.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
-EBUILD weechat-9999.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
+EBUILD weechat-2.2-r1.ebuild 4109 BLAKE2B 9cc7833f623b3fa71b09713b9fc7b5d4fba1a64c9766685b7ef3047954f308c3772e61b410f02ced660ee0d2004aaffc2adba7d529366fbace1384224b3b126d SHA512 4ecdd4951b0d7aac80e2b62489e3b3ecf465b64f416e9bae5257555d39d350caf70392325047ccd61389d1f39122efa068350f2caf525cc4cd1df90b59c6d7e9
+EBUILD weechat-2.3.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
+EBUILD weechat-9999.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
 MISC metadata.xml 1015 BLAKE2B 84a29d39ade6afecbd613413d0dbd13decd292efe54882122b46c48e8ba33ebcd63ccf0ba0301716618054ce7dbcc30dc0649f8202612d2ccbbc3ef04e4cc135 SHA512 d63b0302cf3a026ab007a9d4bc9d2aec5e11587cdf736be871fc63431725cdc471cdc23ea58cdd30b74cb9d522e478c6e88dfa17ce4ecc5cbc1b0e2dcf3eb5fc
diff --git a/net-irc/weechat/files/weechat-2.1-tinfo.patch b/net-irc/weechat/files/weechat-2.1-tinfo.patch
deleted file mode 100644
index e44e06e61f99..000000000000
--- a/net-irc/weechat/files/weechat-2.1-tinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use pkgconfig to find ncurses libs in order to support separate libtinfo.
-
---- weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-+++ weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-@@ -29,7 +29,13 @@
-   ../gui-curses-window.c
- )
- 
--find_package(Ncurses)
-+find_package(PkgConfig)
-+pkg_search_module(NCURSES ncursesw ncurses)
-+
-+if(NOT NCURSES_FOUND)
-+  find_package(Ncurses)
-+endif(NOT NCURSES_FOUND)
-+
- if(NCURSES_FOUND)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
-@@ -54,7 +60,7 @@
- 
- add_dependencies(${EXECUTABLE} weechat_gui_curses_normal)
- 
--list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
-+list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES})
- 
- # Due to circular references, we must link two times with libweechat_core.a and libweechat_gui_common.a
- target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses_normal ${EXTRA_LIBS} ${STATIC_LIBS})
diff --git a/net-irc/weechat/weechat-2.2-r1.ebuild b/net-irc/weechat/weechat-2.2-r1.ebuild
index ee7ec6e3f6b6..53ed8873347e 100644
--- a/net-irc/weechat/weechat-2.2-r1.ebuild
+++ b/net-irc/weechat/weechat-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-2.1.ebuild b/net-irc/weechat/weechat-2.3.ebuild
index b975945b6839..f7ef20c9a4be 100644
--- a/net-irc/weechat/weechat-2.1.ebuild
+++ b/net-irc/weechat/weechat-2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -59,7 +59,7 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -149,3 +149,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ee7ec6e3f6b6..f7ef20c9a4be 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils gnome2-utils python-single-r1