diff options
| -rw-r--r-- | app-office/koffice-data/Manifest | 4 | ||||
| -rw-r--r-- | app-office/koffice-data/koffice-data-1.9.99.0.ebuild | 3 | ||||
| -rw-r--r-- | app-office/koffice-data/koffice-data-9999.ebuild | 7 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 46 |
4 files changed, 27 insertions, 33 deletions
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest index 9f3e798d1a2..219332dfcae 100644 --- a/app-office/koffice-data/Manifest +++ b/app-office/koffice-data/Manifest @@ -1,5 +1,5 @@ DIST koffice-1.9.99.0.tar.bz2 83104490 RMD160 0360115336eb649b699fe5679dd562ef4b3cfd90 SHA1 392c15bc13335b7b67a2aa19ba03d09a85f4c21a SHA256 73b51c342c349bbf200bcab3b0dbd56d6e48eee8d1620af5060a2505c7fcb1dc -EBUILD koffice-data-1.9.99.0.ebuild 363 RMD160 ad72c97045f3f3c1793e3ddd3cbd8a5a0d8cdd6f SHA1 0d8f904afe1263cd6b72aba1a6e990645d6bd0ef SHA256 37d0a209da238e023e1a020393b123cd3513580a5021e2b0241def795e93e861 -EBUILD koffice-data-9999.ebuild 352 RMD160 abff61d7d6ea66e3045f8b68f43de2584e2597eb SHA1 13d6a8f99969ec1cc12066dfca671b236fa42859 SHA256 6964aa866928ad03da7de30d0c33e709a51ed5624030444bcf4355316eacedb3 +EBUILD koffice-data-1.9.99.0.ebuild 416 RMD160 309459f281546226538f654b114cba16f29867b3 SHA1 25fe704f0fbe25a772fb55ab973acd39fa6ccf21 SHA256 87214862894aaa6b37937144a7085d3a0e0f1f741318bd951983bb896146a33b +EBUILD koffice-data-9999.ebuild 403 RMD160 6b9ba627a3874261e1792ac573e0837973753947 SHA1 05267bba84a86b552ffbf7581489f63796ece0a4 SHA256 2589d80a50bf544bb2e0c5b20c39177563544c58bb48748156a2a9d8d655c0ae MISC ChangeLog 1729 RMD160 f1863831b97ccb0c2e0963e7184757f2ebe0ee85 SHA1 f9ab05db270715c3c3f0d9bd956a5a13448782c0 SHA256 9b9910eae37725ab0be5a7b44c3ad27e45bc042ffec7efa3f97d2e95a0d77ec8 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/app-office/koffice-data/koffice-data-1.9.99.0.ebuild b/app-office/koffice-data/koffice-data-1.9.99.0.ebuild index 1cd8bc35c12..827ec2829d0 100644 --- a/app-office/koffice-data/koffice-data-1.9.99.0.ebuild +++ b/app-office/koffice-data/koffice-data-1.9.99.0.ebuild @@ -14,6 +14,9 @@ DESCRIPTION="Shared KOffice data files." KEYWORDS="~amd64 ~x86" IUSE="" +DEPEND=">=media-libs/lcms-1.18" +RDEPEND="${DEPEND}" + KMEXTRA="pics/ servicetypes/ templates/" diff --git a/app-office/koffice-data/koffice-data-9999.ebuild b/app-office/koffice-data/koffice-data-9999.ebuild index 950ddec0f23..66b1c36b3ff 100644 --- a/app-office/koffice-data/koffice-data-9999.ebuild +++ b/app-office/koffice-data/koffice-data-9999.ebuild @@ -14,9 +14,12 @@ DESCRIPTION="Shared KOffice data files." KEYWORDS="" IUSE="" +DEPEND=">=media-libs/lcms-1.18" +RDEPEND="${DEPEND}" + KMEXTRA="pics/ - servicetypes/ - templates/" + servicetypes/ + templates/" KMEXTRACTONLY=" doc/CMakeLists.txt doc/koffice.desktop" diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 3425d3ff886..eb879ecf932 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -86,35 +86,23 @@ case ${KMNAME} in !app-office/koffice-meta:0 ) " - case ${PN} in - koffice-data) - DEPEND="${DEPEND} - media-libs/lcms - " - RDEPEND="${RDEPEND} - media-libs/lcms - " - ;; - *) - COMMON_DEPEND=" - dev-cpp/eigen:2 - media-gfx/imagemagick[openexr?] - media-libs/fontconfig - media-libs/freetype:2 - " - DEPEND="${DEPEND} ${COMMON_DEPEND}" - RDEPEND="${RDEPEND} ${COMMON_DEPEND}" - unset COMMON_DEPEND - if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then - DEPEND="${DEPEND} - >=app-office/koffice-libs-${PV}:${SLOT} - " - RDEPEND="${RDEPEND} - >=app-office/koffice-libs-${PV}:${SLOT} - " - fi - ;; - esac + COMMON_DEPEND=" + dev-cpp/eigen:2 + media-gfx/imagemagick[openexr?] + media-libs/fontconfig + media-libs/freetype:2 + " + DEPEND="${DEPEND} ${COMMON_DEPEND}" + RDEPEND="${RDEPEND} ${COMMON_DEPEND}" + unset COMMON_DEPEND + if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then + DEPEND="${DEPEND} + >=app-office/koffice-libs-${PV}:${SLOT} + " + RDEPEND="${RDEPEND} + >=app-office/koffice-libs-${PV}:${SLOT} + " + fi ;; esac |