commit: 437f1422fda400886ff01603d9c5f96abb5751c4
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 12 19:07:42 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 19:07:42 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=437f1422
[app-office/calligra] Remove unused dependencies, USE flags, and build options
discovered with CMAKE_WARN_UNUSED_CLI.
Package-Manager: portage-2.2.10
---
app-office/calligra/calligra-2.8.3.ebuild | 34 +++++--------------------------
app-office/calligra/calligra-9999.ebuild | 34 +++++--------------------------
2 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/app-office/calligra/calligra-2.8.3.ebuild
b/app-office/calligra/calligra-2.8.3.ebuild
index 36df3f4..f18cdb9 100644
--- a/app-office/calligra/calligra-2.8.3.ebuild
+++ b/app-office/calligra/calligra-2.8.3.ebuild
@@ -40,10 +40,10 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
-+truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
++okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
+xbase +xml"
# please do not sort here, order is same as in CMakeLists.txt
CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
@@ -76,7 +76,6 @@ RDEPEND="
$(add_kdebase_dep kdelibs 'nepomuk?')
dev-lang/perl
dev-libs/boost
- dev-libs/libxml2
$(add_kdebase_dep knewstuff)
media-libs/libpng
sys-libs/zlib
@@ -89,7 +88,6 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
freetds? ( dev-db/freetds )
- gif? ( media-libs/giflib )
glew? ( media-libs/glew )
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
@@ -116,7 +114,6 @@ RDEPEND="
nepomuk? ( dev-libs/soprano )
okular? ( $(add_kdebase_dep okular) )
opengl? ( virtual/glu )
- opengtl? ( >=media-libs/opengtl-0.9.15 )
openexr? ( media-libs/openexr )
pdf? (
app-text/poppler:=
@@ -127,13 +124,11 @@ RDEPEND="
dev-libs/libpqxx
)
spacenav? ( dev-libs/libspnav )
- ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
xbase? ( dev-db/xbase )
- xslt? ( dev-libs/libxslt )
calligra_features_kexi? (
>=dev-db/sqlite-3.7.9:3[extensions(+)]
dev-libs/icu:=
@@ -143,6 +138,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXi
)
+ calligra_features_words? ( dev-libs/libxslt )
"
DEPEND="${RDEPEND}"
@@ -166,28 +162,17 @@ src_configure() {
# first write out things we want to hard-enable
local mycmakeargs=(
- "-DIHAVEPATCHEDQT=ON"
- "-DWITH_Boost=ON"
- "-DWITH_LibXml2=ON"
"-DWITH_PNG=ON"
"-DWITH_ZLIB=ON"
"-DGHNS=ON"
- "-DWITH_X11=ON"
- "-DWITH_Qt4=ON"
- "-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported
arches and many more
)
# default disablers
mycmakeargs+=(
- "-DBUILD_mobile=OFF" # we dont support mobile gui,
maybe arm could
"-DBUILD_active=OFF" # we dont support active gui,
maybe arm could
- "-DWITH_LCMS=OFF" # we use lcms:2
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
- "-DWITH_TINY=OFF"
- "-DWITH_CreateResources=OFF" # NOT PACKAGED:
http://create.freedesktop.org/
- "-DWITH_DCMTK=OFF" # NOT PACKAGED:
http://www.dcmtk.org/dcmtk.php.en
)
# regular options
@@ -199,11 +184,8 @@ src_configure() {
$(cmake-utils_use_with fftw FFTW3)
$(cmake-utils_use_with fontconfig Fontconfig)
$(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with gif GIF2)
$(cmake-utils_use_with glew GLEW)
$(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with glib GObject)
- $(cmake-utils_use_with gsf LIBGSF)
$(cmake-utils_use_with gsl GSL)
$(cmake-utils_use_with import-filter LibEtonyek)
$(cmake-utils_use_with import-filter LibOdfGen)
@@ -219,10 +201,8 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_build mysql mySQL)
$(cmake-utils_use_with nepomuk Soprano)
$(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with pdf Poppler)
@@ -230,16 +210,12 @@ src_configure() {
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
$(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_build sybase sybase)
$(cmake-utils_use_with tiff TIFF)
$(cmake-utils_use_with threads Threads)
$(cmake-utils_use_with truetype Freetype)
$(cmake-utils_use_with vc Vc)
$(cmake-utils_use_with xbase XBase)
- $(cmake-utils_use_build xbase xbase)
- $(cmake-utils_use_with xslt LibXslt)
)
# applications
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index 36df3f4..f18cdb9 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -40,10 +40,10 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
-+truetype vc xbase +xml +xslt"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
+import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
++okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
+xbase +xml"
# please do not sort here, order is same as in CMakeLists.txt
CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
@@ -76,7 +76,6 @@ RDEPEND="
$(add_kdebase_dep kdelibs 'nepomuk?')
dev-lang/perl
dev-libs/boost
- dev-libs/libxml2
$(add_kdebase_dep knewstuff)
media-libs/libpng
sys-libs/zlib
@@ -89,7 +88,6 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
freetds? ( dev-db/freetds )
- gif? ( media-libs/giflib )
glew? ( media-libs/glew )
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
@@ -116,7 +114,6 @@ RDEPEND="
nepomuk? ( dev-libs/soprano )
okular? ( $(add_kdebase_dep okular) )
opengl? ( virtual/glu )
- opengtl? ( >=media-libs/opengtl-0.9.15 )
openexr? ( media-libs/openexr )
pdf? (
app-text/poppler:=
@@ -127,13 +124,11 @@ RDEPEND="
dev-libs/libpqxx
)
spacenav? ( dev-libs/libspnav )
- ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
xbase? ( dev-db/xbase )
- xslt? ( dev-libs/libxslt )
calligra_features_kexi? (
>=dev-db/sqlite-3.7.9:3[extensions(+)]
dev-libs/icu:=
@@ -143,6 +138,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXi
)
+ calligra_features_words? ( dev-libs/libxslt )
"
DEPEND="${RDEPEND}"
@@ -166,28 +162,17 @@ src_configure() {
# first write out things we want to hard-enable
local mycmakeargs=(
- "-DIHAVEPATCHEDQT=ON"
- "-DWITH_Boost=ON"
- "-DWITH_LibXml2=ON"
"-DWITH_PNG=ON"
"-DWITH_ZLIB=ON"
"-DGHNS=ON"
- "-DWITH_X11=ON"
- "-DWITH_Qt4=ON"
- "-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported
arches and many more
)
# default disablers
mycmakeargs+=(
- "-DBUILD_mobile=OFF" # we dont support mobile gui,
maybe arm could
"-DBUILD_active=OFF" # we dont support active gui,
maybe arm could
- "-DWITH_LCMS=OFF" # we use lcms:2
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
- "-DWITH_TINY=OFF"
- "-DWITH_CreateResources=OFF" # NOT PACKAGED:
http://create.freedesktop.org/
- "-DWITH_DCMTK=OFF" # NOT PACKAGED:
http://www.dcmtk.org/dcmtk.php.en
)
# regular options
@@ -199,11 +184,8 @@ src_configure() {
$(cmake-utils_use_with fftw FFTW3)
$(cmake-utils_use_with fontconfig Fontconfig)
$(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with gif GIF2)
$(cmake-utils_use_with glew GLEW)
$(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with glib GObject)
- $(cmake-utils_use_with gsf LIBGSF)
$(cmake-utils_use_with gsl GSL)
$(cmake-utils_use_with import-filter LibEtonyek)
$(cmake-utils_use_with import-filter LibOdfGen)
@@ -219,10 +201,8 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_build mysql mySQL)
$(cmake-utils_use_with nepomuk Soprano)
$(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with pdf Poppler)
@@ -230,16 +210,12 @@ src_configure() {
$(cmake-utils_use_with postgres PostgreSQL)
$(cmake-utils_use_build postgres pqxx)
$(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_build sybase sybase)
$(cmake-utils_use_with tiff TIFF)
$(cmake-utils_use_with threads Threads)
$(cmake-utils_use_with truetype Freetype)
$(cmake-utils_use_with vc Vc)
$(cmake-utils_use_with xbase XBase)
- $(cmake-utils_use_build xbase xbase)
- $(cmake-utils_use_with xslt LibXslt)
)
# applications
