diff options
author | Johannes Huber <johu@gentoo.org> | 2015-01-29 19:50:30 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2015-01-29 19:50:30 +0000 |
commit | 4ef13c346aacc96573e786eeae94fb4b36f37fed (patch) | |
tree | e6463fc60ca7ecaf89fe9330c696f2397cc072be /kde-base | |
parent | Convert to CPU_FLAGS_X86. (diff) | |
download | gentoo-2-4ef13c346aacc96573e786eeae94fb4b36f37fed.tar.gz gentoo-2-4ef13c346aacc96573e786eeae94fb4b36f37fed.tar.bz2 gentoo-2-4ef13c346aacc96573e786eeae94fb4b36f37fed.zip |
Revision bump. Upstream patchs add lithuania to euro zone, spotted by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>, bug #534280.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdebase-data/ChangeLog | 13 | ||||
-rw-r--r-- | kde-base/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch | 40 | ||||
-rw-r--r-- | kde-base/kdebase-data/kdebase-data-4.12.5.ebuild | 4 | ||||
-rw-r--r-- | kde-base/kdebase-data/kdebase-data-4.14.3-r1.ebuild | 40 | ||||
-rw-r--r-- | kde-base/kdebase-data/kdebase-data-4.14.3.ebuild | 4 |
5 files changed, 95 insertions, 6 deletions
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog index 52d6665a7e1a..73ddf3274d14 100644 --- a/kde-base/kdebase-data/ChangeLog +++ b/kde-base/kdebase-data/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/kdebase-data -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.340 2014/12/11 15:45:01 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.341 2015/01/29 19:50:30 johu Exp $ + +*kdebase-data-4.14.3-r1 (29 Jan 2015) + + 29 Jan 2015; Johannes Huber <johu@gentoo.org> + +files/kdebase-data-4.14.3-lithuania-euro.patch, + +kdebase-data-4.14.3-r1.ebuild, kdebase-data-4.12.5.ebuild, + kdebase-data-4.14.3.ebuild: + Revision bump. Upstream patchs add lithuania to euro zone, spotted by Andreas + Sturmlechner <andreas.sturmlechner@gmail.com>, bug #534280. 11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -kdebase-data-4.14.2.ebuild: Remove KDE SC 4.14.2 diff --git a/kde-base/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch b/kde-base/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch new file mode 100644 index 000000000000..503ed916c0b1 --- /dev/null +++ b/kde-base/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch @@ -0,0 +1,40 @@ +commit 9236eedec44b58434fdcc7d398e32909a80207ff +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 1 15:41:24 2015 +0100 + + Welcome Lithuania to the euro users + +diff --git a/localization/currency/eur.desktop b/localization/currency/eur.desktop +index 2ffb763..09ed064 100644 +--- a/localization/currency/eur.desktop ++++ b/localization/currency/eur.desktop +@@ -91,4 +91,4 @@ CurrencyIntroducedDate=1999,01,01 + #CurrencySubunitsInCirculation=true + #CurrencySubunitsPerUnit=100 + #CurrencyDecimalPlacesDisplay=2 +-CurrencyCountriesInUse=AT,BE,CY,FI,FR,DE,EE,GR,IE,IT,LU,LV,MT,NL,PT,SK,SI,ES,MC,SM,VA,AD,ME,ZW ++CurrencyCountriesInUse=AT,BE,CY,FI,FR,DE,EE,GR,IE,IT,LT,LU,LV,MT,NL,PT,SK,SI,ES,MC,SM,VA,AD,ME,ZW + +commit d8e2b2cecaf5fed5e965534eacff35324bebd4fa +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 1 15:59:17 2015 +0100 + + Lats cirulation ended on 14 Jan 2014 + +diff --git a/localization/currency/lvl.desktop b/localization/currency/lvl.desktop +index 076bb8e..158c68c 100644 +--- a/localization/currency/lvl.desktop ++++ b/localization/currency/lvl.desktop +@@ -83,9 +83,9 @@ CurrencySubunitSingular=santims + CurrencySubunitPlural=santimi + CurrencyIntroducedDate=1993,01,01 + #CurrencySuspendedDate= +-#CurrencyWithdrawnDate= ++CurrencyWithdrawnDate=2014,01,14 + #CurrencySubunits=1 + #CurrencySubunitsInCirculation=true + #CurrencySubunitsPerUnit=100 + #CurrencyDecimalPlacesDisplay=2 +-CurrencyCountriesInUse=LV ++CurrencyCountriesInUse= + diff --git a/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild b/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild index 67ad7b3b08fe..509512e5888d 100644 --- a/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild +++ b/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild,v 1.7 2014/12/07 12:38:57 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.12.5.ebuild,v 1.8 2015/01/29 19:50:30 johu Exp $ EAPI=5 diff --git a/kde-base/kdebase-data/kdebase-data-4.14.3-r1.ebuild b/kde-base/kdebase-data/kdebase-data-4.14.3-r1.ebuild new file mode 100644 index 000000000000..c28819fe243a --- /dev/null +++ b/kde-base/kdebase-data/kdebase-data-4.14.3-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.14.3-r1.ebuild,v 1.1 2015/01/29 19:50:30 johu Exp $ + +EAPI=5 + +KMNAME="kde-runtime" +KMNOMODULE="true" +inherit kde4-meta + +DESCRIPTION="Icons, localization data and various .desktop files from kdebase" +IUSE="+wallpapers" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + wallpapers? ( $(add_kdebase_dep kde-wallpapers) ) + x11-themes/hicolor-icon-theme +" + +KMEXTRA=" + l10n/ + localization/ + pics/ +" +# Note that the eclass doesn't do this for us, because of KMNOMODULE="true". +KMEXTRACTONLY=" + config-runtime.h.cmake + kde4 +" + +PATCHES=( "${FILESDIR}/${P}-lithuania-euro.patch" ) + +src_configure() { + # Remove remnants of hicolor-icon-theme + sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \ + -i pics/CMakeLists.txt \ + || die "failed to remove remnants of hicolor-icon-theme" + + kde4-meta_src_configure +} diff --git a/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild b/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild index 480b2bf5e94b..4816e0b4f78d 100644 --- a/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild +++ b/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild,v 1.3 2014/12/11 13:05:56 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.14.3.ebuild,v 1.4 2015/01/29 19:50:30 johu Exp $ EAPI=5 |