New revision to 1.0.5 for CAN-2005-0706 - see bug #84936 for more information.

(Portage version: 2.0.51.19)

4 files changed, 98 insertions, 6 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 585443a6b3db..520e1f3ecfa2 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.138 2005/04/08 18:41:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.139 2005/04/11 08:27:58 obz Exp $
+
+*gnome-vfs-1.0.5-r4 (11 Apr 2005)
+
+  11 Apr 2005; Mike Gardiner <obz@gentoo.org> +gnome-vfs-1.0.5-r4.ebuild:
+  New revision to 1.0.5 for CAN-2005-0706 - see bug #84936 for more information.
 
   08 Apr 2005; Guy Martin <gmsoft@gentoo.org> gnome-vfs-2.8.4-r1.ebuild:
   Stable on hppa.
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 3ba8ec2cf4e2..fef1e4af0719 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,26 +1,29 @@
 MD5 fc7c291d088d86b847643d1f260365e9 ChangeLog 16432
 MD5 e5c392a89829e864886bf08bd05a4919 gnome-vfs-1.0.5-r3.ebuild 1943
-MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
+MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
 MD5 ce61b31cbeaa511b66b4e4eab483e282 gnome-vfs-2.6.1.1.ebuild 1751
+MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
 MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
-MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
 MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e77c78abdddca4a02fd259b927623ad0 gnome-vfs-2.10.0-r1.ebuild 1973
 MD5 d6bdba8e5840e57ccf5cd26bf8489ddf gnome-vfs-2.8.4-r1.ebuild 2301
+MD5 fa6494a3368746726e3c53d40ce4c94f gnome-vfs-1.0.5-r4.ebuild 1916
+MD5 5f48e9f5180ef8ae06f55706c5a8cbd9 .gnome-vfs-1.0.5-r4.ebuild.swp 12288
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
+MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69
-MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154
 MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4 154
 MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
 MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
 MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
 MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4-r1 154
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
+MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
 MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r4 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r4
new file mode 100644
index 000000000000..be580ead0c89
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r4
@@ -0,0 +1 @@
+MD5 75df5354fe84ee66953ec54bf2989588 gnome-vfs-1.0.5.tar.gz 1048954
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
new file mode 100644
index 000000000000..1e5d14702ec1
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.1 2005/04/11 08:27:58 obz Exp $
+
+inherit eutils libtool gcc
+
+DESCRIPTION="GNOME Virtual File System"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+IUSE="doc ssl nls"
+
+RDEPEND="=gnome-base/gconf-1.0*
+	>=gnome-base/gnome-libs-1.4.1.2
+	>=gnome-base/gnome-mime-data-1.0.1
+	>=app-arch/bzip2-1.0.2
+	ssl? ( dev-libs/openssl )"
+
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.8.0
+	>=dev-util/intltool-0.11
+	>=gnome-base/gnome-common-1.2.4
+	nls? ( sys-devel/gettext )
+	doc? ( dev-util/gtk-doc )"
+# gnome-common is for m4 macros needed for patches ...
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Add missing macros for charset conversion
+	epatch ${FILESDIR}/1.0/${P}-codeset.patch
+	# Use GNOME2 Gconf keys for proxy settings
+	epatch ${FILESDIR}/1.0/${P}-proxy.patch
+	# Avoid openjade errors. See bug #46266.
+	epatch ${FILESDIR}/1.0/${P}-gtkdoc_fixes.patch
+
+	# Fix a rare segfault with gnome-mime-data-2.0.1.  Weird one really ...
+	# <azarah@gentoo.org> (2 Jan 2003).
+	epatch ${FILESDIR}/1.0/${P}-fix-segfault.patch
+
+	#apply both patches to compile with gcc-3.4 closing bug #53075
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		epatch ${FILESDIR}/1.0/${P}-gcc3.4.patch
+	fi
+
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+
+	autoheader
+	aclocal -I /usr/share/aclocal/gnome-macros
+	autoconf
+}
+
+src_compile() {
+	local myconf=""
+
+	elibtoolize
+
+	use nls || {
+		myconf="${myconf} --disable-nls"
+		mkdir intl
+		touch intl/libgettext.h
+	}
+
+	myconf="${myconf} $(use_enable doc gtk-doc)"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	rmdir ${D}/usr/doc
+
+	dodoc AUTHORS COPYING* ChangeLog NEWS README
+}