diff options
| author |   Peter Asplund <peter.azp@gmail.com> | 2013-12-02 22:57:03 +0100 |
|---|---|---|
| committer | Peter Asplund <peter.azp@gmail.com> | 2013-12-02 22:57:03 +0100 |
| commit | e485e0544eb4d13b1172b059189ea5a3b0581a1c (patch) | |
| tree | 640999c7d6d69abc5d9f827913bde2b345d3f0d5 | |
| parent | Add glxtrace-only patch so multilib builds (diff) | |
| download | AzP-e485e0544eb4d13b1172b059189ea5a3b0581a1c.tar.gz AzP-e485e0544eb4d13b1172b059189ea5a3b0581a1c.tar.bz2 AzP-e485e0544eb4d13b1172b059189ea5a3b0581a1c.zip | |
Move swedish layout to extras
5 files changed, 28 insertions, 19 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 848e6b9..ca6eedf 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.192 2013/10/08 05:09:09 ago Exp $ + 02 Dec 2013; Peter Asplund <peterasplund@gentoo.se> xkeyboard-config-2.10.1-r1.ebuild: + Move Svorak A5 layout to extras by request of upstream + 26 Oct 2013; Peter Asplund <peterasplund@gentoo.se> xkeyboard-config-2.10.1-r1.ebuild: Add Svorak A5 layout, wrt bug #486978 diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index f130442..8036ec7 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,6 +1,6 @@ AUX xkeyboard-config-2.10.1-r1_svoraka5.patch 3121 SHA256 a5ec56389737b71230df4eb8589ae6f129bd305a9527620842bc8d8b8b8e8026 SHA512 f4db6e93741694b8598e1226af30aafb0868974a4bfdc16e650f89e0b0ca5031a92255a6a1df532c34e950691318db76c83becc2b1a098996cfc02c5ae700df5 WHIRLPOOL dfaaa69bb35dcc7c2871302d55c821dca010d959066e4a75db9e3f43486ef33c803144307ba1bb7ad729961d48c6c3eda0477b7d98540cd468c3bcd6a0134876 -AUX xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch 539 SHA256 899b1a8fc9621371c9800df5995da7b9a46240ff7b2f59b8f27459ad264a8e94 SHA512 becf88f5f9702aded597dc2ea965f44b3cd0a0501494f0c44f751746d7837370673cbac08b2562d83b56754703ae42d0538d376ab14a03edf330fe67877a71c3 WHIRLPOOL deaed40aa359488369c8706c2f7186f3b992e0ba93ae64e02b95c7ae066d3b5bd3cd98d839b743921234f2918d7466f140de2f18680e20f8859ab1f60f150d67 +AUX xkeyboard-config-2.10.1-r1_svoraka5_baseextrasxml.patch 647 SHA256 ec6a5c13d0f24e88bdb36cea892baacf3b2b94ca94bdc0763c21c941f1adbd8e SHA512 ab44b94bcda403330a07b94558ca6c2dc0ac9b1e8fda3b2acc9e2ee9ef0cb738065cb97795075d56daff3cf1235bbf40bfe56cd3a64db122e9682222cbd094be WHIRLPOOL 75be6cb3d10a43f92d01a40c1111fc688e597c209609a96e84cbbc78eaba528808dd35660a488932020cdaaafaa0399a6c36efedccc18e6cbd7d1faf5184a55d DIST xkeyboard-config-2.10.1.tar.bz2 908897 SHA256 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b SHA512 e21927e365f4742d710bf414c312a9bcaf46d881ee274f1baa0a288339477fa8aa24c338473f96ec658133205f21db43d1737d6c59c77999344244c43cff1be2 WHIRLPOOL 6a9b48b57b70245c9d1db1695e380848268a8125c735324c178faf88086f2827192997db7dfb2b2824c71ee771d93355d5efcfe2a4dba39f902ea784455e00bf -EBUILD xkeyboard-config-2.10.1-r1.ebuild 1465 SHA256 c53a2456f740356a2390f349cc5a63b2cb203c6aa0e8191a2184a382c873899c SHA512 3824493156a10c086b8795f9591b88f62988ba06a22910afda67594bf6f37827ec20acaa5ce132d2cdf909ce5c2a3b064951ad2921c370c2c3810b8b18b465a5 WHIRLPOOL 4abf6c71c0f79cfd611652b46bfc5bab063bb73c27213e84d0a7cf98a8dee75246bedc4370a33a4ce323f43b44e15467f4d0c907f4f06498b03e047c8d9229a9 -MISC ChangeLog 27288 SHA256 d0f3f73e5097c159508cf1334a4f3e287bccebc10697b9c24003fe9899f89ae9 SHA512 7046dd37df969ddf4dd119b347e7deeb4788385728ee4515d507d9f1e5ba33d3f4076366f1f6b67dd0551e67f20c4f78f6b521d9a7c306a3a03799d7bc943923 WHIRLPOOL 7d4cac01897302ca69cecccde001471a8267af04c3e56215042bc211ad6e55a621e8637ea38a00e3560d407db19a77cd2532137bb9bea3cb127e97c80db14871 +EBUILD xkeyboard-config-2.10.1-r1.ebuild 1471 SHA256 7e062aa9ade1a86c363b00c1e3a48b39fb6a15aee47332d27dd8ae443c9d7043 SHA512 6dfd02257a8965c7351c4bc93eb4e986ef2a29b1072458a751c26d373c66db7057fbc74bd6d27cc86685cd673a4a0e02dad9d128cb684cc03ac957715bba2f8b WHIRLPOOL b8ef1c9d35bcd7046eb4fd84df8dcc428c2feba56cfc781ae669e4341c34ee186a6656f4e549e73604df5d9ec8941f8247d93d264987288882a20088fa06433a +MISC ChangeLog 27435 SHA256 0ae0c345d96658921796bf42398986ad63def9c02b6c93797cc9730ecabdd683 SHA512 443b5ba97af6a0b33acb6f4d832eb4b2433115f431a3066f3fce5588b45dc6355ab28fcf4ca09cec082e1d3390c95bfced2951e7d1a6010b7215b63b7c93e967 WHIRLPOOL f5772b3e370bb6b71ad661993a8f3ddf85e0e1193ce6a04908a07b0fc8392ee454714b16f00515c911164f96702b9a30f07daef809791b66b762bb6fbd31f708 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93 diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_baseextrasxml.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_baseextrasxml.patch new file mode 100644 index 0000000..7cc33e6 --- /dev/null +++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_baseextrasxml.patch @@ -0,0 +1,21 @@ +--- rules/base.extras.xml 2013-12-02 22:42:01.412960467 +0100 ++++ rules/base.extras.xml 2013-12-02 22:41:59.192960333 +0100 +@@ -679,8 +679,16 @@ + <name>se</name> + <shortDescription>sv</shortDescription> + <description>Swedish</description> +- </configItem> +- <variantList> ++ </configItem> ++ <variantList> ++ <variant> ++ <configItem> ++ <name>dvorak_a5</name> ++ <description>Swedish (Dvorak A5)</description> ++ </configItem> ++ </variant> ++ </variantList> ++ <variantList> + <variant> + <configItem> + <name>sun_type6</name> diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch deleted file mode 100644 index 5921c12..0000000 --- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- rules/base.xml.in 2013-08-26 00:29:54.000000000 +0200 -+++ rules/base.xml.in_new 2013-10-26 18:44:49.130801519 +0200 -@@ -4561,6 +4561,12 @@ - </variant> - <variant> - <configItem> -+ <name>dvorak_a5</name> -+ <_description>Swedish (Dvorak A5)</_description> -+ </configItem> -+ </variant> -+ <variant> -+ <configItem> - <name>rus</name> - <!-- Keyboard indicator for Russian layouts --> - <_shortDescription>ru</_shortDescription> diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild index 7301212..9789823 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild @@ -34,7 +34,7 @@ XORG_CONFIGURE_OPTIONS=( ) src_prepare() { - epatch "${FILESDIR}/${P}-r1_svoraka5_basexml.patch" + epatch "${FILESDIR}/${P}-r1_svoraka5_baseextrasxml.patch" epatch "${FILESDIR}/${P}-r1_svoraka5.patch" xorg-2_src_prepare if [[ ${XORG_EAUTORECONF} != no ]]; then |