summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-office/karbon/karbon-1.9.98.6.ebuild9
-rw-r--r--app-office/koffice-libs/Manifest2
-rw-r--r--app-office/koffice-libs/koffice-libs-1.9.98.6.ebuild30
-rw-r--r--eclass/kde4-base.eclass20
-rw-r--r--eclass/kde4-meta.eclass65
5 files changed, 53 insertions, 73 deletions
diff --git a/app-office/karbon/karbon-1.9.98.6.ebuild b/app-office/karbon/karbon-1.9.98.6.ebuild
index 66c2770c57b..b14d64f833a 100644
--- a/app-office/karbon/karbon-1.9.98.6.ebuild
+++ b/app-office/karbon/karbon-1.9.98.6.ebuild
@@ -14,10 +14,11 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
- dev-cpp/eigen:2
- media-gfx/imagemagick
media-gfx/pstoedit
- media-libs/fontconfig
- media-libs/freetype:2
media-libs/libart_lgpl
"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="filters/${KMMODULE}"
+
+
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 9e57a9301bb..69366f28964 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,5 +1,5 @@
DIST koffice-1.9.98.6.tar.bz2 83296065 RMD160 1ab1833bcc2c2f08cba50a9e9747dc66e63ed863 SHA1 e188d224aabba22215f306df9027d46458e42edf SHA256 3f89e141496769ce860e0b786ab5512111de82daa05b41d0c46804347c028acd
-EBUILD koffice-libs-1.9.98.6.ebuild 924 RMD160 694cd2a989b30b64f328a62aea29341ea8c8ea74 SHA1 d09094dfe52fc06a2d3d29c57181ffa00121854f SHA256 8683c1b1f32599da1d655ad6b94af9ccf696afbe3099b78dea29cf35d7e6273e
+EBUILD koffice-libs-1.9.98.6.ebuild 1342 RMD160 fe0aee260c9e2d5ad1d5c3098cce31b0305da0fe SHA1 01ee0925b655693517f0bf3dfa262e4cab875d07 SHA256 93f793c46d9c2a15253dedd6702421f46cd2d5c00c8fc37422c3078b2aadad40
EBUILD koffice-libs-9999.ebuild 758 RMD160 2e54544c4b7cab8a220322d76aa0018b21399a66 SHA1 e6da1c7fc5cb6c215151cede0a138e5200e3edd4 SHA256 0b8869b1c9553ca4b9fbb6483f09c41f9a7408a3d25b468ca26921cfaf81f5fe
MISC ChangeLog 1282 RMD160 0fbc0eb4663cdf2d8014fc77749be4ee23161668 SHA1 d2b679608acba7b3284eebfd62748f73c248efd5 SHA256 15f7a84119f8d36c65f91bbf2e55704b951f3975189466ec92163197d93d1a61
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-office/koffice-libs/koffice-libs-1.9.98.6.ebuild b/app-office/koffice-libs/koffice-libs-1.9.98.6.ebuild
index 4ed2a041695..0efdfd2b384 100644
--- a/app-office/koffice-libs/koffice-libs-1.9.98.6.ebuild
+++ b/app-office/koffice-libs/koffice-libs-1.9.98.6.ebuild
@@ -6,19 +6,24 @@ EAPI="2"
KMNAME="koffice"
KMMODULE="libs"
-
+OPENGL_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="Shared KOffice libraries."
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+crypt +openexr"
RDEPEND="
- >=app-office/koffice-data-${PV}:${SLOT}
+ >=app-office/koffice-data-${PV}:${SLOT}[kdeprefix=]
dev-libs/libxml2
dev-libs/libxslt
+ >=kde-base/kdepimlibs-${KDE_MINIMAL}[kdeprefix=]
>=media-libs/lcms-1.15
- >=media-libs/openexr-1.2.2-r2"
+ crypt? ( app-crypt/qca:2 )
+ openexr? ( media-libs/openexr )
+ opengl? ( media-libs/mesa )
+"
DEPEND="${RDEPEND}"
# doc? ( app-doc/doxygen )"
@@ -34,10 +39,9 @@ KMEXTRA="
tools/"
# doc/api/"
KMEXTRACTONLY="
- doc/koffice.desktop
- changes-1.4
- changes-1.5
- kchart/kdchart/"
+ doc/koffice.desktop"
+
+KMSAVELIBS="true"
src_prepare() {
sed -i \
@@ -47,8 +51,16 @@ src_prepare() {
kde4-meta_src_prepare
}
+src_configure() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with openexr OpenEXR)"
+ use crypt && mycmakeargs="${mycmakeargs}
+ -DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2"
+}
+
src_install() {
- dodoc changes-*
newdoc kounavail/README README.kounavail
kde4-meta_src_install
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index aeec3622ca5..d0284830344 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -567,23 +567,6 @@ kde4-base_src_configure() {
-DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin"
fi
- # additonal arguments for KOFFICE
- if [[ ${KMNAME} = koffice ]]; then
- case ${PN} in
- koffice-data) : ;;
- *)
- mycmakeargs="${mycmakeargs}
- -DWITH_OpenEXR=ON
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with opengl OpenGL)"
- if use crypt; then
- mycmakeargs="${mycmakeargs}
- -DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2"
- fi
- ;;
- esac
- fi
-
[ -e CMakeLists.txt ] && cmake-utils_src_configure
}
@@ -617,7 +600,8 @@ kde4-base_src_test() {
# Override this value, set in kde4-base_src_configure()
mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON"
- cmake-utils_src_compile
+ cmake-utils_src_configure
+ kde4-base_src_compile
cmake-utils_src_test
}
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 1e04e12e8c0..fc6f7561992 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -12,17 +12,6 @@
# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
-# we want opengl optional in each koffice package
-if [[ ${KMNAME} = koffice ]]; then
- case ${PN} in
- koffice-data)
- ;;
- *)
- OPENGL_REQUIRED=optional
- ;;
- esac
-fi
-
inherit kde4-base versionator
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
@@ -84,12 +73,16 @@ case ${KMNAME} in
RDEPEND="${RDEPEND} media-libs/lcms"
;;
*)
- IUSE="+crypt"
- DEPEND="${DEPEND} crypt? ( >=app-crypt/qca-2 )"
- RDEPEND="${RDEPEND} crypt? ( >=app-crypt/qca-2 )"
- if [[ $PN != koffice-libs ]]; then
- DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
- RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
+ DEPEND="${DEPEND}
+ dev-cpp/eigen:2
+ media-gfx/imagemagick
+ media-libs/fontconfig
+ media-libs/freetype:2
+ "
+ RDEPEND="${DEPEND}"
+ if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
+ DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
+ RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}[kdepreifx=]"
fi
;;
esac
@@ -282,9 +275,9 @@ kde4-meta_src_extract() {
kde4-base_src_unpack
fi
# fix koffice linking
- if [[ ${KMNAME} = koffice ]]; then
- koffice_fix_libraries
- fi
+ #if [[ ${KMNAME} = koffice ]]; then
+ #koffice_fix_libraries # in progress magic
+ #fi
}
# @FUNCTION: kde4-meta_create_extractlists
@@ -354,20 +347,6 @@ kde4-meta_create_extractlists() {
config-openexr.h.cmake
config-opengl.h.cmake
config-prefix.h.cmake"
- case ${PN} in
- koffice-libs|koffice-data)
- ;;
- *)
- # add basic extract for all packages
- KMEXTRACTONLY="${KMEXTRACTONLY}
- filters/
- libs/
- plugins/"
- if [[ ${PN} != kplato ]]; then
- KMEXTRA="${KMEXTRA} filters/${PN}"
- fi
- ;;
- esac
;;
esac
# Don't install cmake modules for split ebuilds, to avoid collisions.
@@ -572,6 +551,16 @@ kde4-meta_change_cmakelists() {
;;
esac
;;
+ koffice)
+ # prevent collisions
+ if [[ ${PN} != koffice-data ]]; then
+ sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
+ "${S}"/cmake/modules/CMakeLists.txt || \
+ die "${LINENO}: sed died in collision prevention section"
+ sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \
+ "${S}"/CMakeLists.txt || \
+ die "${LINENO}: sed died in collision prevention section"
+ fi
esac
popd > /dev/null
@@ -583,7 +572,7 @@ kde4-meta_change_cmakelists() {
# ebuilds.
kde4-meta_src_configure() {
debug-print-function ${FUNCNAME} "$@"
-
+
kde4-base_src_configure
}
@@ -619,12 +608,6 @@ kde4-meta_src_install() {
if [[ -n ${KMSAVELIBS} ]]; then
install_library_dependencies
fi
-
- # remove unvanted koffice stuff
- if [[ ${KMNAME} = koffice && ${PN} != koffice-data ]]; then
- rm "$D/$KDEDIR/include/config-openexr.h"
- rm "$D/$KDEDIR/share/apps/cmake/modules/FindKOfficeLibs.cmake"
- fi
}
# @FUNCTION: kde4-meta_src_make_doc
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-12 11:02:30 +0000