diff options
Diffstat (limited to 'net-p2p/eiskaltdcpp')
| -rw-r--r-- | net-p2p/eiskaltdcpp/Manifest | 2 | ||||
| -rw-r--r-- | net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 36 |
2 files changed, 22 insertions, 16 deletions
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest index e6ccc1316d97..9cb5a1e6b7c9 100644 --- a/net-p2p/eiskaltdcpp/Manifest +++ b/net-p2p/eiskaltdcpp/Manifest @@ -7,5 +7,5 @@ AUX eiskaltdcpp-2.2.10-tray-close.patch 788 BLAKE2B 61cf8368a6aea0f7b69864a317ff DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818 EBUILD eiskaltdcpp-2.2.10-r100.ebuild 3439 BLAKE2B e8c9d1897066682738c270fd215b59fd8ec2bf3c6a1ebb6cf688ece922743910abe84038f9d61b10a734063bf9eb617f88c673e093e69fe9e1aa6d03e6dbdc3a SHA512 62fe7f8ff043a5a2f05ba1b4f7d0d1242b0929e9164b1680792ca4c6cfcbf708cf4d0bf43b70d0cd64d18daa3c6aaff58d1a5ace8cd957791830affb6cadc926 EBUILD eiskaltdcpp-2.2.10.ebuild 3258 BLAKE2B fdd869a1ddd5f3e4b33ab576e6515088420c343c3fd90ab2527c0112b71dfb2b88ff8fbdbeaff32598f92096a87a407acae01b751117433e09b8c2117e166a59 SHA512 7a43cf259e3ca2dcdd0c8f6522c12f14c9ddbe091b067f230e533249e5efa390378dbbf896b31526101165b4cc38569c5eba61244a66683e83c2afa83c18935f -EBUILD eiskaltdcpp-9999.ebuild 3489 BLAKE2B 600f24fab78110d082e088b9074f681bac7366dcfaa3fe64502cd3a1fd88709353606c1d0e075eadfe46279ae00927eba7d09a88a823b6aea628377278829ae4 SHA512 1e42ac5f1ff745f48299088953bedcddeadb4cfd74a11ddb5ac52748861d97f3811c127d721b6d687cb544fc26fb423e1e0101d8e5581ebaf844f6a53e93576c +EBUILD eiskaltdcpp-9999.ebuild 3584 BLAKE2B 6bafa839dce886a803a7510e47cd45048e0553ebea0c4d293cb1feef69beb2c034964d5a99029b60cd9a42fbe1f5598ce64dea9a6e8d44b850cb74221b2331d1 SHA512 cd95718e7e399220a30dca748161a47812f50f7fc33d79d39b44e2c5fb84a24ab5bfc8338650fff69289dea1242b6df24f34a118783d2725ecd2d3c60b577963 MISC metadata.xml 996 BLAKE2B aa14839e332a549f62b99fdf693388dc03988a316a5feb8da916008b4592d7ced6cc95062727a7f9e16ee8fd294a20124586b1e7c6a1b9d860065573f03bc9d0 SHA512 c36a94f827751c9a4ad080470d52576ea7a679a709605dec744f6bd55b0c4bb7566cc4e17aa499e09087cda45f839e0aa6a9e0d29ce5ce089fa25bf07a3e7325 diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild index 8a00e9cfb49d..f4478e0ca01e 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +LUA_COMPAT=( lua5-1 ) PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN" -inherit cmake-utils gnome2-utils l10n xdg-utils +inherit cmake l10n lua-single xdg-utils [[ ${PV} = *9999* ]] && inherit git-r3 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols" @@ -22,6 +24,7 @@ REQUIRED_USE=" javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) + lua? ( ${LUA_REQUIRED_USE} ) spell? ( qt5 ) sqlite? ( qt5 ) " @@ -60,7 +63,7 @@ RDEPEND=" libnotify? ( x11-libs/libnotify ) ) idn? ( net-dns/libidn ) - lua? ( dev-lang/lua:= ) + lua? ( ${LUA_DEPS} ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtconcurrent:5 @@ -88,8 +91,10 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog.txt ) +CMAKE_REMOVE_MODULES_LIST="FindLua" + src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts' } @@ -99,9 +104,9 @@ src_configure() { -Dlinguas="$(l10n_get_locales)" -DLOCAL_MINIUPNP=OFF -DUSE_GTK=OFF + -DUSE_LIBGNOME2=OFF -DUSE_QT=OFF -DUSE_QT_QML=OFF - -DUSE_LIBGNOME2=OFF -DNO_UI_DAEMON=$(usex daemon) -DDBUS_NOTIFY=$(usex dbus) -DWITH_DHT=$(usex dht) @@ -111,8 +116,6 @@ src_configure() { -DUSE_JS=$(usex javascript) -DUSE_LIBCANBERRA=$(usex libcanberra) -DUSE_LIBNOTIFY=$(usex libnotify) - -DLUA_SCRIPT=$(usex lua) - -DWITH_LUASCRIPTS=$(usex lua) -DWITH_DEV_FILES=$(usex !minimal) -DPERL_REGEX=$(usex pcre) -DUSE_QT5=$(usex qt5) @@ -132,6 +135,13 @@ src_configure() { -DXMLRPC_DAEMON=$(usex xmlrpc) ) fi + if use lua; then + mycmakeargs+=( + -DLUA_SCRIPT=ON + -DWITH_LUASCRIPTS=ON + -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version)) + ) + fi if use qt5 || use gtk; then mycmakeargs+=( -DWITH_EMOTICONS=ON @@ -143,19 +153,15 @@ src_configure() { -DWITH_SOUNDS=OFF ) fi - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist + cmake_src_configure } pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } |