Only enable inotify if >=glibc-2.4 and >=linux-headers-2.6.16 are installed

Package-Manager: portage-2.1

4 files changed, 31 insertions, 17 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index a40c973e85b6..8c9b05a8da58 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.52 2006/06/14 22:22:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.53 2006/06/15 08:50:41 uberlord Exp $
+
+  15 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  dovecot-1.0_beta8-r1.ebuild, dovecot-1.0_beta9.ebuild:
+  We now only enable inotify support if you have >=linux-headers-2.6.16 and
+  >=glibc-2.4 - hopefully glibc-2.4 has been emerged against
+  >=linux-headers-2.6.16, but we have no way of knowing this :/
 
   14 Jun 2006; Roy Marples <uberlord@gentoo.org> dovecot-1.0_beta9.ebuild:
   Documentation now installed via the doc USE flag.
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 887bfc088a94..690cb0fa1d63 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,22 +4,22 @@ RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 files/dovecot.init 619
 SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 files/dovecot.init 619
 DIST dovecot-1.0.beta8.tar.gz 241738 RMD160 23060fee74b7a06618807e005d441f587718402b SHA1 d690e35f9e826e3898b6e3dca8e09cfcbbb62eb1 SHA256 03f56b54c9e6daa2d44f4acfbdf86445df3dda9657186dff0745266dfdddf2da
 DIST dovecot-1.0.beta9.tar.gz 1245601 RMD160 30d423b9fd2056fd8d898bc4bc630d3806cc64c4 SHA1 c3f5014e67cd993206373915ee622ed1f68b4b14 SHA256 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8
-EBUILD dovecot-1.0_beta8-r1.ebuild 5077 RMD160 a84a443aa68c693db919fc7268b8597cfdd57d19 SHA1 59d1fff400074aae0fb75dccd77d9f78fc1cc71c SHA256 086af219fa87ff4748e48c5d16fccde7b07f4c1fe027a2c109978403fb7fdafa
-MD5 022a8ff7d8139cb215b4987d526885d9 dovecot-1.0_beta8-r1.ebuild 5077
-RMD160 a84a443aa68c693db919fc7268b8597cfdd57d19 dovecot-1.0_beta8-r1.ebuild 5077
-SHA256 086af219fa87ff4748e48c5d16fccde7b07f4c1fe027a2c109978403fb7fdafa dovecot-1.0_beta8-r1.ebuild 5077
+EBUILD dovecot-1.0_beta8-r1.ebuild 5274 RMD160 40e1a6dcfafc4bbd1959de79227e50826878711f SHA1 1cca59210c44335926a64796092595fff169bdc8 SHA256 1bd0452e7de99693084ed3627620cbfb286a9264dc53473312ecaa68a44d697f
+MD5 87db97a09038ae7321971850e830e7f5 dovecot-1.0_beta8-r1.ebuild 5274
+RMD160 40e1a6dcfafc4bbd1959de79227e50826878711f dovecot-1.0_beta8-r1.ebuild 5274
+SHA256 1bd0452e7de99693084ed3627620cbfb286a9264dc53473312ecaa68a44d697f dovecot-1.0_beta8-r1.ebuild 5274
 EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d SHA1 060efcf3110e6ef0015e3087cce46780943243e6 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6
 MD5 9394fb4f53cb69bb777019adf947d2e7 dovecot-1.0_beta8.ebuild 4645
 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d dovecot-1.0_beta8.ebuild 4645
 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6 dovecot-1.0_beta8.ebuild 4645
