From affdc75158bc1890e269025eea7ca468cc17c301 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 17 Jan 2007 01:18:23 +0000 Subject: [PATCH] Add patch for CVE-2007-0104 vulnerability. Package-Manager: portage-2.1.2 --- app-office/koffice/ChangeLog | 12 ++- app-office/koffice/Manifest | 34 +++++-- .../koffice/files/digest-koffice-1.5.2-r2 | 3 + .../koffice/files/digest-koffice-1.6.1-r1 | 3 + .../files/koffice-xpdf-CVE-2007-0104.diff | 74 ++++++++++++++ app-office/koffice/koffice-1.5.2-r2.ebuild | 96 ++++++++++++++++++ app-office/koffice/koffice-1.6.1-r1.ebuild | 97 +++++++++++++++++++ 7 files changed, 309 insertions(+), 10 deletions(-) create mode 100644 app-office/koffice/files/digest-koffice-1.5.2-r2 create mode 100644 app-office/koffice/files/digest-koffice-1.6.1-r1 create mode 100644 app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff create mode 100644 app-office/koffice/koffice-1.5.2-r2.ebuild create mode 100644 app-office/koffice/koffice-1.6.1-r1.ebuild diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index 76173f8e8012..8f097bb1b931 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-office/koffice -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.202 2006/12/01 18:04:12 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.203 2007/01/17 01:18:23 flameeyes Exp $ + +*koffice-1.6.1-r1 (17 Jan 2007) +*koffice-1.5.2-r2 (17 Jan 2007) + + 17 Jan 2007; Diego Pettenò + +files/koffice-xpdf-CVE-2007-0104.diff, +koffice-1.5.2-r2.ebuild, + +koffice-1.6.1-r1.ebuild: + Add patch for CVE-2007-0104 vulnerability. *koffice-1.6.1 (01 Dec 2006) diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index 747f035e882b..719180bde39a 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -5,6 +5,10 @@ AUX koffice-ole-filter.patch 3463 RMD160 8b02db2db2ee51af814c5ea7c86886b1600a9ed MD5 16646f85f5daf979b5ad81058a2cca14 files/koffice-ole-filter.patch 3463 RMD160 8b02db2db2ee51af814c5ea7c86886b1600a9ed5 files/koffice-ole-filter.patch 3463 SHA256 45eb23dade160f040ce4091a1a7f91819d5998ac0c1a5a29fd66116191223726 files/koffice-ole-filter.patch 3463 +AUX koffice-xpdf-CVE-2007-0104.diff 3185 RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 SHA1 bef37ffafbae9a509363f7bc63806ab7162576b9 SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe +MD5 dc28881c39f11c040f8c942e4af238d1 files/koffice-xpdf-CVE-2007-0104.diff 3185 +RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 files/koffice-xpdf-CVE-2007-0104.diff 3185 +SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe files/koffice-xpdf-CVE-2007-0104.diff 3185 AUX krita-1.6.0-corrupt_png_save.diff 571 RMD160 b50fe5e974eaed7b1397ce962edf5c67cf4e087a SHA1 9a5f216c4b9e527396125b4524e4852734a519aa SHA256 508e4ff46458170dac5d06bf2d75fac1c3a1b0560f86744fa809c85e3fd48e6b MD5 5f18026e387a792516a3ca5c840020c6 files/krita-1.6.0-corrupt_png_save.diff 571 RMD160 b50fe5e974eaed7b1397ce962edf5c67cf4e087a files/krita-1.6.0-corrupt_png_save.diff 571 @@ -16,18 +20,26 @@ EBUILD koffice-1.5.2-r1.ebuild 2278 RMD160 24627f6c4c69efa1c08961448390a66b04987 MD5 c10be94303b671629ed765dc3c923cf9 koffice-1.5.2-r1.ebuild 2278 RMD160 24627f6c4c69efa1c08961448390a66b04987720 koffice-1.5.2-r1.ebuild 2278 SHA256 917cc9d9a290843369b18997a3de45b88d900437e2bc30b60a43b4f62c1b4686 koffice-1.5.2-r1.ebuild 2278 +EBUILD koffice-1.5.2-r2.ebuild 2344 RMD160 ce095bb764e181af69b8f7f29d9dec726a5f45f5 SHA1 10a7b6ee378b7bd6c2637502ad5df4c5ccd1283f SHA256 3be3008cf5bf5faf6d48305bf5880eab212d79321c9b1d515bc97e22b08f1ccf +MD5 a00ffadfd83ae73e328b014578697c08 koffice-1.5.2-r2.ebuild 2344 +RMD160 ce095bb764e181af69b8f7f29d9dec726a5f45f5 koffice-1.5.2-r2.ebuild 2344 +SHA256 3be3008cf5bf5faf6d48305bf5880eab212d79321c9b1d515bc97e22b08f1ccf koffice-1.5.2-r2.ebuild 2344 EBUILD koffice-1.6.0-r3.ebuild 2443 RMD160 5fe6fb6d45666eb28e353a4eb2495b5f6e4f6282 SHA1 2cd3ff6ccaff1f8a59e738f496aa2cd6576b0a28 SHA256 f24fd142a117c475300e92532ada0bfa238c758c2fb7418ea984a10a88bdfcd5 MD5 4a289e6aad578cb26340e98401b7595d koffice-1.6.0-r3.ebuild 2443 RMD160 5fe6fb6d45666eb28e353a4eb2495b5f6e4f6282 koffice-1.6.0-r3.ebuild 2443 SHA256 f24fd142a117c475300e92532ada0bfa238c758c2fb7418ea984a10a88bdfcd5 koffice-1.6.0-r3.ebuild 2443 +EBUILD koffice-1.6.1-r1.ebuild 2403 RMD160 3827dec008092093aea1ef2bc9a882dbfc70a6c2 SHA1 7e7343f2cf749d70eb19d0ba0fc720c3c089160e SHA256 e16fc6f2bbba65a370b934c7ad5074fa9fe3c1e20b3a33d115197238d5f60995 +MD5 bf3c8a80e0eff3a9c8e579503a7a5825 koffice-1.6.1-r1.ebuild 2403 +RMD160 3827dec008092093aea1ef2bc9a882dbfc70a6c2 koffice-1.6.1-r1.ebuild 2403 +SHA256 e16fc6f2bbba65a370b934c7ad5074fa9fe3c1e20b3a33d115197238d5f60995 koffice-1.6.1-r1.ebuild 2403 EBUILD koffice-1.6.1.ebuild 2345 RMD160 ae35e045d12ea786d4a8b9ec5a5d6da382ec712c SHA1 bb0b83858baad5195acfdc86a9dad3b345252ce5 SHA256 c22c70a22454573fad38ae89c8746dbc8ee290501fcdec9e85305935d04cfb6f MD5 5b809c0f048fb6bacb01c791c55173c3 koffice-1.6.1.ebuild 2345 RMD160 ae35e045d12ea786d4a8b9ec5a5d6da382ec712c koffice-1.6.1.ebuild 2345 SHA256 c22c70a22454573fad38ae89c8746dbc8ee290501fcdec9e85305935d04cfb6f koffice-1.6.1.ebuild 2345 -MISC ChangeLog 28362 RMD160 9be6316c655342afd1996d20312a11194d7aae0b SHA1 bea2e9f7133540f3e64042bc40ee0b39ac45021f SHA256 46a2350932a0ff2cf14bcb4426222ab845897cd935be160fc3fd27a0034f1bb4 -MD5 8c10a0c2c9f59d5a6f9592bb2022fe2e ChangeLog 28362 -RMD160 9be6316c655342afd1996d20312a11194d7aae0b ChangeLog 28362 -SHA256 46a2350932a0ff2cf14bcb4426222ab845897cd935be160fc3fd27a0034f1bb4 ChangeLog 28362 +MISC ChangeLog 28622 RMD160 dc3f0c639efac9d253e404c2f219102b3cb55f5b SHA1 0af6a29a31d20447584dbec0322744a1f5c62895 SHA256 7ce46213f1011eada23bcf9ccba374780e9d281a247dc10965a797367cc1b79b +MD5 84efc30fa66608c0759559b11a090dfd ChangeLog 28622 +RMD160 dc3f0c639efac9d253e404c2f219102b3cb55f5b ChangeLog 28622 +SHA256 7ce46213f1011eada23bcf9ccba374780e9d281a247dc10965a797367cc1b79b ChangeLog 28622 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157 @@ -35,16 +47,22 @@ SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-1.5.2-r1 250 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-1.5.2-r1 250 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-1.5.2-r1 250 +MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-1.5.2-r2 250 +RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-1.5.2-r2 250 +SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-1.5.2-r2 250 MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-koffice-1.6.0-r3 250 RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-koffice-1.6.0-r3 250 SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-koffice-1.6.0-r3 250 MD5 44d307bd453fb21c59c4f449870d5859 files/digest-koffice-1.6.1 250 RMD160 bba235b5d7bdb20b43d72df70e83f94e73f8468a files/digest-koffice-1.6.1 250 SHA256 8947fdfcfda8edd2bd5291f3d5c44f7521d41f2686b116c88b6f8c72448b5054 files/digest-koffice-1.6.1 250 +MD5 44d307bd453fb21c59c4f449870d5859 files/digest-koffice-1.6.1-r1 250 +RMD160 bba235b5d7bdb20b43d72df70e83f94e73f8468a files/digest-koffice-1.6.1-r1 250 +SHA256 8947fdfcfda8edd2bd5291f3d5c44f7521d41f2686b116c88b6f8c72448b5054 files/digest-koffice-1.6.1-r1 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFcG64AiZjviIA2XgRAmbUAKCI8qSzaAr5i60x/OC6+jMU6L8iSgCbBxQN -V83Jt8xk5hxOTu1CC+I/3q8= -=CdTZ +iD8DBQFFrXlvAiZjviIA2XgRAkY6AJ0ZBisBO6kBAs95/LPNHXH9doAvYACfYouT +aMELnkrDroXxfZ6wsDLEKYA= +=FZ9t -----END PGP SIGNATURE----- diff --git a/app-office/koffice/files/digest-koffice-1.5.2-r2 b/app-office/koffice/files/digest-koffice-1.5.2-r2 new file mode 100644 index 000000000000..d1ae4451f5cb --- /dev/null +++ b/app-office/koffice/files/digest-koffice-1.5.2-r2 @@ -0,0 +1,3 @@ +MD5 cbe9deeb7c811a6bb5a954989b25c1f2 koffice-1.5.2.tar.bz2 35878218 +RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 koffice-1.5.2.tar.bz2 35878218 +SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 koffice-1.5.2.tar.bz2 35878218 diff --git a/app-office/koffice/files/digest-koffice-1.6.1-r1 b/app-office/koffice/files/digest-koffice-1.6.1-r1 new file mode 100644 index 000000000000..8296a0484c60 --- /dev/null +++ b/app-office/koffice/files/digest-koffice-1.6.1-r1 @@ -0,0 +1,3 @@ +MD5 f7b90b46b79019edc60761a6bff2d387 koffice-1.6.1.tar.bz2 56999028 +RMD160 ee4fa84a53f92035c0ab9427e0acb18feca701db koffice-1.6.1.tar.bz2 56999028 +SHA256 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 koffice-1.6.1.tar.bz2 56999028 diff --git a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff b/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff new file mode 100644 index 000000000000..f5e51a1c706e --- /dev/null +++ b/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff @@ -0,0 +1,74 @@ +------------------------------------------------------------------------ +r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines +Changed paths: + M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc + M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h + +Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. + +------------------------------------------------------------------------ +Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc +=================================================================== +--- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) ++++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) +@@ -24,6 +24,12 @@ + #include "Link.h" + #include "Catalog.h" + ++// This define is used to limit the depth of recursive readPageTree calls ++// This is needed because the page tree nodes can reference their parents ++// leaving us in an infinite loop ++// Most sane pdf documents don't have a call depth higher than 10 ++#define MAX_CALL_DEPTH 1000 ++ + //------------------------------------------------------------------------ + // Catalog + //------------------------------------------------------------------------ +@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { + pageRefs[i].num = -1; + pageRefs[i].gen = -1; + } +- numPages = readPageTree(pagesDict.getDict(), NULL, 0); ++ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); + if (numPages != numPages0) { + error(-1, "Page count in top-level pages object is incorrect"); + } +@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { + return s; + } + +-int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { ++int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { + Object kids; + Object kid; + Object kidRef; +@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic + // This should really be isDict("Pages"), but I've seen at least one + // PDF file where the /Type entry is missing. + } else if (kid.isDict()) { +- if ((start = readPageTree(kid.getDict(), attrs1, start)) +- < 0) +- goto err2; ++ if (callDepth > MAX_CALL_DEPTH) { ++ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); ++ } else { ++ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) ++ < 0) ++ goto err2; ++ } + } else { + error(-1, "Kid object (page %d) is wrong type (%s)", + start+1, kid.getTypeName()); +Index: filters/kword/pdf/xpdf/xpdf/Catalog.h +=================================================================== +--- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) ++++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) +@@ -82,7 +82,7 @@ private: + Object outline; // outline dictionary + GBool ok; // true if catalog is valid + +- int readPageTree(Dict *pages, PageAttrs *attrs, int start); ++ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); + Object *findDestInTree(Object *tree, GString *name, Object *obj); + }; + diff --git a/app-office/koffice/koffice-1.5.2-r2.ebuild b/app-office/koffice/koffice-1.5.2-r2.ebuild new file mode 100644 index 000000000000..49d54fc9d0f8 --- /dev/null +++ b/app-office/koffice/koffice-1.5.2-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5.2-r2.ebuild,v 1.1 2007/01/17 01:18:23 flameeyes Exp $ + +inherit kde + +RV="${PV}" +MY_P="koffice-${RV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment." +HOMEPAGE="http://www.koffice.org/" +SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2" +#SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# See bug #130442. +#IUSE="doc mysql opengl postgres" +IUSE="doc mysql postgres" + +RDEPEND=">=media-libs/freetype-2 + media-libs/fontconfig + media-libs/libart_lgpl + dev-libs/libxml2 + dev-libs/libxslt + sys-libs/readline + mysql? ( virtual/mysql ) + postgres? ( dev-libs/libpqxx ) + virtual/python + dev-lang/ruby + >=app-text/wv2-0.1.9 + >=app-text/libwpd-0.8.2 + >=media-gfx/imagemagick-6.2.5.5 + >=media-libs/lcms-1.14-r1 + media-libs/tiff + media-libs/jpeg + >=media-libs/openexr-1.2.2-r2 + media-libs/libpng + >=media-libs/libexif-0.6.13-r1 + virtual/opengl + virtual/glu" +# opengl? ( virtual/opengl virtual/glu )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +# add blockers on split packages derived from this one +for x in $(get-child-packages ${CATEGORY}/${PN}); do + DEPEND="${DEPEND} !${x}" + RDEPEND="${RDEPEND} !${x}" +done + +PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-0104.diff" + +need-kde 3.4 + +# TODO: kword sql plugin needs Qt compiled with sql support +# the dependency on python is needed for scripting support in kexi +# and for kivio/kiviopart/kiviosdk. + +pkg_setup() { + # use opengl && + if ! built_with_use =x11-libs/qt-3* opengl ; then + eerror "You need to build x11-libs/qt with opengl use flag enabled." + die + fi +} + +src_unpack() { + kde_src_unpack + # FIXME - disable broken tests for now + sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \ + `ls ${S}/krita/colorspaces/*/Makefile.am` +} + +src_compile() { + local myconf="$(use_enable mysql) $(use_enable postgres pgsql)" + # $(use_enable opengl gl)" + + kde_src_compile + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + dodoc changes-* +} diff --git a/app-office/koffice/koffice-1.6.1-r1.ebuild b/app-office/koffice/koffice-1.6.1-r1.ebuild new file mode 100644 index 000000000000..14c245915246 --- /dev/null +++ b/app-office/koffice/koffice-1.6.1-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6.1-r1.ebuild,v 1.1 2007/01/17 01:18:23 flameeyes Exp $ + +inherit kde + +RV="${PV}" +MY_P="koffice-${RV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment." +HOMEPAGE="http://www.koffice.org/" +SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2" +#SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# See bug #130442. +#IUSE="doc mysql opengl postgres" +IUSE="doc mysql postgres" + +RDEPEND=">=media-libs/freetype-2 + media-libs/fontconfig + media-libs/libart_lgpl + dev-libs/libxml2 + dev-libs/libxslt + sys-libs/readline + mysql? ( virtual/mysql ) + postgres? ( dev-libs/libpqxx ) + virtual/python + dev-lang/ruby + >=app-text/wv2-0.1.9 + >=app-text/libwpd-0.8.2 + >=media-gfx/imagemagick-6.2.5.5 + >=media-libs/lcms-1.15 + media-libs/tiff + media-libs/jpeg + >=media-libs/openexr-1.2.2-r2 + media-libs/libpng + >=media-libs/libexif-0.6.13-r1 + virtual/opengl + virtual/glu" +# opengl? ( virtual/opengl virtual/glu )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +# add blockers on split packages derived from this one +for x in $(get-child-packages ${CATEGORY}/${PN}); do + DEPEND="${DEPEND} !${x}" + RDEPEND="${RDEPEND} !${x}" +done + +PATCHES="${FILESDIR}/koffice-xpdf-CVE-2007-0104.diff" + +need-kde 3.4 + +# TODO: kword sql plugin needs Qt compiled with sql support +# the dependency on python is needed for scripting support in kexi +# and for kivio/kiviopart/kiviosdk. + +pkg_setup() { + # use opengl && + if ! built_with_use =x11-libs/qt-3* opengl ; then + eerror "You need to build x11-libs/qt with opengl use flag enabled." + die + fi +} + +src_unpack() { + kde_src_unpack + # FIXME - disable broken tests for now + sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \ + `ls ${S}/krita/colorspaces/*/Makefile.am` + sed -i -e "s:toolbar tests:toolbar:" ${S}/kplato/Makefile.am +} + +src_compile() { + local myconf="$(use_enable mysql) $(use_enable postgres pgsql)" + # $(use_enable opengl gl)" + + kde_src_compile + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + dodoc changes-* +} -- 2.26.2