[net-im] drycode swift EAPI=6 conversion, fix quoting in spectrum

This commit is contained in:
Robert Förster 2016-02-11 12:41:21 +01:00
parent cf15160d23
commit 851d4b306c
2 changed files with 15 additions and 17 deletions

View File

@ -57,16 +57,16 @@ CMAKE_IN_SOURCE_BUILD=1
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
$(cmake-utils_use_find_package libev event) $(cmake-utils_use_find_package libev event)
-DENABLE_MYSQL="$(usex mysql) -DENABLE_MYSQL="$(usex mysql)"
-DENABLE_PQXX="$(usex postgres) -DENABLE_PQXX="$(usex postgres)"
-DENABLE_SQLITE3="$(usex sqlite) -DENABLE_SQLITE3="$(usex sqlite)"
-DENABLE_DOCS="$(usex doc) -DENABLE_DOCS="$(usex doc)"
-DENABLE_FROTZ="$(usex frotz) -DENABLE_FROTZ="$(usex frotz)"
-DENABLE_IRC="$(usex irc) -DENABLE_IRC="$(usex irc)"
-DENABLE_SWIFTEN="$(usex jabber) -DENABLE_SWIFTEN="$(usex jabber)"
-DENABLE_PURPLE="$(usex purple) -DENABLE_PURPLE="$(usex purple)"
-DENABLE_SMSTOOLS3="$(usex sms) -DENABLE_SMSTOOLS3="$(usex sms)"
-DENABLE_TWITTER="$(usex twitter) -DENABLE_TWITTER="$(usex twitter)"
-DLIB_INSTALL_DIR=$(get_libdir) -DLIB_INSTALL_DIR=$(get_libdir)
) )

View File

@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="6"
inherit multilib toolchain-funcs linux-info scons-utils inherit toolchain-funcs linux-info scons-utils
if [[ ${PV} = "9999" ]] ; then if [[ ${PV} = "9999" ]] ; then
EGIT_REPO_URI="git://swift.im/swift" EGIT_REPO_URI="git://swift.im/swift"
@ -83,12 +83,11 @@ set_scons_vars() {
ccflags="${CXXFLAGS}" ccflags="${CXXFLAGS}"
linkflags="${LDFLAGS}" linkflags="${LDFLAGS}"
qt="${S}/local-qt" qt="${S}/local-qt"
openssl="${EPREFIX}/usr" openssl="$(usex ssl ${EPREFIX}/usr)"
docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets"
docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5" docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5"
$(use_scons debug) debug="$(usex debug)"
$(use !static-libs && use_scons !static-libs swiften_dll) swiften_dll="$(usex static-libs "no" "yes")"
$(use_scons ssl openssl)
) )
} }
@ -164,7 +163,6 @@ src_install() {
dobin Limber/limber dobin Limber/limber
dobin Sluift/sluift dobin Sluift/sluift
dobin Swiften/Config/swiften-config
for i in BenchTool ConnectivityTest LinkLocalTool ParserTester SendFile SendMessage ; do for i in BenchTool ConnectivityTest LinkLocalTool ParserTester SendFile SendMessage ; do
newbin "Swiften/Examples/${i}/${i}" "${PN}-${i}" newbin "Swiften/Examples/${i}/${i}" "${PN}-${i}"