fix several issues in 0.6 and cleanup

10 files changed, 52 insertions, 133 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 33cc90933586..5e47d331b939 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/eog
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.53 2004/02/10 06:41:46 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.54 2004/03/03 16:12:13 foser Exp $
+
+  03 Mar 2004; foser <foser@gentoo.org> eog-0.6-r4.ebuild :
+  Fix sandbox issues (#43165) patch by <usata@gentoo.org>
+  Fix SLOT to be 1, this is not parallel installable (#43165)
+  Remove redundant ${S}
+  Use gnome.org for SRC_URI
 
   10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> eog-2.4.1.ebuild:
   set ppc in keywords
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 3ea8dc286b0b..e26d5bc78664 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,14 +1,9 @@
-MD5 f8be1455382d026f7cf9c3874231046e ChangeLog 6098
-MD5 71a6c1fcecf95d90c484fe9dd1df726e eog-0.6-r4.ebuild 1187
-MD5 95500d4757894a4fc5329273ed8cc563 eog-2.2.0.ebuild 875
-MD5 4c7036d004e7fcd4e99a941b2c454158 eog-2.2.1.ebuild 930
-MD5 8aa0ad69b4d0f2ae19ce56045dff4e4c eog-2.2.2.ebuild 936
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 6614ab3444aba8f02b557767107739eb eog-2.4.0.ebuild 1000
+MD5 5106ee48181b55edc080a7495ff747b8 eog-0.6-r4.ebuild 1194
 MD5 2f0e5bfe2daac0f5d62b3caffa464994 eog-2.4.1.ebuild 1003
-MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
-MD5 3588e1c18ba9376d9061078d9e9e0e1b files/digest-eog-2.2.0 62
-MD5 b3034328add36cac69c5431bc454bed4 files/digest-eog-2.2.1 62
-MD5 078bf6de0b825ccca79dcd09e43c4230 files/digest-eog-2.2.2 62
+MD5 3a73e8a870205fd4ae9d6041fb8c13c4 ChangeLog 6325
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f4785b67530bea551199881bc37d55d5 files/eog-0.6-version_locale_dirs.patch 828
 MD5 41a7979701c834c2af2d1c29e7a8a05d files/digest-eog-2.4.0 62
 MD5 e5e78d211c65b9819d1c4b6a8d8db042 files/digest-eog-2.4.1 62
+MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
diff --git a/media-gfx/eog/eog-0.6-r4.ebuild b/media-gfx/eog/eog-0.6-r4.ebuild
index dc0e26aa7ff9..915757d54a31 100644
--- a/media-gfx/eog/eog-0.6-r4.ebuild
+++ b/media-gfx/eog/eog-0.6-r4.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.9 2003/09/06 23:56:38 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.10 2004/03/03 16:12:13 foser Exp $
+
+GNOME_TARBALL_SUFFIX="gz"
+inherit gnome.org
 
 IUSE="nls png jpeg"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
-SLOT="0"
+SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 DEPEND=">=gnome-base/gconf-1.0.4-r2
 	>=gnome-base/bonobo-1.0.9-r1
 	>=gnome-base/gnome-print-0.25i
-	>=gnome-base/libglade-0.17
+	=gnome-base/libglade-0*
 	>=gnome-base/oaf-0.6.2
 	>=media-libs/gdk-pixbuf-0.16.0
 	=dev-libs/glib-1.2*
@@ -28,22 +29,25 @@ RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext
 	>=dev-util/intltool-0.11 )"
 
+src_unpack() {
 
-src_compile() {
+	unpack ${A}
 
-	local myconf
+	cd ${S}/po
+	# Fix the makefile to use DESTDIR for locale dirs as well
+	epatch ${FILESDIR}/${P}-version_locale_dirs.patch
 
-	use nls || myconf="--disable-nls"
+}
+
+src_compile() {
 
-	econf ${myconf} || die
+	econf `use_enable nls`  || die
 	emake || die
 }
 
 src_install() {
 
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=/var/lib \
+	make DESTDIR=${D} \
 		GCONF_CONFIG_SOURCE="xml::${D}/etc/gconf/gconf.xml.defaults" \
 		install || die
 
diff --git a/media-gfx/eog/eog-2.2.0.ebuild b/media-gfx/eog/eog-2.2.0.ebuild
deleted file mode 100644
index 18f0ce8a1c99..000000000000
--- a/media-gfx/eog/eog-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.2.0.ebuild,v 1.9 2003/09/12 20:47:09 liquidx Exp $
-
-inherit gnome2
-
-IUSE="jpeg png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha ~sparc"
-
-RDEPEND=">=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/libgnomeui-2.0.6
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/eel-2.2.0
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}
-	dev-libs/popt
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
diff --git a/media-gfx/eog/eog-2.2.1.ebuild b/media-gfx/eog/eog-2.2.1.ebuild
deleted file mode 100644
index 2bfe393439be..000000000000
--- a/media-gfx/eog/eog-2.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.2.1.ebuild,v 1.10 2003/09/12 20:47:09 liquidx Exp $
-
-inherit gnome2
-
-IUSE="jpeg png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc hppa amd64"
-
-RDEPEND=">=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/eel-2.2.0
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}
-	dev-libs/popt
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-}
diff --git a/media-gfx/eog/eog-2.2.2.ebuild b/media-gfx/eog/eog-2.2.2.ebuild
deleted file mode 100644
index d727208a67ad..000000000000
--- a/media-gfx/eog/eog-2.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.2.2.ebuild,v 1.7 2003/09/27 02:22:03 darkspecter Exp $
-
-inherit gnome2
-
-IUSE="jpeg png"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
-
-RDEPEND=">=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/eel-2.2.0
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}
-	dev-libs/popt
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-}
diff --git a/media-gfx/eog/files/digest-eog-2.2.0 b/media-gfx/eog/files/digest-eog-2.2.0
deleted file mode 100644
index d85ab1e4a983..000000000000
--- a/media-gfx/eog/files/digest-eog-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e02256bc6837d1366a3aa5df66396dfa eog-2.2.0.tar.bz2 469229
diff --git a/media-gfx/eog/files/digest-eog-2.2.1 b/media-gfx/eog/files/digest-eog-2.2.1
deleted file mode 100644
index a52b8dc8a5f9..000000000000
--- a/media-gfx/eog/files/digest-eog-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6251a7d4a6484187e9236a3f20b6d719 eog-2.2.1.tar.bz2 481442
diff --git a/media-gfx/eog/files/digest-eog-2.2.2 b/media-gfx/eog/files/digest-eog-2.2.2
deleted file mode 100644
index b3406faf6392..000000000000
--- a/media-gfx/eog/files/digest-eog-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d099e3dddd8a44b358aeaf85ad27519 eog-2.2.2.tar.bz2 486912
diff --git a/media-gfx/eog/files/eog-0.6-version_locale_dirs.patch b/media-gfx/eog/files/eog-0.6-version_locale_dirs.patch
new file mode 100644
index 000000000000..435fb9ad06c4
--- /dev/null
+++ b/media-gfx/eog/files/eog-0.6-version_locale_dirs.patch
@@ -0,0 +1,23 @@
+--- Makefile.in.in.orig	2001-02-15 11:06:37.000000000 +0900
++++ Makefile.in.in	2004-02-28 14:24:27.623395272 +0900
+@@ -112,16 +112,16 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \