gentoo christmass resync : 25.12.2020

4 files changed, 191 insertions, 3 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 407ac0c0a846..b498e6cc78a8 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,8 @@
+AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
 DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 EBUILD weechat-2.9.ebuild 3868 BLAKE2B 7cb10514f4000d737a0748dd1c885deb877813fe4e7953c1547aa1b973e9eeb97c3ceacf0c4e1a5e5de94a762647aec4779badcab7b0ef7d83f30ef46d898cec SHA512 e5b27cf8d34ba432cc5d55e31cea0beb96076964e991efdbd842f20c82fc1667c04d107735e8295865351aaf7e453e3d08492701148736fb64fb9b4c39f19678
+EBUILD weechat-3.0-r100.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
-EBUILD weechat-9999.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
+EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..6ed16efbd064
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
@@ -0,0 +1,9 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -35,5 +35,5 @@
+ 
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
++  pkg_search_module(LUA lua)
+ endif()
diff --git a/net-irc/weechat/weechat-3.0-r100.ebuild b/net-irc/weechat/weechat-3.0-r100.ebuild
new file mode 100644
index 000000000000..9612d0567f73
--- /dev/null
+++ b/net-irc/weechat/weechat-3.0-r100.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single python-single-r1 xdg-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 ~arm ~arm64 ~ppc ~ppc64 ~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 +fifo +fset +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 it ja pl ru"
+IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index b33c433ae6d2..9612d0567f73 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit cmake python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -29,6 +30,7 @@ LANGS=" cs de es fr it ja pl ru"
 IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( nls )
 "
@@ -41,7 +43,7 @@ RDEPEND="
 	net-misc/curl[ssl]
 	charset? ( virtual/libiconv )
 	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0 )
+	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
@@ -62,11 +64,16 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
 
 RESTRICT="!test? ( test )"
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }