diff options
| -rw-r--r-- | gnome-base/nautilus/ChangeLog | 11 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/digest-nautilus-1.0.6-r8 | 1 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/digest-nautilus-2.0.0-r1 | 1 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/digest-nautilus-2.0.0-r3 (renamed from gnome-base/nautilus/files/digest-nautilus-2.0.0) | 0 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-1.0.6-r8.ebuild | 116 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-2.0.0-r3.ebuild (renamed from gnome-base/nautilus/nautilus-2.0.0-r1.ebuild) | 12 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-2.0.0.ebuild | 77 |
7 files changed, 18 insertions, 200 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index 9a52c9af5f9e..030ed210f4b9 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,11 +1,18 @@ # ChangeLog for gnome-base/nautilus # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.18 2002/06/28 08:03:43 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.19 2002/06/30 00:28:45 azarah Exp $ +natutils-2.0.0-r3 (30 Jun 2002) + 30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> natutils-2.0.0-r3.ebuild : + Fix the problem where the "tree view" in nautilus was broken on first + merge, thanks to Spider for getting the fix on Gnome Bugzilla. + + http://bugzilla.gnome.org/show_bug.cgi?id=75635 natutils-2.0.0-r2 (28 Jun 2002) 28 jun 2002; Spider <spider@gentoo.org> natutils-2.0.0-r2.ebuild : - moved this to use singlethreaded build, not sure if it will help though, but its worth a try for those with problems in the panel modules + moved this to use singlethreaded build, not sure if it will help though, + but its worth a try for those with problems in the panel modules natutils-2.0.0-r1 (15 Jun 2002) diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r8 b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r8 deleted file mode 100644 index 618f369df464..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r8 +++ /dev/null @@ -1 +0,0 @@ -MD5 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz 11481232 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.0.0-r1 b/gnome-base/nautilus/files/digest-nautilus-2.0.0-r1 deleted file mode 100644 index ea396b4190bd..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-2.0.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 582e225b049beff3f1a543ac13be9dd8 nautilus-2.0.0.tar.bz2 5003919 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.0.0 b/gnome-base/nautilus/files/digest-nautilus-2.0.0-r3 index ea396b4190bd..ea396b4190bd 100644 --- a/gnome-base/nautilus/files/digest-nautilus-2.0.0 +++ b/gnome-base/nautilus/files/digest-nautilus-2.0.0-r3 diff --git a/gnome-base/nautilus/nautilus-1.0.6-r8.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r8.ebuild deleted file mode 100644 index 1bebf1102ecc..000000000000 --- a/gnome-base/nautilus/nautilus-1.0.6-r8.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# Updated by Sebastian Werner <sebastian@werner-productions.de> -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r8.ebuild,v 1.2 2002/06/01 11:01:51 blocke Exp $ - - -S=${WORKDIR}/${P} -DESCRIPTION="nautilus" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz" - -HOMEPAGE="http://www.gnome.org/" - -RDEPEND="mozilla? ( >=net-www/mozilla-0.9.5 ) - >=app-admin/fam-oss-2.6.4 - >=media-sound/cdparanoia-3.9.8 - >=gnome-base/bonobo-1.0.9-r1 - >=gnome-base/gnome-core-1.4.0.4-r1 - >=gnome-base/libghttp-1.0.9-r1 - >=gnome-base/gnome-vfs-1.0.3 - >=gnome-base/librsvg-1.0.1 - >=gnome-base/eel-1.0.2 - >=gnome-extra/medusa-0.5.1-r1" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - >=app-text/scrollkeeper-0.2 - >=dev-util/intltool-0.11" - -SLOT="0" - -src_unpack() { - - unpack ${P}.tar.gz - - # The following is a temporary patch contributed by Naresh Donti - # to fix the 50 defunct copies of sh caused by hyperbola. This patch - # will no longer be needed with a future version of scrollkeeper. - # see bug #566 for more information - - patch -p0 < ${FILESDIR}/nautilus-1.0.6-hyperbola.diff - - # This patch to fix http://bugs.gentoo.org/show_bug.cgi?id=2082 - # (taken from - # http://lists.eazel.com/pipermail/nautilus-list/2002-April/008473.html) - # Credit to Kaoru Fukui <k_fukui@highway.ne.jp>. This is probably - # a temporary patch until the next nautilus. - - cd ${S} ; patch -p1 < ${FILESDIR}/nautilus-1.0.6-mozilla-1.0_rc1.diff - - # Add missing files - mkdir -p ${S}/intl - touch ${S}/intl/po2tbl.sed.in - - # Libtoolize to fix .la files, and reconf automake stuff - cd ${S} - mkdir macros - cp ${FILESDIR}/macros/* macros - libtoolize --copy --force - aclocal -I macros - automake --add-missing - autoconf &>${S}/foo -} - -src_compile() { - local myconf - - if [ -z "`use nls`" ] - then - myconf="${myconf} --disable-nls" - mkdir intl - touch intl/libgettext.h - fi - - if [ "`use mozilla`" ] - then - MOZILLA=${MOZILLA_FIVE_HOME} - myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \ - --with-mozilla-include-place=$MOZILLA/include" - - export MOZILLA_FIVE_HOME=$MOZILLA - export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME - else - myconf="${myconf} --disable-mozilla-component" - fi - - CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`" - - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --enable-eazel-services=0 \ - ${myconf} || die - - emake || die -} - -src_install() { - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - sysconfdir=${D}/etc \ - localstatedir=${D}/var/lib \ - install || die - - # Fix missing icon in Gnome Spash - insinto /usr/share/pixmaps - newins nautilus-launch-icon.png gnome-launch-icon.png - - dodoc AUTHORS COPYING* ChangeLog* NEWS TODO - - # Fix permissions in order to resolve the mozilla-view issue - chmod -R g+r,o+r ${D}/* -} - diff --git a/gnome-base/nautilus/nautilus-2.0.0-r1.ebuild b/gnome-base/nautilus/nautilus-2.0.0-r3.ebuild index 327172c6576d..323c51a029b2 100644 --- a/gnome-base/nautilus/nautilus-2.0.0-r1.ebuild +++ b/gnome-base/nautilus/nautilus-2.0.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.0-r1.ebuild,v 1.2 2002/06/15 14:43:11 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.0-r3.ebuild,v 1.1 2002/06/30 00:28:45 azarah Exp $ inherit gnome2 @@ -37,6 +37,12 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0" G2CONF="${G2CONF} --enable-platform-gnome-2" DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO" -SCHEMAS="nautilus.schemas apps_nautilus_preferences.schemas" - +src_compile () { + # Also apply the "reverse deps" patch. + # + # http://bugzilla.gnome.org/show_bug.cgi?id=75635 + ELTCONF="${ELTCONF} --reverse-deps" + gnome2_src_configure ${1} + make || die "compile dislikes me" +} diff --git a/gnome-base/nautilus/nautilus-2.0.0.ebuild b/gnome-base/nautilus/nautilus-2.0.0.ebuild deleted file mode 100644 index 162ff4dc08d7..000000000000 --- a/gnome-base/nautilus/nautilus-2.0.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.0.0.ebuild,v 1.1 2002/06/11 11:05:38 stroke Exp $ - -# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+ -DEBUG="yes" -RESTRICT="nostrip" -# force debug information -CFLAGS="${CFLAGS} -g" -CXXFLAGS="${CXXFLAGS} -g" - - -S=${WORKDIR}/${P} -DESCRIPTION="A filemanager for the Gnome2 desktop" -SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2" -HOMEPAGE="http://www.gnome.org/" -SLOT="0" -LICENSE="GPL-2 LGPL-2.1 FDL-1.1" - -RDEPEND=">=dev-libs/glib-2.0.3 - >=gnome-base/gconf-1.1.11 - >=x11-libs/gtk+-2.0.3 - >=dev-libs/libxml2-2.4.22 - >=gnome-base/gnome-vfs-1.9.12 - >=media-sound/esound-0.2.25 - >=gnome-base/bonobo-activation-0.9.9 - >=gnome-base/eel-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0 - >=gnome-base/gnome-desktop-2.0.0 - >=media-libs/libart_lgpl-2.3.8-r1 - >=gnome-base/libbonobo-1.117.1 - >=gnome-base/libbonoboui-1.117.1 - >=gnome-base/libgnomecanvas-1.117.0 - >=gnome-base/librsvg-1.1.6 - >=app-text/scrollkeeper-0.3.6" - -DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0" - - -src_compile() { - libtoolize --copy --force - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --enable-platform-gnome-2 \ - --enable-debug=yes || die - emake || die -} - -src_install() { - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - infodir=${D}/usr/share/info \ - mandir=${D}/usr/share/man \ - install || die - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - dodoc AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO -} - - -pkg_postinst() { - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - echo ">>> updating GConf2" - for SCHEMA in nautilus.schemas apps_nautilus_preferences.schemas; do - echo $SCHEMA - /usr/bin/gconftool-2 --makefile-install-rule \ - /etc/gconf/schemas/${SCHEMA} - done - echo ">>> updating scrollkeeper" - scrollkeeper-update -p /var/lib/scrollkeeper -} - - |