From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7B64138350 for ; Sun, 26 Apr 2020 17:20:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27017E08AD; Sun, 26 Apr 2020 17:20:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EC93E08AD for ; Sun, 26 Apr 2020 17:20:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEA4A34F832 for ; Sun, 26 Apr 2020 17:20:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F31F71B4 for ; Sun, 26 Apr 2020 17:20:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587921600.1bb6fcb6bf65eed559d7b7a4958643c36f48b369.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1bb6fcb6bf65eed559d7b7a4958643c36f48b369 X-VCS-Branch: master Date: Sun, 26 Apr 2020 17:20:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19da87bc-f529-49ad-b65f-1ce8ed65fb4b X-Archives-Hash: fcefefd25c352d4ec4ccea0023fc5f02 commit: 1bb6fcb6bf65eed559d7b7a4958643c36f48b369 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 26 14:46:46 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 26 17:20:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bb6fcb6 ecm.eclass: Revert "Disable overzealous upstream disable-deprecated-before" No longer necessary as upstream devs saw the problem with that and largely diffused these. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 5724c74500..12b31e4ef3 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -423,14 +423,8 @@ ecm_src_prepare() { done fi + # limit playing field of locale stripping to kde-*/ categories if [[ ${CATEGORY} = kde-* ]] ; then - # overzealous upstream disable-deprecated-before by .git dir detection - if [[ -e .git ]]; then - sed -e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/$/ # removed by ecm.eclass/" \ - -e "/^if.*EXISTS.*CMAKE_SOURCE_DIR.*\.git/s/(.*)/(FALSE)/" \ - -i CMakeLists.txt || die - fi - # always install unconditionally for kconfigwidgets - if you use # language X as system language, and there is a combobox with language # names, the translated language name for language Y is taken from