From 17bb82d2d9b88009426b54e7c34edc7225f325a3 Mon Sep 17 00:00:00 2001
From: Ian Stakenvicius <axs@gentoo.org>
Date: Mon, 30 Aug 2010 18:20:04 +0000
Subject: x11-wm/cairo-compmgr: Fixed configure check for >=dev-lang/vala-0.9.5

svn path=/sunrise/; revision=11264
---
 x11-wm/cairo-compmgr/ChangeLog                                |  4 ++++
 x11-wm/cairo-compmgr/Manifest                                 |  5 +++--
 x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild               |  9 ++++++++-
 x11-wm/cairo-compmgr/files/cairo-compmgr-0.3.0-vala-dep.patch | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 x11-wm/cairo-compmgr/files/cairo-compmgr-0.3.0-vala-dep.patch

(limited to 'x11-wm')

diff --git a/x11-wm/cairo-compmgr/ChangeLog b/x11-wm/cairo-compmgr/ChangeLog
index d68fa3804..7f774f89b 100644
--- a/x11-wm/cairo-compmgr/ChangeLog
+++ b/x11-wm/cairo-compmgr/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Aug 2010; Ian Stakenvicius (_AxS_) <ian@aerobiology.ca>
+  cairo-compmgr-0.3.0.ebuild, +files/cairo-compmgr-0.3.0-vala-dep.patch:
+  Fixed configure check for >=dev-lang/vala-0.9.5
+
   22 Mar 2010; Ian Stakenvicius (_AxS_) <ian@aerobiology.ca>
   -cairo-compmgr-0.2.93.ebuild,
   -files/cairo-compmgr-0.2.93-glitz-code.patch,
diff --git a/x11-wm/cairo-compmgr/Manifest b/x11-wm/cairo-compmgr/Manifest
index 8cdd2cfa3..2f24514df 100644
--- a/x11-wm/cairo-compmgr/Manifest
+++ b/x11-wm/cairo-compmgr/Manifest
@@ -1,6 +1,7 @@
+AUX cairo-compmgr-0.3.0-vala-dep.patch 374 RMD160 493f6b41e1195d026dfdc908a27d02e968b85dc9 SHA1 7cbb2f0bb7e3471c35a4ef4b5716eaf43c50167b SHA256 44852dd742c257e0de86c4bbba4fd7cea6c011ccaffcb8a95d8942bd22c6126b
 AUX cairo-compmgr-9999-glitz-tfp-undef.patch 397 RMD160 c24e9b49e7ce46fdf04181df5d3d16f93dec578e SHA1 d5a0cdc5234dc901c1a44cdcd18477eb1eb7d640 SHA256 0874b67a8b156fc073ff19bee06e825cc694f3f172e77c9c5b2ff8083475cc0c
 DIST cairo-compmgr-0.3.0.tar.gz 1034748 RMD160 3a77a46ed39933400f3f9b67e9ddeddac825ee9a SHA1 583a0e240883dfcdeb431f1eef22db8339e7fcfa SHA256 72c2528e0a2716076587b8851c083c858fb699a0169748ec2894307b0d968afa
-EBUILD cairo-compmgr-0.3.0.ebuild 541 RMD160 b4e75efc5814cb668f8b36b20ed025cc2c4d0413 SHA1 a6998cf8285ba9fc131cb5a015fd904184a53e3b SHA256 0e4cb70a82a29f3154f71f26adf0f58e8ea2f628d977f1238f5b8501aff4dfa5
+EBUILD cairo-compmgr-0.3.0.ebuild 677 RMD160 f84ce758091813187163cdf875236e98a0fc1653 SHA1 69717952a28969c58b4d8ff5c37116a6a4bb741c SHA256 aeed45673489c3025e37d1c37553a3480b306ba552ef0a2e5e43f6a251261243
 EBUILD cairo-compmgr-9999.ebuild 696 RMD160 974ceebad76653ee69a5be58f2895920b5aeea01 SHA1 b6062261e07734057dd270ebd87a501c8ad817f8 SHA256 c54f4aa768b595a7d83618fc3b2b7d13d5aac3c8b8b590d11f0ef6ca54b39431
-MISC ChangeLog 1134 RMD160 0927a02fe846fd3f10cc4ea4da390d91cee17567 SHA1 0696b51d84ba1f09b281b0feda4f09b49af938ca SHA256 7fab54d4dcccfe06516ce7b8ad2a8c095c918faa3d967ce111ec81e17742958a
+MISC ChangeLog 1319 RMD160 5cd00add49b63854e6388572fb38b38e4a991e31 SHA1 63b5ed202235857f81229adec9e10b4727ab2b58 SHA256 e8c6cce84ce48e2a8d4d119bbeafcb4e2eed333b0a7893258b0a1d20ab5f02ad
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild b/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild
index 23ec2ec22..64f820bd4 100644
--- a/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild
+++ b/x11-wm/cairo-compmgr/cairo-compmgr-0.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="A versatile and extensible compositing manager which uses cairo for rendering"
 HOMEPAGE="http://cairo-compmgr.tuxfamily.org/"
@@ -21,3 +21,10 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/pixman"
 DEPEND="${RDEPEND}
 	>=x11-proto/glproto-1.4.9"
+
+src_prepare() {
+	if has_version ">=dev-lang/vala-0.9.5"; then
+		epatch "${FILESDIR}/${P}-vala-dep.patch"
+		eautoreconf
+	fi
+}
diff --git a/x11-wm/cairo-compmgr/files/cairo-compmgr-0.3.0-vala-dep.patch b/x11-wm/cairo-compmgr/files/cairo-compmgr-0.3.0-vala-dep.patch
new file mode 100644
index 000000000..7e9071cc9
--- /dev/null
+++ b/x11-wm/cairo-compmgr/files/cairo-compmgr-0.3.0-vala-dep.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2010-03-17 18:13:25.000000000 -0400
++++ configure.ac	2010-08-30 13:12:36.000000000 -0400
+@@ -85,7 +85,7 @@
+         cairo >= $CAIRO_REQUIRED,
+         pixman-1 >= $PIXMAN_REQUIRED,
+         gtk+-2.0 >= $GTK_REQUIRED
+-        vala-1.0 >= $VALA_REQUIRED])
++        vala-0.10 >= $VALA_REQUIRED])
+ AC_SUBST(CAIRO_COMPMGR_CFLAGS)
+ AC_SUBST(CAIRO_COMPMGR_LIBS)
+ 
-- 
cgit v1.2.3-65-gdbad