Port 4.6.3-r1 to libxklavier-5.0 API.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 14 insertions, 8 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index b77190a84e90..2d3303701e2a 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.33 2010/02/15 12:18:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.34 2010/02/15 12:26:04 ssuominen Exp $
+
+  15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.6.3-r1.ebuild:
+  Port 4.6.3-r1 to libxklavier-5.0 API.
 
 *xfce4-settings-4.7.1 (15 Feb 2010)
 
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index b8af63bf39d0..c0ece3a64a11 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,12 +1,12 @@
 AUX xfce4-settings-4.6.3-Xi.patch 3446 RMD160 7ac843fc0939fa5c26ea00d9e073824e3e27a088 SHA1 3b9cd3623e9d4a9830075d54e49d7d5e63ea67cf SHA256 b28e940ae81087ea9cc7d15584b6a0ce4d329436dc513652b4fa81807d53160c
 AUX xfce4-settings-4.6.3-exo.patch 677 RMD160 cfd4cd31df25e62babea9d197c9bfbfd02d0df41 SHA1 27dc3571bdb8a6f63de8c4e0d24be17b5f000c3b SHA256 06be2fa459411bb42a03b49fb27bc8ae07d084e85995f6671f721aa750e4e4ae
-AUX xfce4-settings-4.7.1-libxklavier.patch 1247 RMD160 b1a80034634e3304fbe4435d2bc6fc858dd4eeb5 SHA1 e88409c8f89d67c9cb6f6dd57c9f2cc0439417f2 SHA256 51248be1115e934a8075bbe0873137c56b475da577325c5d97d6540ca723f0fe
+AUX xfce4-settings-4.7.1-libxklavier.patch 1448 RMD160 ef016d0f3d916bf571c19aa02d2bfa3f98493aa7 SHA1 a96be6f9e08ef3a559290e62d3bdc1232a4119c8 SHA256 5185c02b05542796828a3bf39a2b6d5acb005e164822c2acd460ce9ad67f64e6
 DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
 DIST xfce4-settings-4.7.0.tar.bz2 550655 RMD160 3d8d9c013264091ecccd7adf4230cb626957b0db SHA1 7e5fcdc74e2fdcd13f3d8f8fd077497aaa52950d SHA256 4d547c885871a08bd6d211998c43c913b49fb1ae700e4ee03b6fd7252a146c0e
 DIST xfce4-settings-4.7.1.tar.bz2 557670 RMD160 30d72e732068342ed4ec575d7bb538aae67a827e SHA1 d213664f358ff41693006cd17d3941551317084b SHA256 1f1ea56985b9207f44ae9c7922344edcfd51cba8f2db6861306affa937039500
-EBUILD xfce4-settings-4.6.3-r1.ebuild 1514 RMD160 3f2bf9934eb1ac80e1082856b00395503910d1d9 SHA1 81c86856e49b2e0cbec46175a0fc315eda0a86d9 SHA256 700e82f064417ee9899c585c48ab215962b7fd26870aac1e2d1f483bf6d6aa28
+EBUILD xfce4-settings-4.6.3-r1.ebuild 1560 RMD160 f9f1114a7ba233b13340565ec09e7c7a6d5bd598 SHA1 d413c363abf4ed6c6518fe4ffc89614e6c1635f1 SHA256 6377fbaace66a35439b9661c26359524e3f050089ab75ebad250d413e43e65e5
 EBUILD xfce4-settings-4.6.3.ebuild 1473 RMD160 528aaa3e7584502230a446b5f125a37cbb7a7060 SHA1 f2856d8c69613fbd67417806fc92140b5d47c0aa SHA256 98399319e2f11585fb030d07a7bbf733dbe8f8d5740f9a97df8f1ae1c4e08e99
 EBUILD xfce4-settings-4.7.0.ebuild 1424 RMD160 14fb4cfeba636777ac51704b04ede9f7b9a48d1c SHA1 806dcb79e93e272832915538130b120b5668ac58 SHA256 6b4e016775301c1b97dbc1664933bbd0bfae93eaa1d70e095daecdbe92ab031f
 EBUILD xfce4-settings-4.7.1.ebuild 1490 RMD160 549307fe9daf2046dd685f7098ceac4df3075885 SHA1 c864e06ba6bc493801be63fbaa45604bf1a93d2e SHA256 63529b83c5ef756e2f5f3c53730017b25d3dbba4d625977aea0f344806aca249
-MISC ChangeLog 4886 RMD160 20180c29c824ab0a6a20877f2fdf639728e24e57 SHA1 82a3fa9014d918fa1e385ff11282b243fe731cd6 SHA256 089e0785ee29a06cce8105626c217a71786a862c4ffdc01960c59b9cd178061d
+MISC ChangeLog 5015 RMD160 7b124a6b860291e61ba3bf36adbfd269d99b72aa SHA1 6abdd0dd504fbcb4ee3e82c2e688bf70ca477368 SHA256 9fa2751ff0ea66d7fa3be3c20a1d5a37a49fa4f773e5672c9e318dd191286b05
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
index 2eecdfd98e40..142932c8940a 100644
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch
@@ -1,5 +1,6 @@
---- configure.ac
-+++ configure.ac
+diff -ur xfce4-settings-4.7.1.orig/configure.ac xfce4-settings-4.7.1/configure.ac
+--- xfce4-settings-4.7.1.orig/configure.ac	2010-01-23 13:48:05.000000000 +0200
++++ xfce4-settings-4.7.1/configure.ac	2010-02-15 14:20:55.000000000 +0200
 @@ -142,6 +142,8 @@
                             [libxklavier], [Keyboard layout selection])
  XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild
index 98c4abcd2b35..6078cd2c46cc 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild,v 1.3 2010/02/15 12:19:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3-r1.ebuild,v 1.4 2010/02/15 12:26:04 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -47,5 +47,6 @@ pkg_setup() {
 		$(use_enable debug)"
 	DOCS="AUTHORS ChangeLog NEWS TODO"
 	PATCHES=( "${FILESDIR}/${P}-exo.patch"
-		"${FILESDIR}/${P}-Xi.patch" )
+		"${FILESDIR}/${P}-Xi.patch"
+		"${FILESDIR}/${PN}-4.7.1-libxklavier.patch" )
 }