From 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:49:31 +0100 Subject: Revert "gentoo resync : 13.09.2019" This reverts commit a1392efe64137262023d92492396ca9156d22396. --- net-irc/weechat/Manifest | 4 +- net-irc/weechat/weechat-2.6.ebuild | 147 ------------------------------------ net-irc/weechat/weechat-9999.ebuild | 8 ++ 3 files changed, 9 insertions(+), 150 deletions(-) delete mode 100644 net-irc/weechat/weechat-2.6.ebuild (limited to 'net-irc/weechat') diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest index 4b1834bed273..a9f6df87e3ce 100644 --- a/net-irc/weechat/Manifest +++ b/net-irc/weechat/Manifest @@ -1,6 +1,4 @@ DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e -DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df -EBUILD weechat-2.6.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a -EBUILD weechat-9999.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a +EBUILD weechat-9999.ebuild 3954 BLAKE2B 71baeb44920f8f18568c85833777c3e929a8a22926cb04cdcc247bd507fc14c039e453e364c7f7305db04bd68010d391032ff778cdf93cb676051c257b5b3e85 SHA512 c5bdab50fd43f20e21a2a6b78afba834604248f00b7439c4457ac0d21e71f633e2e135610900373fa9775eb7adb98c0dce50c52de1578be073bd11552898b83e MISC metadata.xml 1069 BLAKE2B 4a71fbd264555e8439f6797370163ae05c3111e589d513ade407ebb5eb3b2c302d2afc46cd37d3707c85fc981ed26bfd23762b5f6f635b9f85b70d821919e2ed SHA512 dfb08a4660736e409b31088217bca60adc46c88b7e0b6e4a1b905de69262ae0cef172638f30b502e01fcb772a6d3cbb471805959ba8c6d78cb598b18640fe20f diff --git a/net-irc/weechat/weechat-2.6.ebuild b/net-irc/weechat/weechat-2.6.ebuild deleted file mode 100644 index 024f0d1b0d09..000000000000 --- a/net-irc/weechat/weechat-2.6.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) - -inherit cmake-utils python-single-r1 xdg-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 ~arm ~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 +fifo +fset +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 it ja pl ru" -IUSE="doc man nls +ssl test ${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.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) - ssl? ( net-libs/gnutls ) - spell? ( app-text/aspell ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) -" -DEPEND="${RDEPEND} - test? ( dev-util/cpputest ) -" - -BDEPEND=" - doc? ( >=dev-ruby/asciidoctor-1.5.4 ) - man? ( >=dev-ruby/asciidoctor-1.5.4 ) - nls? ( >=sys-devel/gettext-0.15 ) -" - -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" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # install only required translations - local i - for i in ${LANGS} ; do - if ! has ${i} ${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 ! has ${i} ${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=( - -DLIBDIR=/usr/$(get_libdir) - -DENABLE_JAVASCRIPT=OFF - -DENABLE_LARGEFILE=ON - -DENABLE_NCURSES=ON - -DENABLE_ALIAS=$(usex alias) - -DENABLE_BUFLIST=$(usex buflist) - -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) - -DENABLE_EXEC=$(usex exec) - -DENABLE_FIFO=$(usex fifo) - -DENABLE_FSET=$(usex fset) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_GUILE=$(usex guile) - -DENABLE_IRC=$(usex irc) - -DENABLE_LOGGER=$(usex logger) - -DENABLE_LUA=$(usex lua) - -DENABLE_MAN=$(usex man) - -DENABLE_NLS=$(usex nls) - -DENABLE_PERL=$(usex perl) - -DENABLE_PHP=$(usex php) - -DENABLE_PYTHON=$(usex python) - -DENABLE_RELAY=$(usex relay) - -DENABLE_RUBY=$(usex ruby) - -DENABLE_SCRIPT=$(usex scripts) - -DENABLE_SCRIPTS=$(usex scripts) - -DENABLE_SPELL=$(usex spell) - -DENABLE_TCL=$(usex tcl) - -DENABLE_TESTS=$(usex test) - -DENABLE_TRIGGER=$(usex trigger) - -DENABLE_XFER=$(usex xfer) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index 024f0d1b0d09..9ff15b1d86c5 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -135,6 +135,14 @@ src_configure() { -DENABLE_XFER=$(usex xfer) ) + if use python; then + python_export PYTHON_LIBPATH + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_LIBRARY="${PYTHON_LIBPATH}" + ) + fi + cmake-utils_src_configure } -- cgit v1.2.3