Lines 29-35
Link Here
|
29 |
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar |
29 |
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar |
30 |
clearcase cmake:cmakeprojectmanager cvs fakevim git |
30 |
clearcase cmake:cmakeprojectmanager cvs fakevim git |
31 |
madde mercurial perforce qnx subversion valgrind) |
31 |
madde mercurial perforce qnx subversion valgrind) |
32 |
IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}" |
32 |
IUSE="botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}" |
33 |
|
33 |
|
34 |
# minimum Qt version required |
34 |
# minimum Qt version required |
35 |
QT_PV="4.8.0:4" |
35 |
QT_PV="4.8.0:4" |
Lines 82-111
Link Here
|
82 |
if ! use botan-bundled; then |
82 |
if ! use botan-bundled; then |
83 |
# identify system botan and pkg-config file |
83 |
# identify system botan and pkg-config file |
84 |
local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2) |
84 |
local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2) |
85 |
local lib_botan=$(pkg-config --libs botan-${botan_version}) |
|
|
86 |
einfo "Major version of system's botan library to be used: ${botan_version}" |
85 |
einfo "Major version of system's botan library to be used: ${botan_version}" |
87 |
|
86 |
|
88 |
# drop bundled libBotan. Bug #383033 |
87 |
# drop bundled libBotan. Bug #383033 |
89 |
rm -rf "${S}"/src/libs/3rdparty/botan || die |
88 |
epatch "${FILESDIR}/${PN}-remove-bundled-botan.patch" |
90 |
# remove references to bundled botan |
|
|
91 |
sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die |
92 |
for x in testrunner parsertests modeldemo; do |
93 |
sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die |
94 |
done |
95 |
sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die |
96 |
sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die |
97 |
# link to system botan |
98 |
sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die |
99 |
sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die |
100 |
# append botan refs to compiler flags |
89 |
# append botan refs to compiler flags |
101 |
append-flags $(pkg-config --cflags --libs botan-${botan_version}) |
90 |
append-flags -I../3rdparty $(pkg-config --cflags botan-${botan_version}) |
102 |
fi |
91 |
fi |
103 |
} |
92 |
} |
104 |
|
93 |
|
105 |
src_configure() { |
94 |
src_configure() { |
|
|
95 |
local extra_flags= |
96 |
if ! use botan-bundled; then |
97 |
local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2) |
98 |
extra_flags="QMAKE_LIBS=\"$(pkg-config --libs botan-${botan_version})\"" |
99 |
fi |
106 |
eqmake4 qtcreator.pro \ |
100 |
eqmake4 qtcreator.pro \ |
107 |
IDE_LIBRARY_BASENAME="$(get_libdir)" \ |
101 |
IDE_LIBRARY_BASENAME="$(get_libdir)" \ |
108 |
IDE_PACKAGE_MODE=yes |
102 |
IDE_PACKAGE_MODE=yes \ |
|
|
103 |
"${extra_flags}" |
109 |
} |
104 |
} |
110 |
|
105 |
|
111 |
src_compile() { |
106 |
src_compile() { |