summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2007-11-30 10:48:46 +0000
committerJeroen Roovers <jer@gentoo.org>2007-11-30 10:48:46 +0000
commit9663fa40726d742e3756d277c32f5f06ba25fd54 (patch)
treedca132dba74f30126160e3cb1264ec3ba9eeef10 /gnome-base/gnome-vfs
parentVersion bump. (diff)
downloadgentoo-2-9663fa40726d742e3756d277c32f5f06ba25fd54.tar.gz
gentoo-2-9663fa40726d742e3756d277c32f5f06ba25fd54.tar.bz2
gentoo-2-9663fa40726d742e3756d277c32f5f06ba25fd54.zip
Fix automagic deps again (bug #191426 comment #8).
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'gnome-base/gnome-vfs')
-rw-r--r--gnome-base/gnome-vfs/ChangeLog6
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch19
-rw-r--r--gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild3
3 files changed, 26 insertions, 2 deletions
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 095ed716c56e..bbaa70522edd 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-vfs
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.273 2007/11/29 05:13:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.274 2007/11/30 10:48:45 jer Exp $
+
+ 30 Nov 2007; Jeroen Roovers <jer@gentoo.org>
+ +files/gnome-vfs-2.20.1-automagic-deps.patch, gnome-vfs-2.20.1.ebuild:
+ Fix automagic deps again (bug #191426 comment #8).
29 Nov 2007; Jeroen Roovers <jer@gentoo.org> gnome-vfs-2.20.1.ebuild:
Stable for HPPA (bug #199740).
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
new file mode 100644
index 000000000000..eb5abc559234
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
@@ -0,0 +1,19 @@
+--- configure.in. 2007-11-30 04:15:01.000000000 +0100
++++ configure.in 2007-11-30 04:16:21.000000000 +0100
+@@ -1102,6 +1102,7 @@
+ AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
+ [],[enable_acl=yes])
+
++if test "x$enable_acl" = "xyes"; then
+ AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
+ AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
+ AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
+@@ -1189,6 +1190,8 @@
+ fi
+
+ AC_SUBST(ACL_LIBS)
++fi
++
+ AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes")
+ AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes")
+
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild
index 0203b133d464..c46f25e15e23 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild,v 1.7 2007/11/29 05:13:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.1.ebuild,v 1.8 2007/11/30 10:48:45 jer Exp $
WANT_AUTOMAKE=1.8
inherit eutils gnome2 autotools
@@ -93,6 +93,7 @@ src_unpack() {
# Fix automagic dependencies
epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+ epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
use doc || epatch "${FILESDIR}/${PN}-2.18.1-drop-gtk-doc-check.patch"