Fix exempi automagic detection, bug #206041 in preparation of bug #185689.

(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64, RepoMan options: --force)

5 files changed, 181 insertions, 4 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 34e75eb411de..78d6fe1ab907 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.277 2008/09/28 09:09:58 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.278 2008/10/11 15:18:48 eva Exp $
+
+*nautilus-2.20.0-r2 (11 Oct 2008)
+
+  11 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.20.0-exempi.patch,
+  +files/nautilus-2.22.5.1-exempi.patch, +nautilus-2.20.0-r2.ebuild,
+  nautilus-2.22.5.1-r1.ebuild:
+  Fix exempi automagic detection, bug #206041 in preparation of bug #185689.
 
   28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
   +files/nautilus-2.22.5.1-fix-stat-include.patch, nautilus-2.22.5.1.ebuild,
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch b/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch
new file mode 100644
index 000000000000..33229a6ef112
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.20.0-exempi.patch
@@ -0,0 +1,32 @@
+--- configure.in.old	2008-07-04 17:51:51.000000000 +0200
++++ configure.in	2008-07-04 18:00:12.000000000 +0200
+@@ -255,13 +255,23 @@
+ 
+ dnl exempi checking
+ 
+-PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
+-		  AM_CONDITIONAL(HAVE_EXEMPI, true)
+-		  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
+-		  ], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
++AM_CONDITIONAL(HAVE_EXEMPI, false)
++AC_ARG_ENABLE(xmp, 
++	AC_HELP_STRING([--disable-xmp], 
++			[build without xmp support]))
++msg_xmp=no
++if test "x$enable_xmp" != "xno"; then
++	PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
++		  	  AM_CONDITIONAL(HAVE_EXEMPI, true)
++			  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])
++			  ]
++                          msg_xmp=yes,
++	          	  [AM_CONDITIONAL(HAVE_EXEMPI, false)])
++
+
+-AC_SUBST(EXEMPI_CFLAGS)
+-AC_SUBST(EXEMPI_LIBS)
++	AC_SUBST(EXEMPI_CFLAGS)
++	AC_SUBST(EXEMPI_LIBS)
++fi
+ 
+ dnl ==========================================================================
+ dnl search implementations
diff --git a/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch b/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch
new file mode 100644
index 000000000000..2942fab3f42e
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.5.1-exempi.patch
@@ -0,0 +1,36 @@
+--- configure.in.old	2008-07-04 17:51:51.000000000 +0200
++++ configure.in	2008-07-04 18:00:12.000000000 +0200
+@@ -255,16 +255,26 @@
+ 
+ dnl exempi checking
+ 
+-PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
+-		  AM_CONDITIONAL(HAVE_EXEMPI, true)
+-		  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
+-		  ], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
++AM_CONDITIONAL(HAVE_EXEMPI, false)
+ 
+-PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
++AC_ARG_ENABLE(xmp, 
++	AC_HELP_STRING([--disable-xmp], 
++			[build without xmp support]))
++msg_xmp=no
++if test "x$enable_xmp" != "xno"; then
++	PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
++		  	  AM_CONDITIONAL(HAVE_EXEMPI, true)
++			  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])
++			  ]
++                          msg_xmp=yes,
++	          	  [AM_CONDITIONAL(HAVE_EXEMPI, false)])
++
++	PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
+ 		  AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true)
+ 
+-AC_SUBST(EXEMPI_CFLAGS)
+-AC_SUBST(EXEMPI_LIBS)
++	AC_SUBST(EXEMPI_CFLAGS)
++	AC_SUBST(EXEMPI_LIBS)
++fi
+ 
+ dnl ==========================================================================
+ dnl search implementations
diff --git a/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild b/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild
new file mode 100644
index 000000000000..8bef0feb5aa4
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild,v 1.1 2008/10/11 15:18:48 eva Exp $
+
+inherit virtualx eutils gnome2 autotools
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle esd gnome tracker"
+# cups flac gstreamer mad ogg vorbis
+
+RDEPEND=">=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.15.92
+	esd? ( >=media-sound/esound-0.2.27 )
+	>=dev-libs/glib-2.13
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.14.0
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.19.3
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.11.6
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2
+	media-libs/audiofile
+	beagle? ( =app-misc/beagle-0.2* )
+	x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xproto
+	virtual/eject"
+#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.8
+#		>=media-libs/gst-plugins-0.8
+#		>=media-plugins/gst-plugins-gnomevfs-0.8
+#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker) $(use_enable esd esound)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-sound-preview-cleanup.patch"
+	epatch "${FILESDIR}/${P}-statfs.patch"
+
+	# Patches from unreleased 2.20.1
+	epatch "${FILESDIR}/${P}-async-thumbnail-framing.patch"
+	epatch "${FILESDIR}/${P}-thumbnail-flashing.patch"
+	epatch "${FILESDIR}/${P}-small-font-crasher.patch"
+
+	# Fix for autoconf 2.62, see Gnome Bug #527315
+	epatch "${FILESDIR}/${P}-fix_broken_configure.patch"
+
+	# Fix automagic exempi detection, bug #206041
+	epatch "${FILESDIR}/${P}-exempi.patch"
+
+	eautoreconf
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	Xmake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus now has three ways of previewing sound.  First, if the esd"
+	elog "USE flag is given, it will attempt to play directly via esd.  If"
+	elog "the esd USE flag is *not* given, it will attempt to use totem to"
+	elog "play the sound.  If totem is not installed, it will attempt to use"
+	elog "gstreamer 10.x to play the sound.  If gstreamer 10.x is not installed"
+	elog "it will fail to preview the sound."
+}
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
index 60edd2a3a46c..f2cfdaf0b189 100644
--- a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.3 2008/09/28 09:09:59 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.4 2008/10/11 15:18:48 eva Exp $
 
-inherit virtualx eutils gnome2
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/projects/nautilus/"
@@ -41,7 +41,7 @@ PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
 
 pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle) $(use_enable tracker)"
+	G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker)"
 }
 
 src_unpack() {
@@ -56,6 +56,11 @@ src_unpack() {
 
 	# Build fix
 	epatch "${FILESDIR}/${P}-fix-stat-include.patch"
+
+	# Fix automagic exempi detection, bug #206041
+	epatch "${FILESDIR}/${P}-exempi.patch"
+
+	eautoreconf
 }
 
 src_test() {