Check for inotify useflag if thunderbird useflag is enabled. Bug 263781. Thanks to Felix Salfner <salfner@informatik.hu-berlin.de> for reporting.

(Portage version: 2.2_rc26/cvs/Linux x86_64)

6 files changed, 31 insertions, 437 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 1e39fdea7867..f3da3c0589e5 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.92 2009/03/21 11:11:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.93 2009/03/25 22:51:17 loki_val Exp $
+
+  25 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> -beagle-0.2.18.ebuild,
+  -beagle-0.2.18-r1.ebuild, beagle-0.3.7-r1.ebuild, -beagle-0.3.8-r2.ebuild,
+  beagle-0.3.9.ebuild:
+  Check for inotify useflag if thunderbird useflag is enabled. Bug 263781.
+  Thanks to Felix Salfner <salfner@informatik.hu-berlin.de> for reporting.
 
   21 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.9.ebuild:
   Make beagle build with epiphany-2.26
diff --git a/app-misc/beagle/beagle-0.2.18-r1.ebuild b/app-misc/beagle/beagle-0.2.18-r1.ebuild
deleted file mode 100644
index 4ce78148cad4..000000000000
--- a/app-misc/beagle/beagle-0.2.18-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.18-r1.ebuild,v 1.3 2008/12/16 22:06:00 loki_val Exp $
-
-EAPI=1
-
-inherit gnome.org eutils autotools mono
-
-DESCRIPTION="search tool that ransacks your personal information space to find whatever you're looking for"
-HOMEPAGE="http://www.beagle-project.org"
-
-LICENSE="MIT Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="chm doc eds galago gtk ole pdf python thunderbird +xscreensaver"
-
-RDEPEND="!sci-libs/beagle
-	>=dev-lang/mono-1.1.18
-	app-arch/zip
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.6
-	=dev-libs/gmime-2.2*
-	>=dev-dotnet/gtk-sharp-2.8
-	>=gnome-base/librsvg-2
-	>=media-libs/libexif-0.6
-	>=dev-libs/libxml2-2.6.19
-	x11-libs/libX11
-	x11-libs/libXt
-	>=dev-db/sqlite-3.3.1
-	gtk? ( >=dev-dotnet/gconf-sharp-2.8
-		>=dev-dotnet/glade-sharp-2.8
-		>=dev-dotnet/gnome-sharp-2.8 )
-	eds? ( >=dev-dotnet/evolution-sharp-0.13.3
-		>=dev-dotnet/gconf-sharp-2.3 )
-	ole? ( >=app-text/wv-1.2.0
-		>=dev-dotnet/gsf-sharp-0.6
-		>=app-office/gnumeric-1.4.3-r3 )
-	python? ( >=dev-python/pygtk-2.6 )
-	pdf? ( >=app-text/poppler-0.5.1 )
-	chm? ( dev-libs/chmlib )
-	galago? ( >=dev-dotnet/galago-sharp-0.5 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	!dev-libs/libbeagle"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	dev-util/pkgconfig
-	x11-proto/xproto
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.23"
-
-pkg_setup() {
-	local fail="Re-emerge dev-libs/gmime with USE mono."
-
-	if ! built_with_use dev-libs/gmime mono; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-
-	enewgroup beagleindex
-	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		"${S}"/configure.in || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-0.2.7-crawltweek.patch
-	epatch "${FILESDIR}"/${PN}-log-level-warn.patch
-	epatch "${FILESDIR}"/${P}-mono-1.9.1.patch
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_compile() {
-	econf --enable-libbeagle --enable-sqlite3 \
-		$(use_enable doc gtk-doc) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable python) \
-		$(use_enable ole gsf-sharp) \
-		$(use_enable xscreensaver xss)
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS NEWS README
-
-	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' "${D}"/etc/beagle/crawl-*
-
-	insinto /etc/beagle
-	doins "${FILESDIR}"/crawl-portage
-
-	keepdir /usr/$(get_libdir)/beagle/Backends
-	diropts -o beagleindex -g beagleindex
-	keepdir /var/lib/cache/beagle/indexes
-}
-
-pkg_postinst() {
-	elog "If available, Beagle greatly benefits from using certain operating"
-	elog "system features such as Extended Attributes and inotify."
-	echo
-	elog "If you want static queryables such as the portage tree and system"
-	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
-	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
-	echo
-	elog "For more info on how to create the optimal beagle environment, and"
-	elog "basic usage info, see the Gentoo page of the Beagle website:"
-	elog "http://www.beagle-project.org/Gentoo_Installation"
-}
diff --git a/app-misc/beagle/beagle-0.2.18.ebuild b/app-misc/beagle/beagle-0.2.18.ebuild
deleted file mode 100644
index 42517979b447..000000000000
--- a/app-misc/beagle/beagle-0.2.18.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.18.ebuild,v 1.10 2008/12/16 22:06:00 loki_val Exp $
-
-EAPI=1
-
-inherit gnome.org eutils autotools mono
-
-DESCRIPTION="search tool that ransacks your personal information space to find whatever you're looking for"
-HOMEPAGE="http://www.beagle-project.org"
-
-LICENSE="MIT Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="chm doc eds galago gtk ole pdf python thunderbird +xscreensaver"
-
-RDEPEND="!sci-libs/beagle
-	>=dev-lang/mono-1.1.18
-	app-arch/zip
-	sys-devel/gettext
-	>=x11-libs/gtk+-2.6
-	=dev-libs/gmime-2.2*
-	>=dev-dotnet/gtk-sharp-2.8
-	>=gnome-base/librsvg-2
-	>=media-libs/libexif-0.6
-	>=dev-libs/libxml2-2.6.19
-	x11-libs/libX11
-	x11-libs/libXt
-	>=dev-db/sqlite-3.3.1
-	gtk? ( >=dev-dotnet/gconf-sharp-2.8
-		>=dev-dotnet/glade-sharp-2.8
-		>=dev-dotnet/gnome-sharp-2.8 )
-	eds? ( >=dev-dotnet/evolution-sharp-0.13.3
-		>=dev-dotnet/gconf-sharp-2.3 )
-	ole? ( >=app-text/wv-1.2.0
-		>=dev-dotnet/gsf-sharp-0.6
-		>=app-office/gnumeric-1.4.3-r3 )
-	python? ( >=dev-python/pygtk-2.6 )
-	pdf? ( >=app-text/poppler-0.5.1 )
-	chm? ( dev-libs/chmlib )
-	galago? ( >=dev-dotnet/galago-sharp-0.5 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	!dev-libs/libbeagle"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	dev-util/pkgconfig
-	x11-proto/xproto
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.23"
-
-pkg_setup() {
-	local fail="Re-emerge dev-libs/gmime with USE mono."
-
-	if ! built_with_use dev-libs/gmime mono; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-
-	enewgroup beagleindex
-	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Multilib fix
-	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
-		"${S}"/configure.in || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-0.2.7-crawltweek.patch
-	epatch "${FILESDIR}"/${PN}-log-level-warn.patch
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_compile() {
-	econf --enable-libbeagle --enable-sqlite3 \
-		$(use_enable doc gtk-doc) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable python) \
-		$(use_enable ole gsf-sharp) \
-		$(use_enable xscreensaver xss)
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodir /usr/share/beagle
-	insinto /usr/share/beagle
-	doins mozilla-extension/beagle.xpi
-
-	dodoc AUTHORS NEWS README
-
-	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' "${D}"/etc/beagle/crawl-*
-
-	insinto /etc/beagle
-	doins "${FILESDIR}"/crawl-portage
-
-	keepdir /usr/$(get_libdir)/beagle/Backends
-	diropts -o beagleindex -g beagleindex
-	keepdir /var/lib/cache/beagle/indexes
-}
-
-pkg_postinst() {
-	elog "If available, Beagle greatly benefits from using certain operating"
-	elog "system features such as Extended Attributes and inotify."
-	echo
-	elog "If you want static queryables such as the portage tree and system"
-	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
-	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
-	echo
-	elog "For more info on how to create the optimal beagle environment, and"
-	elog "basic usage info, see the Gentoo page of the Beagle website:"
-	elog "http://www.beagle-project.org/Gentoo_Installation"
-}
diff --git a/app-misc/beagle/beagle-0.3.7-r1.ebuild b/app-misc/beagle/beagle-0.3.7-r1.ebuild
index 49a9f48081f7..2e0c461cdb38 100644
--- a/app-misc/beagle/beagle-0.3.7-r1.ebuild
+++ b/app-misc/beagle/beagle-0.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.7-r1.ebuild,v 1.7 2008/12/16 22:06:00 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.7-r1.ebuild,v 1.8 2009/03/25 22:51:17 loki_val Exp $
 
 EAPI=1
 
@@ -82,6 +82,17 @@ pkg_setup() {
 		fi
 	fi
 
+	if use thunderbird
+	then
+		if ! use inotify
+		then
+			eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
+			eerror "Please enable the inotify use-flag also."
+			eerror "See http://bugs.gentoo.org/263781 for more information."
+			die "Please enable inotify use-flag."
+		fi
+	fi
+
 	enewgroup beagleindex
 	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
 }
diff --git a/app-misc/beagle/beagle-0.3.8-r2.ebuild b/app-misc/beagle/beagle-0.3.8-r2.ebuild
deleted file mode 100644
index a531f35650a8..000000000000
--- a/app-misc/beagle/beagle-0.3.8-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.8-r2.ebuild,v 1.2 2009/01/05 17:21:13 loki_val Exp $
-
-EAPI=2
-
-inherit base gnome.org eutils autotools mono mozextension
-
-DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
-HOMEPAGE="http://www.beagle-project.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches.tar.lzma"
-
-LICENSE="MIT Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="chm debug doc epiphany eds firefox galago gtk pdf inotify ole thunderbird +xscreensaver"
-
-#See bug 248331 for blocker reason.
-RDEPEND="!!sci-libs/beagle
-	gnome-base/gnome-desktop
-	>=dev-lang/mono-1.9
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	dev-libs/gmime:2.4[mono]
-	>=dev-libs/libxml2-2.6.19
-	>=dev-db/sqlite-3.3.1
-	>=dev-dotnet/dbus-sharp-0.6.0
-	>=dev-dotnet/dbus-glib-sharp-0.4.1
-	>=dev-dotnet/taglib-sharp-2.0
-	>=dev-dotnet/gtk-sharp-2.12.6
-	gtk? (
-		>=gnome-base/libgnome-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=x11-libs/gtk+-2.10
-		>=dev-libs/atk-1.2.4
-		>=gnome-base/librsvg-2.0
-		>=dev-dotnet/gconf-sharp-2.24.0
-		>=dev-dotnet/gtk-sharp-2.12.6
-		>=dev-dotnet/glade-sharp-2.12.6
-		>=dev-dotnet/gnome-sharp-2.24.0
-		>=dev-dotnet/gnomevfs-sharp-2.24.0
-	)
-	eds? (
-		>=dev-dotnet/evolution-sharp-0.18.1
-		>=dev-dotnet/gconf-sharp-2.24.0
-	)
-	ole? (
-		>=app-text/wv-1.2.3
-		>=dev-dotnet/gsf-sharp-0.8
-		>=app-office/gnumeric-1.4.3-r3
-	)
-	chm? ( dev-libs/chmlib )
-	pdf? ( >=app-text/poppler-0.5.1 )
-	galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
-	thunderbird? (
-			|| (
-				>=mail-client/mozilla-thunderbird-1.5
-				>=mail-client/mozilla-thunderbird-bin-1.5
-			)
-	)
-	firefox? (
-			|| (
-				>=www-client/mozilla-firefox-1.5
-				>=www-client/mozilla-firefox-bin-1.5
-			)
-	)
-	epiphany? (
-		>=www-client/epiphany-extensions-2.16[python]
-		dev-libs/libbeagle[python]
-	)
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	dev-libs/libbeagle"
-	# Avahi code is currently experimental
-	#avahi?	(	>=net-dns/avahi-0.6.10 )
-
-DEPEND="${RDEPEND}
-	app-arch/lzma-utils
-	doc? ( >=virtual/monodoc-1.2.4 )
-	dev-util/pkgconfig
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.35"
-
-pkg_setup() {
-	enewgroup beagleindex
-	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
-}
-
-src_prepare() {
-	PATCHES=( ${WORKDIR}/patches/5* )
-	epatch "${WORKDIR}/patches/${P}-fix_gvfs.patch"
-	base_src_util autopatch
-	epatch "${WORKDIR}/patches/${P}-gmime-2.4.patch"
-
-	# Multilib fix
-	sed -i	-e 's:prefix mono`/lib:libdir mono`:' \
-		configure.in || die "multilibsed failed"
-	#Fix bug 248703
-	sed -i  -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.24 :' \
-		configure.in || die "epiphany sed failed"
-
-	#Fix bugs.gnome.org/556243
-	sed -i	-e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
-		search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	econf \
-		--disable-avahi \
-		$(use_enable debug xml-dump) \
-		$(use_enable doc docs) \
-		$(use_enable epiphany epiphany-extension) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable ole gsf-sharp wv1) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable inotify)
-		# Avahi code is experimental, explicitly disabled above
-		#$(use_enable avahi) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc AUTHORS NEWS README
-
-	declare MOZILLA_FIVE_HOME
-	if use firefox; then
-		xpi_unpack "${S}"/firefox-extension/beagle.xpi \
-		|| die "Unable to find Beagle Firefox Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
-
-		if has_version '>=www-client/mozilla-firefox-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox failed!"
-		fi
-		if has_version '>=www-client/mozilla-firefox-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox-bin failed!"
-		fi
-	fi
-
-	if use thunderbird; then
-		xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
-		|| die "Unable to find Beagle Thunderbird Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
-
-		if has_version '>=mail-client/mozilla-thunderbird-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for mozilla-thunderbird failed!"
-		fi
-		if has_version '>=mail-client/mozilla-thunderbird-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for mozilla-thunderbird-bin failed!"
-		fi
-	fi
-
-	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
-		"${D}"/etc/beagle/crawl-rules/crawl-*
-
-	insinto /etc/beagle/crawl-rules
-	doins "${FILESDIR}/crawl-portage"
-
-	keepdir "/usr/$(get_libdir)/beagle/Backends"
-	diropts -o beagleindex -g beagleindex
-	keepdir "/var/lib/cache/beagle/indexes"
-}
-
-pkg_postinst() {
-	elog "If available, Beagle greatly benefits from using certain operating"
-	elog "system features such as Extended Attributes and inotify."
-	elog
-	elog "If you want static queryables such as the portage tree and system"
-	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
-	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
-	elog
-	elog "For more info on how to create the optimal beagle environment, and"
-	elog "basic usage info, see the Gentoo page of the Beagle website:"
-	elog "http://www.beagle-project.org/Gentoo_Installation"
-}
diff --git a/app-misc/beagle/beagle-0.3.9.ebuild b/app-misc/beagle/beagle-0.3.9.ebuild
index aedc656e7d94..c8bdcd02f47d 100644
--- a/app-misc/beagle/beagle-0.3.9.ebuild
+++ b/app-misc/beagle/beagle-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9.ebuild,v 1.3 2009/03/21 11:11:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9.ebuild,v 1.4 2009/03/25 22:51:17 loki_val Exp $
 
 EAPI=2
 
@@ -85,6 +85,16 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	enewgroup beagleindex
 	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
+	if use thunderbird
+	then
+		if ! use inotify
+		then
+			eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
+			eerror "Please enable the inotify use-flag also."
+			eerror "See http://bugs.gentoo.org/263781 for more information."
+			die "Please enable inotify use-flag."
+		fi
+	fi
 }
 
 src_prepare() {