diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-04 12:06:33 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-04 12:06:33 +0000 |
commit | a833e3f4a431b8eea751b7420e127787f9c92117 (patch) | |
tree | b941d23e9e3d5f070b01feb15ef927839af7456a /net-irc/weechat | |
parent | 4cd2370bed609c118b6edfde5d3f116e5c35b897 (diff) |
gentoo resync : 04.12.2017
Diffstat (limited to 'net-irc/weechat')
-rw-r--r-- | net-irc/weechat/Manifest | 6 | ||||
-rw-r--r-- | net-irc/weechat/metadata.xml | 21 | ||||
-rw-r--r-- | net-irc/weechat/weechat-2.0.ebuild | 151 | ||||
-rw-r--r-- | net-irc/weechat/weechat-9999.ebuild | 18 |
4 files changed, 181 insertions, 15 deletions
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index 6c0327c50046..ab79b259d9aa 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,5 +1,7 @@ AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790 DIST weechat-1.9.1.tar.xz 1877428 SHA256 c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa WHIRLPOOL 01513b276a77cf6849c6dd96945ecc069e00094be6d00d83f8884943bb7dc29b66938b6a3c5d42ed338e31633c397e6ce0fd875d5365e6a2748ecb72c490fa79 +DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951 EBUILD weechat-1.9.1.ebuild 3917 BLAKE2B d1c8ab83d7ef18b1dd6458b240926dfa1499d0ee495c3fe90303490a69cc74755250bf4f4493e8a621eb892876c03b1ba15843879377b1de9851993046cc8594 SHA512 279b30076a4b16256f3c0fd96b1b3a1a61b0c6a50e5a0ca41aed001ff76142d6ead95e60a2cb16548e38d7959aab3ec7b5a8b70739baa0f7f20c8f3c66305a47 -EBUILD weechat-9999.ebuild 3630 BLAKE2B 25049de2e1d7955b53e544216dda502e70e95fc39d1ed355055146e4104b148b45996f8ab640c1b0ce782f9e578a713433951b64b7e0e0603a98b5b201895d4a SHA512 53cdd729444cf0273904093e931d45ba9d91181c576e06a2017998279136931041b246317d570a0cbc5d50d35082ee4aa592b15c561338372b228717576c800c -MISC metadata.xml 863 BLAKE2B 2f3e69da4310adecbced76f256911604a77f0330c00d1097d6329a688839c1238af0c82e9af9c2734871d82d5916f0474d118f0b07bd6fae2c09dcff5566b8a4 SHA512 6cf4ee3adf9c431508b28da64aeac1679eb30a16ce20cae401b84696b2d39715f2daaf7f6e9df7d505f32e9231cdf6243b8afd5c6e834603fbb36c482c05f603 +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/metadata.xml b/net-irc/weechat/metadata.xml index e04464bc80b1..39474809b461 100644 --- a/net-irc/weechat/metadata.xml +++ b/net-irc/weechat/metadata.xml @@ -5,16 +5,17 @@ <email>radhermit@gentoo.org</email> </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> - <flag name="logger">Enable support for logging.</flag> + <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="fset">Enable fast set plugin</flag> + <flag name="fifo">Enable FIFO support (sh pipes)</flag> + <flag name="logger">Enable support for logging</flag> <flag name="relay">Enable relay plugin (experimental)</flag> - <flag name="scripts">Build infrastructure for scripting.</flag> - <flag name="trigger">Enable trigger plugin.</flag> - <flag name="xfer">Enable xfer plugin support.</flag> - <flag name="irc">Enable IRC protocol support.</flag> + <flag name="scripts">Build infrastructure for scripting</flag> + <flag name="trigger">Enable trigger plugin</flag> + <flag name="xfer">Enable xfer plugin support</flag> + <flag name="irc">Enable IRC protocol support</flag> </use> </pkgmetadata> diff --git a/net-irc/weechat/weechat-2.0.ebuild b/net-irc/weechat/weechat-2.0.ebuild new file mode 100644 index 000000000000..59575ed9f9d6 --- /dev/null +++ b/net-irc/weechat/weechat-2.0.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 +} diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index 674f4cb5e57f..59575ed9f9d6 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" + KEYWORDS="~amd64 ~x86 ~x64-macos" fi DESCRIPTION="Portable and multi-interface IRC client" @@ -21,9 +21,9 @@ LICENSE="GPL-3" SLOT="0" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer" +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 +python ruby tcl" +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} )" @@ -38,6 +38,7 @@ RDEPEND=" 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 ) @@ -95,6 +96,15 @@ src_prepare() { # 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() { @@ -108,6 +118,7 @@ src_configure() { -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) @@ -115,6 +126,7 @@ src_configure() { -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) |