gentoo resync : 21.12.2017

5 files changed, 158 insertions, 2 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 377b94512e25..184379760195 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 49645ef72e66..8c5ce351240d 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -6,5 +6,5 @@ AUX quasselcore.init-r1 490 BLAKE2B 66ac809f427009bf9841d23a12d10f87563f970919a6
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2 SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
 EBUILD quassel-0.12.4.ebuild 4724 BLAKE2B 2b5be22d3e552e9a94925c4e67cf50be43003fb5bcccfa988e4b0ea5dafa3374d3702222ceb467dece1ae87599c7886c210556739be0067351e3acbcdafa69cc SHA512 1612344383ea25f8cdb45464d87cfb594f1685adcf26e48582772e1e2a8464ed0194ad37ff00368483df47d37377f4c01100c32533f8c6590e2f924452d00a96
-EBUILD quassel-9999.ebuild 4680 BLAKE2B 65d7071a43218d38d24cade3ea698de0b889f4d8d06e946c3dfcac3a520f8f8f8551e301f97e8dd1a73ddb528670498686898f6eb81bb7667fa96f789f97baff SHA512 0cd29bee4dd56a7131a4f7c1ab30017c8aac833f635fce9c720516c98011ab425de3fb24a9e43b5af46523842023cce111333e1518bf43d699a4df249920e603
+EBUILD quassel-9999.ebuild 4776 BLAKE2B d746973a5f52ef9a8575af1531c89a455ef9fa1453637f7ea13916369f6464422fdc9105ed32948ee362af8bc6d252f797189332afae3a7da70b2e08b6472a71 SHA512 cef831488a2332453455821593867efcfe341464a8a971408815c1af7c374f01bd31eb52a9e9baf6a3ce0215b51962f0e0ae4dcaa1a598ccaaeb73566ba8e773
 MISC metadata.xml 1942 BLAKE2B 1a23788288146f7149de03e99463403ae7d365df1fd421fc85af9c3bee4ebc5a2575c94958b570f32bb8fb056461a879cf4e80d65063ef0f2ba124d2305f4f10 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index dc4527b4df87..bf4fa999424a 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -15,11 +15,12 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
+IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
 	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
@@ -73,6 +74,7 @@ REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
 	kde? ( || ( X monolithic ) )
+	ldap? ( || ( server monolithic ) )
 	monolithic? ( || ( breeze oxygen ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
@@ -98,6 +100,7 @@ src_configure() {
 		-DWANT_MONO=$(usex monolithic)
 		-DWANT_QTCLIENT=$(usex X)
 		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
 		-DWITH_WEBKIT=OFF
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWITH_BREEZE=OFF
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 1e7fc767ab57..0f54e5aa9234 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,9 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
 DIST weechat-1.9.1.tar.xz 1877428 BLAKE2B e7595735547699cfb20f653bbe515555b5d7e772e1bc1aecb4e95f1f4fd402a315698790e961305daf7d0bd6c5f9f7889c00efdf115f7182287965428b79d469 SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa
+DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
 DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
 EBUILD weechat-1.9.1.ebuild 3917 BLAKE2B d1c8ab83d7ef18b1dd6458b240926dfa1499d0ee495c3fe90303490a69cc74755250bf4f4493e8a621eb892876c03b1ba15843879377b1de9851993046cc8594 SHA512 279b30076a4b16256f3c0fd96b1b3a1a61b0c6a50e5a0ca41aed001ff76142d6ead95e60a2cb16548e38d7959aab3ec7b5a8b70739baa0f7f20c8f3c66305a47
+EBUILD weechat-2.0.1.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
 EBUILD weechat-2.0.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
 EBUILD weechat-9999.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
 MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
new file mode 100644
index 000000000000..59575ed9f9d6
--- /dev/null
+++ b/net-irc/weechat/weechat-2.0.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 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 ${LANGS// / linguas_} ${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 dev-lang/ruby:2.2 ) )
+	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 ! use 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 ! use 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
+}