commit: 539a80042ba35bc8f79f7434a261ad987404795e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 20:43:33 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 17:29:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=539a8004
kde-apps/kde4-l10n: Make USE=minimal a no-op
Package-Manager: portage-2.2.28
kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild | 140 ++++++++++------------------
1 file changed, 48 insertions(+), 92 deletions(-)
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
index 29ff762..57b27d6 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
@@ -17,33 +17,24 @@ DEPEND="
sys-devel/gettext
"
RDEPEND="
- !minimal? ( !kde-apps/kde-l10n )
- minimal? ( >=kde-apps/kde-l10n-${PV} )
+ >=kde-apps/kde-l10n-${PV}
"
REMOVE_DIRS="${FILESDIR}/${PN}-16.04.1-remove-dirs"
REMOVE_MSGS="${FILESDIR}/${PN}-16.03.91-remove-messages"
-LV="4.14.3"
-LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB 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
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e
's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
MY_LANGS="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 sk sl sr sv tr ug uk wa zh_CN zh_TW"
+# TODO: Drop no-op +minimal in 16.08.x - necessary kde5.eclass change happened
after KF-5.23/Plasma-5.6.5
IUSE="+minimal test $(printf 'l10n_%s ' ${MY_LANGS//[@_]/-})"
URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
SRC_URI=""
-for MY_LANG in ${LEGACY_LANGS} ; do
- SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? (
${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
-done
-
for MY_LANG in ${MY_LANGS} ; do
SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? (
${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
done
@@ -64,10 +55,8 @@ pkg_setup() {
src_unpack() {
for my_tar in ${A}; do
- [[ ${my_tar} = *${PV}* ]] && local subdir="/4"
- use minimal && [[ ${my_tar} = *${LV}* ]] && continue
tar -xpf "${DISTDIR}/${my_tar}" --xz \
- "${my_tar/.tar.xz/}/CMakeLists.txt"
"${my_tar/.tar.xz/}${subdir}" 2> /dev/null ||
+ "${my_tar/.tar.xz/}/CMakeLists.txt"
"${my_tar/.tar.xz/}/4" 2> /dev/null ||
elog "${my_tar}: tar extract command failed at least
partially - continuing"
done
}
@@ -77,7 +66,7 @@ src_prepare() {
[[ -n ${A} ]] || return
# L10N=sr variants are subdirs within sr/ ...
- if use minimal && [[ -d "${KMNAME}-sr-${PV}" ]] ; then
+ if [[ -d "${KMNAME}-sr-${PV}" ]] ; then
for variant in "${KMNAME}"-sr-${PV}/4/sr/sr@*; do
mkdir -p "${KMNAME}-${variant##*/}-${PV}/4" ||
die "Failed to create L10N=${variant##*/}
subdir"
@@ -107,83 +96,50 @@ EOF
find -maxdepth 2 -type f -name CMakeLists.txt -exec \
sed -i -e "/add_subdirectory(5)/ s/^/#DONT/" {} + || die
- if use minimal; then
- einfo "Removing file collisions with Plasma 5 and Applications"
- use test && einfo "Tests enabled: Listing LINGUAS causing file
collisions"
-
- einfo "Directories..."
- while read path; do
- if use test ; then # build a report w/ L10N="*" to
submit @upstream
- local lngs
- for lng in ${MY_LANGS}; do
-
SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
- if [[ -d "${SDIR}"/${path%\
*}/${path#*\ } ]] ; then
- lngs+=" ${lng}"
- fi
- done
- [[ -n "${lngs}" ]] && einfo "${path%\
*}/${path#*\ }${lngs}"
- unset lngs
- fi
- if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null
2>&1; then
- sed -e "\:add_subdirectory(\s*${path#*\ }\s*):
s:^:#:" \
- -i ./*/4/*/${path%\ *}/CMakeLists.txt
|| \
- die "Failed to comment out ${path}"
- else
- einfo "F: ${path}" # run with L10N="*" to
cut down list
- fi
- done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
- einfo
- einfo "Messages..."
- while read path; do
- if use test ; then # build a report w/ L10N="*" to
submit @upstream
- local lngs
- for lng in ${MY_LANGS}; do
-
SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
- if [[ -e "${SDIR}"/messages/${path} ]]
; then
- lngs+=" ${lng}"
- fi
- done
- [[ -n "${lngs}" ]] && einfo "${path}${lngs}"
- unset lngs
- fi
- if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then
- rm ./*/4/*/messages/${path} || die "Failed to
remove ${path}"
- else
- einfo "F: ${path}" # run with L10N="*" to
cut down list
- fi
- done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
- else
- local LNG LDIR
- for LNG in ${LEGACY_LANGS}; do
- LDIR="${KMNAME}-${LNG}-${LV}"
- if [[ -d "${KMNAME}-${LNG}-${PV}" && -d "${LDIR}" ]] ;
then
- einfo "${LNG}: Adding legacy localisation"
- local dest_path
- # Step through directories alphabetically first
- for path in $(ls -R "${LDIR}" | grep ":$" | sed
-e 's/:$//') ; do
- dest_path="${path/${LV}/${PV}/4/${LNG}}"
- if [[ ! -d "${dest_path}" ]] ; then
- einfo " $(basename
${dest_path}) subdirectory"\
- "added to $(basename
$(dirname ${dest_path}))"
- mkdir "${dest_path}" || die
"Failed creating ${dest_path}"
- echo
"add_subdirectory($(basename ${dest_path}))" >> \
- $(dirname
"${dest_path}")/CMakeLists.txt
- fi
- done
- einfo " merging legacy localisation..."
- for path in $(find "${LDIR}" -type f) ; do
- dest_path="${path/${LV}/${PV}/4/${LNG}}"
- cp -rn "${path}" "${dest_path}" || die
"Failed copying ${path}"
- done
- # Disable kdepim
- for path in kdepim kdepimlibs kdepim-runtime ;
do
- find
"${S}/${KMNAME}-${LNG}-${PV}/4/${LNG}" -name CMakeLists.txt -type f -exec \
- sed -i -e "s:^
*add_subdirectory( *${path} *):# no ${path}:g" {} +
- done
- rm -rf "${LDIR}"
- fi
- done
- fi
+ einfo "Removing file collisions with Plasma 5 and Applications"
+ use test && einfo "Tests enabled: Listing LINGUAS causing file
collisions"
+
+ einfo "Directories..."
+ while read path; do
+ if use test ; then # build a report w/ L10N="*" to submit
@upstream
+ local lngs
+ for lng in ${MY_LANGS}; do
+ SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+ if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ;
then
+ lngs+=" ${lng}"
+ fi
+ done
+ [[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\
}${lngs}"
+ unset lngs
+ fi
+ if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
+ sed -e "\:add_subdirectory(\s*${path#*\ }\s*): s:^:#:" \
+ -i ./*/4/*/${path%\ *}/CMakeLists.txt || \
+ die "Failed to comment out ${path}"
+ else
+ einfo "F: ${path}" # run with L10N="*" to cut down
list
+ fi
+ done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
+ einfo
+ einfo "Messages..."
+ while read path; do
+ if use test ; then # build a report w/ L10N="*" to submit
@upstream
+ local lngs
+ for lng in ${MY_LANGS}; do
+ SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+ if [[ -e "${SDIR}"/messages/${path} ]] ; then
+ lngs+=" ${lng}"
+ fi
+ done
+ [[ -n "${lngs}" ]] && einfo "${path}${lngs}"
+ unset lngs
+ fi
+ if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then
+ rm ./*/4/*/messages/${path} || die "Failed to remove
${path}"
+ else
+ einfo "F: ${path}" # run with L10N="*" to cut down
list
+ fi
+ done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
}
src_configure() {
