net-irc/weechat: version bump to 1.9

Also, sort options and add buflist USE flag.

4 files changed, 154 insertions, 12 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index b67e0951d72d..4d3fadaf8b27 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -2,3 +2,4 @@ DIST weechat-1.4.tar.bz2 2464362 SHA256 e06d9949ccececdd9692c95c41304c2f7fe9ec47
 DIST weechat-1.7.1.tar.xz 1836844 SHA256 3f7e04793ce21796369199573d84a04ea23313942af880d2c9600bdc73571c30 SHA512 4aba380704ab5f611d923a461aa17cac076a18f92a6bb8129daf5f212536672267cadcc679befbcadb48d5044e4bf973f93982d9d3c500cd9d9e12dba4dbfbba WHIRLPOOL 6c2e2d687be4600e8d875e4c305bf2a432948d24d7a0095555bcb01fa6b4f8ac8d7180f67da010c2baf46d9bbd97e33fbbb49f63a25586a3e1a7cbb7daee8897
 DIST weechat-1.7.tar.xz 1837004 SHA256 599348337a4bff179bf50888dad135751fa401538ebaadc59831d2223be52db3 SHA512 1de4af1e6b8189a96d830480f062bb1a92626f3ccf4ef0d73d081d72472e9a0840a4776403846032582e0387b6df8b8d7dbbce2ca309263554facd3bc6a5b050 WHIRLPOOL 9f62824e6dccf4e4d95422dd2ca6e2e135f4556fa697c11ad6004047375505612082ba4299ba1b4668a32cbffbad67f9d129c33f343287222dad34263ff32505
 DIST weechat-1.8.tar.xz 1871964 SHA256 b65fc54e965399e31a30448b5f6c8067fcd6ad369e9908ff7c1fd45669c5e017 SHA512 34d5aa05e7a9df459c7ade7f654f56561838d59c2d553432697213a5d90614f55204364c4711e28aadd3dbae2cea733dfc6cafeffa9fca87a33eef0e2647a18f WHIRLPOOL 158d9628cc2d3a7792be64a4c5fb97bd4d35f5dd6fb8d96a901a8958468bcaf1de394812862c601e0abaa00ea589f8572618834847f48efcb43146f572c9ca7e
+DIST weechat-1.9.tar.xz 1877604 SHA256 cc85eb299a5a979bcfda390c20bcb9dd8fd7b25a32fb01e5f128e13c51fa7dff SHA512 1f71173207b948db8d782816d0b4a71cc2447cbc16affdf4d48be850083878aad0772455d89820a913b8339b3aac8a300b024b32100301b1bc1a192319985bdc WHIRLPOOL b64ff40040b386e0490bc3a4d0a865bc6cf2221da8ace376252733b40f013790afcc6ed95f0de9e47fdee9febe2b43d68335986eb8fa7f774b24010a0102dd9b
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 683bf79c0677..e04464bc80b1 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="alias">Enable plugin for alias control.</flag>
+		<flag name="buflist">Enable buflist plugin.</flag>
 		<flag name="charset">Enable encoding conversions.</flag>
 		<flag name="exec">Enable exec plugin.</flag>
 		<flag name="fifo">Enable FIFO support (sh pipes).</flag>
diff --git a/net-irc/weechat/weechat-1.9.ebuild b/net-irc/weechat/weechat-1.9.ebuild
new file mode 100644
index 000000000000..393e6d6a61a6
--- /dev/null
+++ b/net-irc/weechat/weechat-1.9.ebuild
@@ -0,0 +1,139 @@
+# 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"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="http://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +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 +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:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	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() {
+	default
+
+	# 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
+}
+
+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_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_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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 6a2b364909dc..393e6d6a61a6 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 NETWORKS="+irc"
-PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+PLUGINS="+alias +buflist +charset +exec +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 +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
@@ -100,30 +100,31 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
 		-DENABLE_LARGEFILE=ON
-		-DENABLE_JAVASCRIPT=OFF
 		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_DOC=$(usex doc)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
 		-DENABLE_CHARSET=$(usex charset)
 		-DENABLE_EXEC=$(usex exec)
 		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_GUILE=$(usex guile)
 		-DENABLE_IRC=$(usex irc)
 		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_NLS=$(usex nls)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
 		-DENABLE_PERL=$(usex perl)
 		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
 		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LUA=$(usex lua)
 		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
+		-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