gentoo resync : 24.12.2018

6 files changed, 4 insertions, 351 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 19c7b1aac98b..01edf7768279 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,10 +1,5 @@
-AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
 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.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.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
+EBUILD weechat-2.3.ebuild 4117 BLAKE2B 0e99a1cc9c5cba0d89b3d93137cdc2e5efe28e37fb5736fed5fae2d8ea18e70f6bd21bbf82495742075cd8072f6515e57f67002be3214fa69661725d484a6f19 SHA512 4384a798838c97d57048b317ee3d874996d61b58df4da8b829d1f65829e00099fb225035942ceab7f5a9efa793daa8c09c049f3673a1b1b64e341128bfe8426d
+EBUILD weechat-9999.ebuild 4119 BLAKE2B 68f121cadcf2f6f28ab51cf06ed9d51c055d9b1f22675e7362750de94fcfe3808f9a78edf6104019e8dbb5cacf37f1fe8c0aa0f65a35da2650324093306cb184 SHA512 d4e8470e61f5582f21e852169bddc3fd1342f5e8727c9bee9f42716c3be71a3f06286a94151b2a41756acfa39e191a47eae7a80cfbd987d2a1bcae98e5764fde
 MISC metadata.xml 1015 BLAKE2B 84a29d39ade6afecbd613413d0dbd13decd292efe54882122b46c48e8ba33ebcd63ccf0ba0301716618054ce7dbcc30dc0649f8202612d2ccbbc3ef04e4cc135 SHA512 d63b0302cf3a026ab007a9d4bc9d2aec5e11587cdf736be871fc63431725cdc471cdc23ea58cdd30b74cb9d522e478c6e88dfa17ce4ecc5cbc1b0e2dcf3eb5fc
diff --git a/net-irc/weechat/files/weechat-1.2-tinfo.patch b/net-irc/weechat/files/weechat-1.2-tinfo.patch
deleted file mode 100644
index e6ae9e0f205b..000000000000
--- a/net-irc/weechat/files/weechat-1.2-tinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/gui/curses/CMakeLists.txt | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
-index 284956f..492fc77 100644
---- a/src/gui/curses/CMakeLists.txt
-+++ b/src/gui/curses/CMakeLists.txt
-@@ -35,7 +35,14 @@ main.c)
- 
- set(EXECUTABLE weechat)
- 
--find_package(Ncurses)
-+
-+find_package(PkgConfig)
-+pkg_search_module(NCURSES ncursesw ncurses)
-+
-+if(NOT NCURSES_FOUND)
-+  find_package(Ncurses)
-+endif(NCURSES_FOUND)
-+
- if(NCURSES_FOUND)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
-@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
-       add_definitions(-DHAVE_NCURSES_H)
-     endif()
-   endif()
--  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
-+  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
- endif()
- 
- if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
deleted file mode 100644
index 1d1eec8e568b..000000000000
--- a/net-irc/weechat/weechat-2.0.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	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"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-ruby/asciidoctor-1.5.4
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NCURSES=ON
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-2.2-r1.ebuild b/net-irc/weechat/weechat-2.2-r1.ebuild
deleted file mode 100644
index 53ed8873347e..000000000000
--- a/net-irc/weechat/weechat-2.2-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils gnome2-utils python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	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"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-ruby/asciidoctor-1.5.4
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NCURSES=ON
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-irc/weechat/weechat-2.3.ebuild b/net-irc/weechat/weechat-2.3.ebuild
index f7ef20c9a4be..4fbd457b8c5b 100644
--- a/net-irc/weechat/weechat-2.3.ebuild
+++ b/net-irc/weechat/weechat-2.3.ebuild
@@ -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 ~arm x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f7ef20c9a4be..8acde9443ddb 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -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 ~arm ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"