public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/
Date: Sat, 25 Mar 2017 17:07:23 +0000 (UTC)	[thread overview]
Message-ID: <1490461410.0251fc087ce5b1e3cc6999341437f09055c6f23c.asturm@gentoo> (raw)

commit:     0251fc087ce5b1e3cc6999341437f09055c6f23c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 17:03:30 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 17:03:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0251fc08

kde-apps/kde4-l10n: Fix file collision w/ kde-plasma/plasma-desktop-5.9.4

Reported-by: Sabayon

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs  |  26 +++++
 kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild    | 114 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs
new file mode 100644
index 0000000000..c1827c7aee
--- /dev/null
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.12.3-remove-dirs
@@ -0,0 +1,26 @@
+# Disable any subdirectories listed here. Comments are ignored
+# First argument: parent directory
+# Second argument: which subdirectory to disable in CMakeLists.txt
+# kde-l10n 5
+docs/kde-runtime glossary
+docs/kde-runtime khelpcenter
+docs/kdesdk umbrello
+scripts kdeedu
+# Plasma 5
+docs/kde-runtime fundamentals
+docs/kde-runtime kdesu
+docs/kde-runtime khelpcenter
+docs/kde-runtime knetattach
+docs/kde-runtime onlinehelp
+docs/kde-runtime/kcontrol bookmarks
+docs/kde-runtime/kcontrol cookies
+docs/kde-runtime/kcontrol ebrowsing
+docs/kde-runtime/kcontrol emoticons
+docs/kde-runtime/kcontrol icons
+docs/kde-runtime/kcontrol kcmcgi
+docs/kde-runtime/kcontrol kcm_ssl
+docs/kde-runtime/kcontrol nepomuk
+docs/kde-runtime/kcontrol smb
+docs/kde-runtime/kcontrol trash
+docs/kde-runtime/kcontrol useragent
+scripts kdebase

diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild
new file mode 100644
index 0000000000..cc1656c3b5
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.03.80-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+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
+	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
+)
+KMNAME="kde-l10n"
+inherit kde5
+
+DESCRIPTION="KDE legacy internationalization package"
+
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	kde-frameworks/kdelibs:4
+	sys-devel/gettext
+"
+RDEPEND="
+	>=kde-apps/kde-l10n-${PV}
+"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.11.90-remove-messages"
+
+IUSE="aqua test" # TODO: Drop aqua as soon as possible
+
+pkg_setup() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "None of the requested L10N are supported by ${P}."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${KDE_L10N[@]}"
+		elog
+	fi
+	[[ -n ${A} ]] && kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	[[ -n ${A} ]] || return
+
+	einfo "Removing file collisions with Plasma 5 and Applications"
+	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
+	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
+
+	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 $(kde_l10n2lingua ${KDE_L10N[@]}); 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 $(kde_l10n2lingua ${KDE_L10N[@]}); 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() {
+	local mycmakeargs=(
+		-DBUILD_docs=$(usex handbook)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() { :; }
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}


             reply	other threads:[~2017-03-25 17:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-25 17:07 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-08-12 15:48 [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/files/, kde-apps/kde4-l10n/ Andreas Sturmlechner
2017-07-13 20:18 Andreas Sturmlechner
2017-07-13 20:07 Andreas Sturmlechner
2017-03-25 17:07 Andreas Sturmlechner
2016-07-25 15:30 Michael Palimaka
2016-07-15  6:16 Johannes Huber
2016-07-13 18:23 Johannes Huber
2016-04-07 19:19 Michael Palimaka
2016-03-29 19:23 Alexey Shvetsov
2016-03-20 20:43 Johannes Huber
2015-08-19 22:28 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1490461410.0251fc087ce5b1e3cc6999341437f09055c6f23c.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox