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

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
RepoMan-Options: --force

6 files changed, 196 insertions, 6 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/Manifest b/gnome-base/nautilus/Manifest
index 0c637192ce0a..12c1d976293d 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nautilus-2.20.0-async-thumbnail-framing.patch 911 RMD160 c7886957cb703ef97b3210d4d84f9b21a261c634 SHA1 93c2ccfac58fb1832cdc726f2a7c19f423a1ac45 SHA256 80afad12814bc55540e0a98535a81b4fc9a409b7bfc58a06f0bd35a6b2cb89db
+AUX nautilus-2.20.0-exempi.patch 1021 RMD160 b59d0898af04bccc0e367303bf62d670c2e881ea SHA1 5ed5268a4b1d30ef15cb799443120b51e4db83e2 SHA256 5ed239f6085881310438f5da349d30924693f114d82096183c2156cede9f10d9
 AUX nautilus-2.20.0-fix_broken_configure.patch 437 RMD160 9bacd41cc689561f2d31e104100a2f6d542ca0f0 SHA1 bc170c178f72527e307e4c13c53aa674e979637a SHA256 a396a5192041c32ca0d44d080230ed70e85e9f6e0f8191977ea9edbbf7edeaf2
 AUX nautilus-2.20.0-small-font-crasher.patch 492 RMD160 0ee8dacd7d83db84864c477b59a375563c016591 SHA1 6306c38a91d6d6f8fcf609a5f3bacabc7bb86eda SHA256 b1d4b3ebd00569df1aa8e40e8f5bb5199f73167267b81c18c165991748713eb4
 AUX nautilus-2.20.0-sound-preview-cleanup.patch 13013 RMD160 19f50049d52145d2f80326d96ededbed9f895671 SHA1 8a6e8e2340c9c5f64a02438ed5025fe3a5c2b164 SHA256 6b0e7f8c5b50b5ef54d6a075c90324be9b18164aa951fca612c58d31c7d63a38
@@ -8,11 +12,20 @@ AUX nautilus-2.22.3-open-folder.patch 1293 RMD160 42661a0e967fb3ba9c514c7fdfcc5e
 AUX nautilus-2.22.3-preserve-metadata.patch 568 RMD160 209a143c3764a6d35af8648b54aff688802b40fb SHA1 7067b3fd12d5f00aef58546ad9591dbf2f14c2cd SHA256 83c8fcc0484fa6b4f70795c538d7f04868a1eec6e12e0349ccc16fe4070f7dc7
 AUX nautilus-2.22.3-prevent-recursive-mvcp.patch 3101 RMD160 2a1952958a6996675d4083c197b975570a554d43 SHA1 566cb4b33bb830e972b0c477e41a14e86f7a79e0 SHA256 b507d738b869b4fc55652dff67546711fec70bdef4ea7baad9ec4c6d8be3e979
 AUX nautilus-2.22.5-ask-what-to-do.patch 830 RMD160 253e9376c7d3dc7852781c61a1d92cdd08583be5 SHA1 51c5696e619c60e33629a9b6c51cf29454415859 SHA256 f88dc8a326fc51f6e5ed69dddef1a66185d795bbb54aa449701a22394048a1bb
+AUX nautilus-2.22.5.1-exempi.patch 1258 RMD160 7b70d4006c7167c2229e52e936a98a7749a846ac SHA1 40ad0a492fae882d19ab003fb52dc895601fa68a SHA256 d40cdc614f03f7d096a03271b2fdfe79120579048860031b5650b1b3399bc2c8
 AUX nautilus-2.22.5.1-fix-stat-include.patch 1036 RMD160 741bb6328bce3a09a3821ed70b1df4c9cee9d041 SHA1 3c4e154e635b491dffe110b71789f8e38b1e5b0d SHA256 18865d9b41281c730d47300727d9614f9e045b616fa5111a8987f015e5b5200c
 DIST nautilus-2.20.0.tar.bz2 4916284 RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 SHA1 f6a75a854728ef308e2721424a9638d228661b1d SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
 DIST nautilus-2.22.5.1.tar.bz2 5017090 RMD160 102c5608e3dbf9815cb9b82262799ac0001870a4 SHA1 81c1d875779f5d95ad7bf7dc18ab8a8244abb429 SHA256 3c98d410f2d535ab2f000df91527b4a30c8d3ce2a7f6c7d1697e89f3868c66b9
 EBUILD nautilus-2.20.0-r1.ebuild 2964 RMD160 76dba02ab2886d3c655a2722024bd30161f72444 SHA1 d9d8156025de2342e6f73ea89b6455083d4182ff SHA256 dfa60ad31c56184611645499990aa8103f22c0ca23ca3c7f71770a4c6703f97a
-EBUILD nautilus-2.22.5.1-r1.ebuild 2063 RMD160 9fc5a8eb679e7fa83b9a0c947ab53b0802fec65d SHA1 55dab55eec2c34fe5b4cf61f4af3d6bd854ea084 SHA256 bcb99afd16aba95b405e13c9353a1c8b864930dfe5d73f8510dc61a36a899501
+EBUILD nautilus-2.20.0-r2.ebuild 3065 RMD160 4bf3823fabcc2475393e7df534ead5512b4a29db SHA1 367f8f49d75bc351f8ea5ee6a8b7ec21e3c6be3e SHA256 7aa4d3d4a68536e9d63ef09fb6ebabac5e28e40fdfbf8f537d5f4d4db063e66a
+EBUILD nautilus-2.22.5.1-r1.ebuild 2188 RMD160 9aef670f617e7431f60b55127e658f7216ad723d SHA1 8b9c63435df1992277862a7395b43811531710a5 SHA256 9be6143751af8b215d7cb94e90ec35fc8e890e8e3c1316024fe06cdc4ba7dda9
 EBUILD nautilus-2.22.5.1.ebuild 2019 RMD160 92b997063b404e9c0c59332b7054a90e09fab34b SHA1 5bc0bf76374a587748f075834b28998f8816500f SHA256 17049fc6de3a163ea404c92ee3d83de6862c92647747a5c974161ee33b8fd806
-MISC ChangeLog 38915 RMD160 5a2cc7e3b059b4f29f17342d6b57440ef3a5dca8 SHA1 ae58eaedd571f8c635aada9bd768e125a82b2b24 SHA256 aafe3b8b8da65af87425dc0fb852853080755e58d9068b631d7d31524acda446
+MISC ChangeLog 39220 RMD160 a9eb7cf039233ec69b9e268d5c1a2a728600492c SHA1 bc9c9da23ecdbd31929b0879cfa8ffcefaef7d8c SHA256 5208d241e32912724423303ad85fd8425996fb9fc418e48e4a2f0a611fb8be5a
 MISC metadata.xml 418 RMD160 950ac903bccee9717bb2aa3ab8b1269ad96d7fb2 SHA1 b8c46a622a2725f2860557b2a1c2ffee0ff000ff SHA256 eecdd5e524b283e5cf158c17c89828a17f67cdd64e2c552a7c5ae9a4dd977ebc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjww94ACgkQ1fmVwcYIWAZaGACghth2DP5IZOnYMIWwfeG9Baw8
+UeEAoNQ3gIjm8KLCRTvjmeLK1Dp9RZRK
+=j6/8
+-----END PGP SIGNATURE-----
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() {