commit: 2793fd9e33eeb0bbba5fa593c569fae69874b7ae
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Nov 22 19:41:07 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 20:17:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2793fd9e
kde-apps/kdepim-l10n: Fix install w/o anything to install
But also add checks to identify empty L10N.
closes #2893
Gentoo-bug: 600312
Package-Manager: portage-2.3.0
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/kdepim-l10n/Manifest | 1 -
kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild | 40 +++++++++++++++----------
2 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/kde-apps/kdepim-l10n/Manifest b/kde-apps/kdepim-l10n/Manifest
index d05ef1b..96c913d 100644
--- a/kde-apps/kdepim-l10n/Manifest
+++ b/kde-apps/kdepim-l10n/Manifest
@@ -96,7 +96,6 @@ DIST kde-l10n-ia-16.04.3.tar.xz 1402996 SHA256
e2558cae1d62d55a024fc4e77471063d1
DIST kde-l10n-ia-16.08.3.tar.xz 1414860 SHA256
f122a4f9c6b454db21663486b3ce9bc0acf86eb2d006c541b75e2db5b84cbb32 SHA512
b48ff49440290480bf8fbba237c8d31a47f945887be2b96455bd2ce779a6f755f8a16ed43bbcae58183d3f3af73f20d985f46f9c3bbe5fd1385fbbd5b8655399
WHIRLPOOL
fceb679d060589b356eb06aa60e200fa2f402c67920f1e29c30eb2d4d62b5106c04e4f30ee7937f122abcd67427415ccf90c69ddd3ff8756b4838de3806b04ae
DIST kde-l10n-ia-4.14.3.tar.xz 1463128 SHA256
cce74cab4f7195e4095e2a89a95f22fad107489c460dbc0c8f9b82fd3c8c6af9 SHA512
99bf9b47bdbb68d08db108f7060024516c55f4a5f4c91b13e25be5428e11ac41a87db21ecd21af120809f6ad872b70e3c10b904bc0d26111bd8545630a9f30cc
WHIRLPOOL
c037cd50f6c3f9e703123a69ebb7883fd842ec05b2f9ce9c97327005e213463ef5757741634eee76600c5cecf3e7c985c12445a51bcf421090963c4907645826
DIST kde-l10n-id-16.04.3.tar.xz 561052 SHA256
84c35f52b9ce2afdbbd6bc88e641368b696a4ce623f3acd2f559eef0237a5752 SHA512
83b20be54612b9bb602d1c8ee68fdebcb58398afd6f387b46bf444518cac6279303ea0e14dd7973ad88b2aa40c5a2f569de4f5d48f3701fd0ae0a465719f69b1
WHIRLPOOL
c3d1b208c532baf0e8d7b89a6bf2b69fa7af921ae60185336e36896c74ba24255fe47b887182bc1d56cfcb9d69cecac743e0ddccb564d489e236ca8abf56950a
-DIST kde-l10n-id-16.08.3.tar.xz 561312 SHA256
215afdc4370383b026d5b8e3df1e896d4eb402de2dd131143bdf1941cf10e3ff SHA512
d9766f364c1fd4fc3ab5bd6a0c34fb1f518c938294c76060d8291bc8c4389f8dd3369b08ba2b0c92f54a328c9ad5e6e9043f396093f4c0ea1e309af567f10e48
WHIRLPOOL
872087237fea0193e30be5571407cce453c93c8867a3346f0f6b67049ddc2f10a26572bbc77db7d84b4e8587160605de50468f95cae301a9052c0f2a3d4e58f7
DIST kde-l10n-id-4.14.3.tar.xz 530036 SHA256
fd5866818bdd1f119554da06f454fa3a2608613e820a4b00dbea8cc378a41fe9 SHA512
e551d697eeca22c4a33e79fb622471fb056a2ca85422559e4d2ed231dd53d57d30dd0cff1c4d371b4f3b9e756be1ebf8bdc3ad69225701cfb75562d241ad194e
WHIRLPOOL
b0864dde2ecdf7e66e9a4fd19d8dc41fcd96bd1ce399ca2d64466eff1efa6f07a372bf21c13c03fbe79d99035507761c7e4070cd84e408ff18b3d9afa57f72ff
DIST kde-l10n-id-4.4.5.tar.bz2 352302 SHA256
a6932808b1f27fab2c5f05090742854b2524ee832ccad8405be076b21cb344b7 SHA512
ae8b51aa699e7290eef03fa1cec155331da69402b2bd499a3f57a8ae6eab58ceff89ef3a4ffbc18dbdda848c2b9d0a7dc05e2f34c4dac2ff2e873e2ddda09647
WHIRLPOOL
2817412df03746168b1358e18abf578c5787d20042c662b4c6e814091d1755eb94f1f61cfee452120f24cc6529e19f949e8fbeea75a46165ce780c0349bccfab
DIST kde-l10n-is-16.04.3.tar.xz 1794496 SHA256
4c938b15d177fca8a1b8035e71d0b67c2e5710504ccda9d7c314a01cc051c776 SHA512
07cf392ae507d21f930170282ef8169b6b7188a7220837149a87989df7fc4826d5c6164ae12f7565d2ae697a559bf6baf22e6712047f70ddc932d85006cd1d5c
WHIRLPOOL
0c0c14222d0371541b9cd819027ef036febd50b9fe88a07945d4bab73e4b7138955e0cb816f1d691d00c4d7a8e5f67a2b506d1e945f29c527bee7e60721a4cc3
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
b/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
index 42970ea..9a572c1 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-16.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
KDE_HANDBOOK="optional"
KDE_L10N=(
ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga
gl he
- hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR
ro ru
+ hi hr hu ia is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
)
KMNAME="kde-l10n"
@@ -49,31 +49,41 @@ src_prepare() {
# Handbook optional
find -type f -name CMakeLists.txt -exec \
sed -i -e "/find_package.*KF5DocTools/ s/ REQUIRED//" {} + ||
die
- if ! use handbook ; then
- find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec
\
- sed -i -e '/add_subdirectory(docs)/ s/^/#DONT/' {} + ||
die
- fi
+ # Disable all by default, pim dirs are added manually if found
+ find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec \
+ sed -i -e '/^add_subdirectory/ s/^/#ONLYPIM/' {} + || die
# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
for lng in ${KDE_L10N[@]}; do
- local dir sdir
- dir="kde-l10n-$(kde_l10n2lingua ${lng})-${PV}"
- sdir="${S}/${dir}/5/$(kde_l10n2lingua ${lng})"
- if [[ -d "${dir}" ]] ; then
- einfo " L10N: ${lng}"
+ local sdir="${S}/kde-l10n-$(kde_l10n2lingua
${lng})-${PV}/5/$(kde_l10n2lingua ${lng})"
+ if [[ -d "${sdir}" ]] ; then
+ local gotpim=false
+ einfo "L10N: ${lng}"
for subdir in data docs messages scripts ; do
if [[ -d "${sdir}/${subdir}" ]] ; then
- einfo " ${subdir} subdirectory"
- echo >
"${sdir}/${subdir}/CMakeLists.txt"
+ rm "${sdir}/${subdir}/CMakeLists.txt"
|| die
+ local pim
for pim in ${PIM_L10N}; do
- [[ -d
"${sdir}/${subdir}/${pim}" ]] && \
- ( echo
"add_subdirectory(${pim})" >> "${sdir}/${subdir}/CMakeLists.txt" )
+ if [[ -d
"${sdir}/${subdir}/${pim}" ]]; then
+ echo
"add_subdirectory(${subdir}/${pim})" >> "${sdir}/CMakeLists.txt"
+ gotpim=true
+ fi
done
fi
done
+ if ! ${gotpim}; then
+ einfo "F: ${lng} contains no KDE PIM
translations and should be dropped"
+ sed -e "/kde-l10n-$(kde_l10n2lingua
${lng})-${PV}/ s/^/#WRONG/" \
+ -i CMakeLists.txt || die "Failed to
disable no-op ${lng}"
+ fi
fi
done
+
+ if ! use handbook ; then
+ find -mindepth 4 -maxdepth 4 -type f -name CMakeLists.txt -exec
\
+ sed -i -e '/^add_subdirectory(docs/ s/^/#DONT/' {} + ||
die
+ fi
}
src_configure() {
@@ -89,5 +99,5 @@ src_test() {
}
src_install() {
- [[ -n ${A} ]] && kde5_src_install
+ [[ $(grep -sc "^add" CMakeLists.txt) -gt 0 ]] && kde5_src_install
}
