From c8146cc51767a5b9321f0729dea98fb539e17dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Thu, 21 Jan 2016 00:06:37 +0100 Subject: [PATCH] [net-im/swift] fix 9999, drop older, incompatible with newer boost --- net-im/swift/swift-2.9999.ebuild | 174 ------------------------------- net-im/swift/swift-9999.ebuild | 6 +- 2 files changed, 5 insertions(+), 175 deletions(-) delete mode 100644 net-im/swift/swift-2.9999.ebuild diff --git a/net-im/swift/swift-2.9999.ebuild b/net-im/swift/swift-2.9999.ebuild deleted file mode 100644 index 7c87da9..0000000 --- a/net-im/swift/swift-2.9999.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -LANGS="ca de es fr gl he hu nl pl ru sk sv" - -inherit multilib toolchain-funcs linux-info qt4-r2 scons-utils - -if [[ ${PV} = "2.9999" ]] ; then - EGIT_REPO_URI="git://swift.im/swift" - EGIT_BRANCH="swift-2.x" - inherit git-r3 - KEYWORDS="" -else - RESTRICT="mirror" - SRC_URI="http://swift.im/downloads/releases/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Your friendly chat client" -HOMEPAGE="http://swift.im/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug doc examples +expat qt4 ssl static-libs zeroconf" - -RDEPEND=" - dev-libs/boost:= - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 ) - ssl? ( dev-libs/openssl ) - zeroconf? ( net-dns/avahi ) - net-dns/libidn - sys-libs/zlib - qt4? ( - x11-libs/libXScrnSaver - dev-qt/qtgui - dev-qt/qtwebkit - ) -" -DEPEND="${RDEPEND} - doc? ( - >=app-text/docbook-xsl-stylesheets-1.75 - >=app-text/docbook-xml-dtd-4.5 - dev-libs/libxslt - ) -" -scons_targets=() -set_scons_targets() { - scons_targets=( Swiften ) - use qt4 && scons_targets+=( Swift ) - use zeroconf && scons_targets+=( Slimber ) - use examples && scons_targets+=( - Documentation/SwiftenDevelopersGuide/Examples - Limber - Sluift - Swiften/Config - Swiften/Examples - Swiften/QA - SwifTools - ) -} - -scons_vars=() -set_scons_vars() { - scons_vars=( - V=1 - allow_warnings=1 - cc="$(tc-getCC)" - cxx="$(tc-getCXX)" - ccflags="${CXXFLAGS}" - linkflags="${LDFLAGS}" - qt="${S}/local-qt" - openssl="${EPREFIX}/usr" - docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" - docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5" - $(use_scons debug) - $(use !static-libs && use_scons !static-libs swiften_dll) - $(use_scons ssl openssl) - ) -} - -src_prepare() { - mkdir local-qt - ln -s "${EPREFIX}"/usr/$(get_libdir)/qt4 local-qt/lib || die - ln -s "${EPREFIX}"/usr/include/qt4 local-qt/include || die - - cd 3rdParty || die - # TODO CppUnit, Lua - rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die - cd .. || die - - for x in ${LANGS}; do - if use !linguas_${x}; then - rm -f Swift/Translations/swift_${x}.ts || die - fi - done - - # Richard H. (2012-03-29): SCons ignores us, - # just delete unneeded stuff! - if use !zeroconf; then - rm -rf Slumber || die - fi - - if use !examples; then - rm -rf Documentation/SwiftenDevelopersGuide/Examples \ - Limber \ - Slimber \ - Sluift \ - Swiften/Examples \ - Swiften/QA \ - Swiftob || die - fi - - if use !qt4; then - rm -rf Swift || die - fi - - sed -i BuildTools/SCons/Tools/qt4.py \ - -e "s/linux2/linux${KV_MAJOR}/" \ - || die -} - -src_compile() { - set_scons_targets - set_scons_vars - - escons "${scons_vars[@]}" "${scons_targets[@]}" -} - -src_test() { - set_scons_targets - set_scons_vars - - escons "${scons_vars[@]}" test=unit QA -} - -src_install() { - set_scons_targets - set_scons_vars - - escons "${scons_vars[@]}" SWIFT_INSTALLDIR="${D}/usr" SWIFTEN_INSTALLDIR="${D}/usr" "${D}" "${scons_targets[@]}" - - if use zeroconf ; then - newbin Slimber/Qt/slimber slimber-qt - newbin Slimber/CLI/slimber slimber-cli - fi - - if use examples ; then - for i in EchoBot{1,2,3,4,5,6} EchoComponent ; do - newbin "Documentation/SwiftenDevelopersGuide/Examples/EchoBot/${i}" "${PN}-${i}" - done - - dobin Limber/limber - dobin Sluift/sluift - dobin Swiften/Config/swiften-config - - for i in BenchTool ConnectivityTest LinkLocalTool ParserTester SendFile SendMessage ; do - newbin "Swiften/Examples/${i}/${i}" "${PN}-${i}" - done - newbin Swiften/Examples/SendFile/ReceiveFile "${PN}-ReceiveFile" - use zeroconf && dobin Swiften/Examples/LinkLocalTool/LinkLocalTool - - for i in ClientTest NetworkTest StorageTest TLSTest ; do - newbin "Swiften/QA/${i}/${i}" "${PN}-${i}" - done - - newbin SwifTools/Idle/IdleQuerierTest/IdleQuerierTest ${PN}-IdleQuerierTest - fi - - use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html" -} diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild index 4a46c77..572bd28 100644 --- a/net-im/swift/swift-9999.ebuild +++ b/net-im/swift/swift-9999.ebuild @@ -32,6 +32,10 @@ RDEPEND=" ssl? ( dev-libs/openssl ) zeroconf? ( net-dns/avahi ) net-dns/libidn + net-dns/unbound + net-libs/ldns + net-libs/libnatpmp + net-libs/miniupnpc sys-libs/zlib qt4? ( x11-libs/libXScrnSaver @@ -88,7 +92,7 @@ src_prepare() { cd 3rdParty || die # TODO CppUnit, Lua - rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die + rm -r Boost DocBook Expat LCov Ldns LibIDN LibMiniUPnPc LibNATPMP OpenSSL SCons SQLite Unbound ZLib || die cd .. || die for x in ${LANGS}; do