diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-08-15 19:20:10 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-08-15 19:20:10 +0000 |
| commit | beb6f1cd17d47f2181c2ac92d03e39fbcb4be62c (patch) | |
| tree | b20ec4ee2265e81ee7fb52309345eda33534a4e2 /kde-base/kde-l10n | |
| parent | Bump patchset to include ia64 patches from bug 471622 and bug 471624, thanks ... (diff) | |
| download | gentoo-2-beb6f1cd17d47f2181c2ac92d03e39fbcb4be62c.tar.gz gentoo-2-beb6f1cd17d47f2181c2ac92d03e39fbcb4be62c.tar.bz2 gentoo-2-beb6f1cd17d47f2181c2ac92d03e39fbcb4be62c.zip | |
Fix file collisions wrt bug #481106.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base/kde-l10n')
| -rw-r--r-- | kde-base/kde-l10n/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kde-l10n/kde-l10n-4.11.0.ebuild | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog index 83a78ac0d71f..31da4b1a65e2 100644 --- a/kde-base/kde-l10n/ChangeLog +++ b/kde-base/kde-l10n/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kde-l10n # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.201 2013/08/14 20:23:18 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.202 2013/08/15 19:20:10 kensington Exp $ + + 15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde-l10n-4.11.0.ebuild: + Fix file collisions wrt bug #481106. *kde-l10n-4.11.0 (14 Aug 2013) diff --git a/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild b/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild index 19ac01340c78..79730b4c4f8b 100644 --- a/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild +++ b/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild,v 1.1 2013/08/14 20:23:18 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.11.0.ebuild,v 1.2 2013/08/15 19:20:10 kensington Exp $ EAPI=5 @@ -65,6 +65,9 @@ src_prepare() { find "${S}" -name CMakeLists.txt -type f \ -exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} + + # bug 481106, please remove in 4.11.1 and later + use linguas_pl && rm "${S}"/${PN}-pl-${PV}/messages/kde-runtime/{accountwizard*,akonadi_*}.po + kde4-base_src_prepare } |