Fix configure.ac to detect >=exo-0.5.

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

4 files changed, 24 insertions, 14 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index a3445f5bdab8..2fbe1b2d7990 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.24 2009/10/16 22:10:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.25 2009/10/24 16:29:52 ssuominen Exp $
+
+  24 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.6.3.ebuild, +files/xfce4-settings-4.6.3-exo.patch:
+  Fix configure.ac to detect >=exo-0.5.
 
   16 Oct 2009; Markus Meier <maekke@gentoo.org> xfce4-settings-4.6.3.ebuild:
   x86 stable, bug #281427
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 961c8186a085..5258b35d81c1 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xfce4-settings-4.6.3-exo.patch 677 RMD160 cfd4cd31df25e62babea9d197c9bfbfd02d0df41 SHA1 27dc3571bdb8a6f63de8c4e0d24be17b5f000c3b SHA256 06be2fa459411bb42a03b49fb27bc8ae07d084e85995f6671f721aa750e4e4ae
 DIST xfce4-settings-4.6.1.tar.bz2 501587 RMD160 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3 SHA1 ab117c3923571e2437095fd165ac4bf392e658e0 SHA256 36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
 DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
 EBUILD xfce4-settings-4.6.1.ebuild 1323 RMD160 b7e3aad99af7194b5227f8deb19390e54370f24c SHA1 749566c367cae3ee2d676694dd36b6b8dab50124 SHA256 f0b159bb6169a6c92179d82a92bed71705b018c71dae0fd39c8669477fc1b5ee
-EBUILD xfce4-settings-4.6.3.ebuild 1403 RMD160 ea30da8d6669973a1dd9385083183ca3a86f2840 SHA1 956cf32ba4dd9ee07741045a974a3dd433bf18ed SHA256 28fa383b596ee32d7f7fd2f46d17a788fddedfa9d1db8c7b76e53508c4083aad
-MISC ChangeLog 3622 RMD160 25e6276475cc13fbdc08e88973da5d12da6458ae SHA1 1ee8f6c1a4fd3da2c0ddbeba4072611069165eab SHA256 73b6133190be4ae6574ff2212abb67332d7d15773beb7b5aa9739bd387400d08
+EBUILD xfce4-settings-4.6.3.ebuild 1464 RMD160 7b08c5e5fc43b9cbee6295ba68a96a211f022b16 SHA1 878b5069d3a2d33d1b7b1e796e1681bf4eefd6e5 SHA256 d1dc9e35c82cb77b477d0ac1f1e9306e254b81a154625bee97610e251b3479fd
+MISC ChangeLog 3790 RMD160 68d1ebd00fe3d77122f6645f2b13633a9a7c66e6 SHA1 1e86983c71be87e3641917b8977491ab6ab006af SHA256 e3eee8a12445c13ddc1b963dc682e230ade6aac2e3154662f71e0fb4344b3e46
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrY71sACgkQkKaRLQcq0GLggQCfe4gOlA3djQFiPRrTWyzjalX/
-E/EAnRv6ajCLND5fNysMq0e6q3aiwl6V
-=CaA0
------END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch
new file mode 100644
index 000000000000..2536af7bff87
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.6.3-exo.patch
@@ -0,0 +1,13 @@
+diff -ur xfce4-settings-4.6.3.orig/configure.ac xfce4-settings-4.6.3/configure.ac
+--- xfce4-settings-4.6.3.orig/configure.ac	2009-09-29 01:50:13.000000000 +0300
++++ xfce4-settings-4.6.3/configure.ac	2009-10-24 19:25:21.000000000 +0300
+@@ -77,7 +77,8 @@
+ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
+-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
++XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100], [],
++  [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
index 7b7367418e76..c2d969fb3683 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 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.ebuild,v 1.6 2009/10/16 22:10:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.7 2009/10/24 16:29:52 ssuominen Exp $
 
 EAPI=2
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Settings daemon for Xfce4"
@@ -45,4 +46,5 @@ pkg_setup() {
 		$(use_enable sound sound-settings)
 		$(use_enable debug)"
 	DOCS="AUTHORS ChangeLog NEWS TODO"
+	PATCHES=( "${FILESDIR}/${P}-exo.patch" )
 }