commit: 943925b6b1dc408400b8a0141c36b081482c6514
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 21:11:54 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 21:14:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943925b6
net-irc/weechat: version bump to 2.0
net-irc/weechat/Manifest | 1 +
net-irc/weechat/metadata.xml | 21 +++++++++++----------
.../{weechat-9999.ebuild => weechat-2.0.ebuild} | 18 +++++++++++++++---
net-irc/weechat/weechat-9999.ebuild | 18 +++++++++++++++---
4 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index aacb2cf577f..fae4f9b0000 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1 +1,2 @@
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
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index e04464bc80b..39474809b46 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -5,16 +5,17 @@
<email>[email protected]</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-9999.ebuild
b/net-irc/weechat/weechat-2.0.ebuild
similarity index 86%
copy from net-irc/weechat/weechat-9999.ebuild
copy to net-irc/weechat/weechat-2.0.ebuild
index 674f4cb5e57..59575ed9f9d 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-2.0.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)
diff --git a/net-irc/weechat/weechat-9999.ebuild
b/net-irc/weechat/weechat-9999.ebuild
index 674f4cb5e57..59575ed9f9d 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)