-EBUILD dovecot-1.0_beta9.ebuild 5318 RMD160 1efc51fd331bbba41a9936cd31ec6a8d47a37428 SHA1 b2a56f0fd44bdb4ce493f96bbe26b710591670d4 SHA256 62c21a4ddbfc4b8fe5d4f0bb71a549dec13a61bece2eeb980b13c812b2e03847
-MD5 23c2fdc7072a231c7b99bc50d62127d9 dovecot-1.0_beta9.ebuild 5318
-RMD160 1efc51fd331bbba41a9936cd31ec6a8d47a37428 dovecot-1.0_beta9.ebuild 5318
-SHA256 62c21a4ddbfc4b8fe5d4f0bb71a549dec13a61bece2eeb980b13c812b2e03847 dovecot-1.0_beta9.ebuild 5318
-MISC ChangeLog 9556 RMD160 27ef9293ceb4ab1dd40afce9228c5b8bc8a78eec SHA1 cfb089f7d09715f9304d9a48f39d559f75f952e0 SHA256 7167c726b3c464b2b49a43d28d0b0d22d884ba9c6056b9b01972ea2f3452b303
-MD5 3af4f71d693be7893dd0c8fa928342b8 ChangeLog 9556
-RMD160 27ef9293ceb4ab1dd40afce9228c5b8bc8a78eec ChangeLog 9556
-SHA256 7167c726b3c464b2b49a43d28d0b0d22d884ba9c6056b9b01972ea2f3452b303 ChangeLog 9556
+EBUILD dovecot-1.0_beta9.ebuild 5515 RMD160 30fdfda8a9231a638e737e41664bb52ffe915a86 SHA1 39210271922d02f74f197d601524e33804cf0212 SHA256 4c5f9d1b1451ade0011769f3810f597da2d806b449c36c7f6d6789c211519c91
+MD5 efa3b47d51fcf811bacd0b0e9146fda0 dovecot-1.0_beta9.ebuild 5515
+RMD160 30fdfda8a9231a638e737e41664bb52ffe915a86 dovecot-1.0_beta9.ebuild 5515
+SHA256 4c5f9d1b1451ade0011769f3810f597da2d806b449c36c7f6d6789c211519c91 dovecot-1.0_beta9.ebuild 5515
+MISC ChangeLog 9864 RMD160 94200cfa6421acf9ba2f5f8e879f29b7e44a57c9 SHA1 8026bd40e83557752d1beda479f4b5bae16d886f SHA256 a4a9f96133bcdb87786420687700b90b3145364f8f56dfcee5128eb8ccddb688
+MD5 f7a13b103e1ddc9b5bab37a87e21e602 ChangeLog 9864
+RMD160 94200cfa6421acf9ba2f5f8e879f29b7e44a57c9 ChangeLog 9864
+SHA256 a4a9f96133bcdb87786420687700b90b3145364f8f56dfcee5128eb8ccddb688 ChangeLog 9864
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
diff --git a/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild b/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild
index b8454a5efc84..c925c11abd58 100644
--- a/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild
+++ b/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild,v 1.2 2006/05/31 15:38:47 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild,v 1.3 2006/06/15 08:50:41 uberlord Exp $
 
 inherit eutils
 
@@ -42,8 +42,12 @@ src_compile() {
 	# Enable Linux or FreeBSD only features
 	if use kernel_linux ; then
 		myconf="${myconf} --with-ioloop=epoll"
+		# OK, this is nasty - inotify requires glibc-2.4 is built against
+		# linux-headers-2.6.16, but we have no way of knowing this
 		if has_version ">=sys-libs/glibc-2.4" ; then
-			myconf="${myconf} --with-notify=inotify"
+			if has_version ">=sys-kernel/linux-headers-2.6.16" ; then
+				myconf="${myconf} --with-notify=inotify"
+			fi
 		fi
 	elif use kernel_FreeBSD ; then
 		myconf="${myconf} --with-ioloop=kqueue"
diff --git a/net-mail/dovecot/dovecot-1.0_beta9.ebuild b/net-mail/dovecot/dovecot-1.0_beta9.ebuild
index 28b33c0ce808..6ea3c8f2a1d8 100644
--- a/net-mail/dovecot/dovecot-1.0_beta9.ebuild
+++ b/net-mail/dovecot/dovecot-1.0_beta9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta9.ebuild,v 1.3 2006/06/14 22:22:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta9.ebuild,v 1.4 2006/06/15 08:50:41 uberlord Exp $
 
 inherit eutils
 
@@ -42,8 +42,12 @@ src_compile() {
 	# Enable Linux or FreeBSD only features
 	if use kernel_linux ; then
 		myconf="${myconf} --with-ioloop=epoll"
+		# OK, this is nasty - inotify requires glibc-2.4 is built against
+		# linux-headers-2.6.16, but we have no way of knowing this
 		if has_version ">=sys-libs/glibc-2.4" ; then
-			myconf="${myconf} --with-notify=inotify"
+			if has_version ">=sys-kernel/linux-headers-2.6.16" ; then
+				myconf="${myconf} --with-notify=inotify"
+			fi
 		fi
 	elif use kernel_FreeBSD ; then
 		myconf="${myconf} --with-ioloop=kqueue"