[net-im/swift] sync with latest PR changes

This commit is contained in:
Robert Förster 2018-11-12 02:56:39 +01:00
parent 77bc4b8e13
commit a644fb10f6
1 changed files with 56 additions and 48 deletions

View File

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation # Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
@ -9,31 +9,34 @@ DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
HOMEPAGE="https://www.swift.im/" HOMEPAGE="https://www.swift.im/"
if [[ ${PV} = "9999" ]] ; then if [[ ${PV} = "9999" ]] ; then
EGIT_REPO_URI="https://github.com/swift/swift.git" EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
EGIT_BRANCH="swift-4.x" EGIT_BRANCH="swift-4.x"
inherit git-r3 inherit git-r3
KEYWORDS="" KEYWORDS=""
else else
RESTRICT="mirror" RESTRICT="mirror"
SRC_URI="https://swift.im/downloads/releases/swift-${PV}/swift-${PV}.tar.gz" SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
fi fi
LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
SLOT="0/4" SLOT="4/0"
IUSE="client expat examples experimental ft gconf hunspell lua icu idn test tools unbound zeroconf" IUSE="client expat gconf +icu +idn lua spell test zeroconf"
REQUIRED_USE="ft? ( experimental ) REQUIRED_USE="
|| ( icu idn )
gconf? ( client ) gconf? ( client )
hunspell? ( client )" spell? ( client )
"
RDEPEND="dev-lang/lua:= RDEPEND="
dev-db/sqlite:3
dev-libs/boost:= dev-libs/boost:=
dev-libs/openssl:0= dev-libs/openssl:0=
net-libs/libnatpmp
net-libs/miniupnpc:=
sys-libs/zlib:= sys-libs/zlib:=
expat? ( dev-libs/expat ) client? (
!expat? ( dev-libs/libxml2:2 ) dev-qt/qtcore:5
experimental? ( dev-db/sqlite:3 )
client? ( dev-qt/qtcore:5
dev-qt/qtdbus:5 dev-qt/qtdbus:5
dev-qt/qtgui:5 dev-qt/qtgui:5
dev-qt/qtmultimedia:5 dev-qt/qtmultimedia:5
@ -41,20 +44,27 @@ RDEPEND="dev-lang/lua:=
dev-qt/qtsvg:5 dev-qt/qtsvg:5
dev-qt/qtwidgets:5 dev-qt/qtwidgets:5
dev-qt/qtwebkit:5 dev-qt/qtwebkit:5
dev-qt/qtx11extras:5 ) dev-qt/qtx11extras:5
ft? ( net-libs/libnatpmp net-dns/avahi
net-libs/miniupnpc:= ) )
hunspell? ( app-text/hunspell:= ) expat? ( dev-libs/expat )
icu? ( dev-libs/icu:= ) !expat? ( dev-libs/libxml2:2 )
gconf? ( gnome-base/gconf:2 ) gconf? ( gnome-base/gconf:2 )
icu? ( dev-libs/icu:= )
idn? ( net-dns/libidn:= ) idn? ( net-dns/libidn:= )
unbound? ( net-dns/unbound lua? ( dev-lang/lua:= )
net-libs/ldns ) spell? ( app-text/hunspell:= )
zeroconf? ( net-dns/avahi )" "
DEPEND="${RDEPEND} DEPEND="
${RDEPEND}
>=dev-util/scons-3.0.1-r3 >=dev-util/scons-3.0.1-r3
client? ( dev-qt/linguist-tools:5 )" client? ( dev-qt/linguist-tools:5 )
test? ( net-dns/avahi )
"
# Tests don't run, as they fail with a "KeyError: 'CPPUNIT_FLAGS'".
RESTRICT="test"
DOCS=( DOCS=(
"DEVELOPMENT.md" "DEVELOPMENT.md"
@ -65,24 +75,22 @@ DOCS=(
src_prepare() { src_prepare() {
default default
# Hack for finding qt system libs # Hack for finding Qt system libs
#mkdir "${T}"/qt || die mkdir "${T}"/qt || die
#ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
#ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
#ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die
# Remove parts of Swift, which a user don't want to compile # Remove parts of Swift, which a user don't want to compile
! use client && rm -fr Swift Slimber if ! use client; then rm -fr Swift Slimber || die; fi
! use lua && rm -fr Sluift if ! use lua; then rm -fr Sluift || die; fi
! use tools && rm -fr SwiftTools if ! use zeroconf; then rm -fr Limber || die; fi
! use zeroconf && rm -fr Limber
# Remove '3rdParty', as the system libs should be used # Remove '3rdParty', as the system libs should be used
rm -fr 3rdParty || die rm -fr 3rdParty || die
} }
src_configure() { src_configure() {
use client && local QT_SELECT=qt5
MYSCONS=( MYSCONS=(
ar="$(tc-getAR)" ar="$(tc-getAR)"
allow_warnings="yes" allow_warnings="yes"
@ -93,14 +101,15 @@ src_configure() {
cc="$(tc-getCC)" cc="$(tc-getCC)"
ccache="no" ccache="no"
ccflags="${CFLAGS}" ccflags="${CFLAGS}"
CPPUNIT_FLAGS="QA"
coverage="no" coverage="no"
cxx="$(tc-getCXX)" cxx="$(tc-getCXX)"
cxxflags="${CXXFLAGS}" cxxflags="${CXXFLAGS}"
debug="no" debug="no"
distcc="no" distcc="no"
experimental="$(usex experimental)" experimental="yes"
experimental_ft="$(usex ft)" experimental_ft="yes"
hunspell_enable="$(usex hunspell)" hunspell_enable="$(usex spell)"
icu="$(usex icu)" icu="$(usex icu)"
install_git_hooks="no" install_git_hooks="no"
libidn_bundled_enable="false" libidn_bundled_enable="false"
@ -110,18 +119,19 @@ src_configure() {
linkflags="${LDFLAGS}" linkflags="${LDFLAGS}"
max_jobs="no" max_jobs="no"
optimize="no" optimize="no"
qt="${T}/qt"
qt5="$(usex client)" qt5="$(usex client)"
swiften_dll="true" swiften_dll="true"
swift_mobile="no" swift_mobile="no"
target="native" target="native"
test="none" test="none"
try_avahi="$(usex zeroconf)" try_avahi="$(usex client)"
try_expat="$(usex expat)" try_expat="$(usex expat)"
try_gconf="$(usex gconf)" try_gconf="$(usex gconf)"
try_libidn="$(usex idn)" try_libidn="$(usex idn)"
try_libxml="$(usex !expat)" try_libxml="$(usex !expat)"
tls_backend="openssl" tls_backend="openssl"
unbound="$(usex unbound)" unbound="no"
V="1" V="1"
valgrind="no" valgrind="no"
zlib_bundled_enable="false" zlib_bundled_enable="false"
@ -129,16 +139,15 @@ src_configure() {
} }
src_compile() { src_compile() {
local MYSCONSTARGETS=( local myesconsinstall=(
Swiften Swiften
$(usex client Slimber '')
$(usex client Swift '') $(usex client Swift '')
$(usex lua Sluift '') $(usex lua Sluift '')
$(usex tools SwifTools '')
$(usex zeroconf Limber '') $(usex zeroconf Limber '')
$(usex zeroconf "$(usex client Slimber '')" '')
) )
escons "${MYSCONS[@]}" "${MYSCONSTARGETS[@]}" escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
} }
src_test() { src_test() {
@ -146,22 +155,21 @@ src_test() {
} }
src_install() { src_install() {
local mysconsinstall=( local myesconsinstall=(
"${MYSCONS[@]}"
SLUIFT_DIR="${ED%/}/usr"
SWIFTEN_INSTALLDIR="${ED%/}/usr" SWIFTEN_INSTALLDIR="${ED%/}/usr"
SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)" SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
"${ED%/}" $(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
"${ED}"
) )
escons "${mysconsinstall[@]}"
escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
use client && newbin Slimber/CLI/slimber slimber-cli use client && newbin Slimber/CLI/slimber slimber-cli
use client && newbin Slimber/Qt/slimber slimber-qt use client && newbin Slimber/Qt/slimber slimber-qt
use lua && dobin Sluift/exe/sluift
use zeroconf && dobin Limber/limber use zeroconf && dobin Limber/limber
local HTML_DOCS=( "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.xml" )
einstalldocs einstalldocs
} }