| 1 |
commit: cbc4fa1728bf3098af59fb5f83208e3888362357 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 2 05:06:01 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 2 05:06:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc4fa17 |
| 7 |
|
| 8 |
net-irc/weechat: update live ebuild |
| 9 |
|
| 10 |
migrate to cmake.eclass |
| 11 |
update deps |
| 12 |
make gnutls non-optional, remove ssl flag completely |
| 13 |
https://github.com/weechat/weechat/commit/e130ee7358564cfd5572ca0cf1ac6871425548ed |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 17 |
|
| 18 |
net-irc/weechat/weechat-9999.ebuild | 15 +++++++-------- |
| 19 |
1 file changed, 7 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild |
| 22 |
index 0871e154ad2..a63694304e8 100644 |
| 23 |
--- a/net-irc/weechat/weechat-9999.ebuild |
| 24 |
+++ b/net-irc/weechat/weechat-9999.ebuild |
| 25 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 26 |
|
| 27 |
PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
| 28 |
|
| 29 |
-inherit cmake-utils python-single-r1 xdg-utils |
| 30 |
+inherit cmake python-single-r1 xdg-utils |
| 31 |
|
| 32 |
if [[ ${PV} == "9999" ]] ; then |
| 33 |
inherit git-r3 |
| 34 |
@@ -26,14 +26,15 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe |
| 35 |
# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support |
| 36 |
SCRIPT_LANGS="guile lua +perl php +python ruby tcl" |
| 37 |
LANGS=" cs de es fr it ja pl ru" |
| 38 |
-IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" |
| 39 |
+IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" |
| 40 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 41 |
|
| 42 |
RDEPEND=" |
| 43 |
dev-libs/libgcrypt:0= |
| 44 |
- net-misc/curl[ssl] |
| 45 |
+ net-libs/gnutls:= |
| 46 |
sys-libs/ncurses:0= |
| 47 |
- sys-libs/zlib |
| 48 |
+ sys-libs/zlib:= |
| 49 |
+ net-misc/curl[ssl] |
| 50 |
charset? ( virtual/libiconv ) |
| 51 |
guile? ( >=dev-scheme/guile-2.0 ) |
| 52 |
lua? ( dev-lang/lua:0 ) |
| 53 |
@@ -42,7 +43,6 @@ RDEPEND=" |
| 54 |
php? ( >=dev-lang/php-7.0:*[embed] ) |
| 55 |
python? ( ${PYTHON_DEPS} ) |
| 56 |
ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) |
| 57 |
- ssl? ( net-libs/gnutls ) |
| 58 |
spell? ( app-text/aspell ) |
| 59 |
tcl? ( >=dev-lang/tcl-8.4.15:0= ) |
| 60 |
" |
| 61 |
@@ -67,7 +67,7 @@ pkg_setup() { |
| 62 |
} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- cmake-utils_src_prepare |
| 66 |
+ cmake_src_prepare |
| 67 |
|
| 68 |
# install only required translations |
| 69 |
local i |
| 70 |
@@ -115,7 +115,6 @@ src_configure() { |
| 71 |
-DENABLE_EXEC=$(usex exec) |
| 72 |
-DENABLE_FIFO=$(usex fifo) |
| 73 |
-DENABLE_FSET=$(usex fset) |
| 74 |
- -DENABLE_GNUTLS=$(usex ssl) |
| 75 |
-DENABLE_GUILE=$(usex guile) |
| 76 |
-DENABLE_IRC=$(usex irc) |
| 77 |
-DENABLE_LOGGER=$(usex logger) |
| 78 |
@@ -140,7 +139,7 @@ src_configure() { |
| 79 |
python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON ) |
| 80 |
fi |
| 81 |
|
| 82 |
- cmake-utils_src_configure |
| 83 |
+ cmake_src_configure |
| 84 |
} |
| 85 |
|
| 86 |
pkg_postinst() { |
Archives