Version bump: 2.9 is released, and removed some older versions

(Portage version: 2.1.6.13/cvs/Linux i686)

6 files changed, 58 insertions, 325 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 94d9fc1d6973..f81600a2107a 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for rox-base/rox
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.63 2008/11/26 21:40:08 lack Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.64 2009/05/21 15:20:37 lack Exp $
+
+*rox-2.9 (20 May 2009)
+
+  20 May 2009; Jim Ramsay <lack@gentoo.org> -rox-2.6.1.ebuild,
+  -files/rox-2.6.1-nostrip.patch, -rox-2.7.ebuild,
+  -files/rox-2.7-nostrip.patch, -files/rox-2.7-text_plain.patch,
+  +rox-2.9.ebuild, +files/rox-2.9-nostrip.patch:
+  Version bump: 2.9 is released, and removed some older versions
 
 *rox-2.8-r1 (26 Nov 2008)
 
diff --git a/rox-base/rox/files/rox-2.7-nostrip.patch b/rox-base/rox/files/rox-2.7-nostrip.patch
deleted file mode 100644
index 2a63ce73f160..000000000000
--- a/rox-base/rox/files/rox-2.7-nostrip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: ROX-Filer/src/Makefile.in
-===================================================================
---- ROX-Filer/src/Makefile.in	(revision 4834)
-+++ ROX-Filer/src/Makefile.in	(working copy)
-@@ -51,10 +51,12 @@
- ${PROG}: ${OBJECTS}
- 	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
- 	mv "${PROG}" "${PLATFORM_DIR}"
-+
-+${PROG}.dbg: ${PROG}
- 	-(cd "${PLATFORM_DIR}" && \
--	 objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
--	 strip ROX-Filer && \
--	 objcopy --add-gnu-debuglink=ROX-Filer.dbg ROX-Filer)
-+	 objcopy --only-keep-debug ${PROG} ${PROG}.dbg && \
-+	 strip ${PROG} && \
-+	 objcopy --add-gnu-debuglink=${PROG}.dbg ${PROG})
- 
- clean:
- 	rm -f *.o Makefile.bak
diff --git a/rox-base/rox/files/rox-2.7-text_plain.patch b/rox-base/rox/files/rox-2.7-text_plain.patch
deleted file mode 100644
index 37630e76175c..000000000000
--- a/rox-base/rox/files/rox-2.7-text_plain.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-commit ed0adb6e4e873eca15b4765035d3c89888c74a72
-Author: Stephen Watson <stephen@kerofin.demon.co.uk>
-Date:   Mon Jan 21 23:33:13 2008 +0000
-
-    MIME magic lookup now returns text/plain for certain unknown file types.
-    Restored the code, lost in the update to the newer XDG MIME code, which checks
-    unknown files to see if they are text.
-    
-    Modifications to the XDG code are tagged with ROX: comments.
-
-diff --git a/ROX-Filer/src/xdgmime.c b/ROX-Filer/src/xdgmime.c
-index 133282d..51d38d6 100644
---- a/ROX-Filer/src/xdgmime.c
-+++ b/ROX-Filer/src/xdgmime.c
-@@ -65,6 +65,7 @@ XdgMimeCache **_xdg_mime_caches = NULL;
- static int n_caches = 0;
- 
- const char xdg_mime_type_unknown[] = "application/octet-stream";
-+const char xdg_mime_type_unknown_text[] = "text/plain"; /* ROX: */
- 
- 
- enum
-diff --git a/ROX-Filer/src/xdgmime.h b/ROX-Filer/src/xdgmime.h
-index 82b5585..52d1524 100644
---- a/ROX-Filer/src/xdgmime.h
-+++ b/ROX-Filer/src/xdgmime.h
-@@ -74,7 +74,11 @@ typedef void (*XdgMimeDestroy)  (void *user_data);
- #endif
- 
- extern const char xdg_mime_type_unknown[];
--#define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown
-+#define XDG_MIME_TYPE_UNKNOWN      xdg_mime_type_unknown
-+
-+/* ROX: */
-+extern const char xdg_mime_type_unknown_text[];
-+#define XDG_MIME_TYPE_UNKNOWN_TEXT xdg_mime_type_unknown_text
- 
- const char  *xdg_mime_get_mime_type_for_data       (const void *data,
- 						    size_t      len);
-diff --git a/ROX-Filer/src/xdgmimemagic.c b/ROX-Filer/src/xdgmimemagic.c
-index 892688b..d1d04b6 100644
---- a/ROX-Filer/src/xdgmimemagic.c
-+++ b/ROX-Filer/src/xdgmimemagic.c
-@@ -39,6 +39,9 @@
- #include <errno.h>
- #include <limits.h>
- 
-+/* ROX: */
-+#include <glib.h>
-+
- #ifndef	FALSE
- #define	FALSE	(0)
- #endif
-@@ -654,6 +657,83 @@ _xdg_mime_magic_get_buffer_extents (XdgMimeMagic *mime_magic)
-   return mime_magic->max_extent;
- }
- 
-+static gboolean _rox_buffer_looks_like_text (const void  *data,
-+					    const size_t len)
-+{
-+  gchar *end;
-+
-+  if (g_utf8_validate (data, len, (const gchar**)&end))
-+  {
-+    /* g_utf8_validate allows control characters */
-+    int i;
-+    for (i = 0; i < len; i++)
-+    {
-+      unsigned char c = ((const guchar *) data)[i];
-+      if (c < 32 && c != '\r' && c != '\n' && c != '\t')
-+	return FALSE;
-+    }
-+    return TRUE;
-+
-+  } else {
-+    /* Check whether the string was truncated in the middle of
-+     * a valid UTF8 char, or if we really have an invalid
-+     * UTF8 string
-+     */
-+    gint remaining_bytes = len;
-+
-+    remaining_bytes -= (end-((gchar*)data));
-+
-+    if (g_utf8_get_char_validated(end, remaining_bytes) == -2)
-+      return TRUE;
-+#if defined(HAVE_WCTYPE_H) && defined (HAVE_MBRTOWC)
-+    else {
-+      size_t wlen;
-+      wchar_t wc;
-+      gchar *src, *end;
-+      mbstate_t state;
-+
-+      src = data;
-+      end = data+len;
-+                       
-+      memset (&state, 0, sizeof (state));
-+      while (src < end) {
-+	/* Don't allow embedded zeros in textfiles */
-+	if (*src == 0)
-+	  return FALSE;
-+                               
-+	wlen = mbrtowc(&wc, src, end - src, &state);
-+
-+	if (wlen == (size_t)(-1)) {
-+	  /* Illegal mb sequence */
-+	  return FALSE;
-+	}
-+                               
-+	if (wlen == (size_t)(-2)) {
-+	  /* No complete mb char before end
-+	   * Probably a cut off char which is ok */
-+	  return TRUE;
-+	}
-+
-+	if (wlen == 0) {
-+	  /* Don't allow embedded zeros in textfiles */
-+	  return FALSE;
-+	}
-+        
-+	if (!iswspace (wc)  && !iswprint(wc)) {
-+	  /* Not a printable or whitspace
-+	   * Probably not a text file */
-+	  return FALSE;
-+	}
-+	
-+	src += wlen;
-+      }
-+      return TRUE;
-+    }
-+#endif /* defined(HAVE_WCTYPE_H) && defined (HAVE_MBRTOWC) */
-+  }
-+  return FALSE;
-+}
-+
- const char *
- _xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic,
- 			     const void   *data,
-@@ -708,6 +788,12 @@ _xdg_mime_magic_lookup_data (XdgMimeMagic *mime_magic,
- 	}
-     }
- 
-+  if (mime_type == NULL)
-+    {
-+      if(_rox_buffer_looks_like_text(data, len))
-+	 mime_type = XDG_MIME_TYPE_UNKNOWN_TEXT;
-+    }
-+  
-   return mime_type;
- }
- 
diff --git a/rox-base/rox/files/rox-2.6.1-nostrip.patch b/rox-base/rox/files/rox-2.9-nostrip.patch
index 2a63ce73f160..2a63ce73f160 100644
--- a/rox-base/rox/files/rox-2.6.1-nostrip.patch
+++ b/rox-base/rox/files/rox-2.9-nostrip.patch
diff --git a/rox-base/rox/rox-2.7.ebuild b/rox-base/rox/rox-2.7.ebuild
deleted file mode 100644
index 0f50c9073d93..000000000000
--- a/rox-base/rox/rox-2.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7.ebuild,v 1.5 2008/08/28 17:55:16 lack Exp $
-
-inherit eutils multilib
-
-MY_P="rox-filer-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="ROX is a desktop environment and filer based on RISC OS."
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
-IUSE="svg"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.2
-	>=dev-libs/libxml2-2.4.23
-	>=x11-misc/shared-mime-info-0.14
-	svg? ( gnome-base/librsvg )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-APPNAME="ROX-Filer"
-APPDIR="/usr/$(get_libdir)/rox"
-LIBDIR="/usr/$(get_libdir)/"
-WRAPPERNAME="rox"
-MIMEDIR="/usr/share/mime"
-MIMECONFDIR="/etc/xdg/rox.sourceforge.net"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-nostrip.patch
-	epatch "${FILESDIR}"/${P}-text_plain.patch
-}
-
-src_compile() {
-
-	cd ${APPNAME}
-
-	# Most rox self-compiles have a 'read' call to wait for the user to
-	# press return if the compile fails.
-	# Find and remove this:
-	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
-
-	./AppRun --compile || die "make failed"
-	(cd src; make clean) > /dev/null
-	# don't need these directories anymore
-	if [ -n "${KEEP_SRC}" ]; then
-		(cd src; make clean) > /dev/null
-	else
-		rm -rf src
-	fi
-	rm -fr build
-
-	# Restore the original AppRun
-	mv AppRun.bak AppRun
-}
-
-# new streamlined install
-
-src_install() {
-	doman rox.1
-
-	dodir ${APPDIR}
-	cp -r ${APPNAME}/ "${D}/${APPDIR}"
-
-	# add documentation to be proper
-	( cd ${APPNAME}/Help
-	dodoc Changes README README-es TODO
-	)
-
-	# install shell script
-	dodir /usr/bin
-
-	cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF
-#!/bin/sh
-if [ "\${LIBDIRPATH}" ]; then
-	export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}"
-else
-	export LIBDIRPATH="${LIBDIR}"
-fi
-
-if [ "\${APPDIRPATH}" ]; then
-	export APPDIRPATH="\${APPDIRPATH}:${APPDIR}"
-else
-	export APPDIRPATH="${APPDIR}"
-fi
-exec "${APPDIR}/${APPNAME}/AppRun" "\$@"
-EOF
-
-	cat >"${D}/usr/bin/${WRAPPERNAME}uri" <<EOF
-#!/bin/sh
-exec "${APPDIR}/${APPNAME}/AppRun" -U "\$@"
-EOF
-
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}"
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}uri"
-
-	# install rox.xml
-	insinto ${MIMEDIR}/packages
-	doins rox.xml
-
-	# CHOICES system is gone. Now use XDG only
-	# these are shell scripts and must be +x.
-	exeinto ${MIMECONFDIR}/MIME-types
-	doexe Choices/MIME-types/*
-
-	insinto /usr/share/pixmaps
-	newins ${APPNAME}/.DirIcon ${APPNAME}.png
-
-	make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME} "System;Utility;Core;ROX"
-}
-
-pkg_postinst() {
-	update-mime-database ${MIMEDIR}
-	einfo "${APPNAME} has been installed in ${APPDIR}."
-	einfo "To run, you may type ${WRAPPERNAME} at a prompt (within a WM) or"
-	einfo "add it to an .xinit or other script during WM startup."
-}
diff --git a/rox-base/rox/rox-2.6.1.ebuild b/rox-base/rox/rox-2.9.ebuild
index 67eaf6176b68..4691a846fddf 100644
--- a/rox-base/rox/rox-2.6.1.ebuild
+++ b/rox-base/rox/rox-2.9.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.6.1.ebuild,v 1.9 2008/02/29 20:32:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.9.ebuild,v 1.1 2009/05/21 15:20:37 lack Exp $
 
+EAPI=2
 inherit eutils multilib
 
 MY_P="rox-filer-${PV}"
@@ -13,14 +14,20 @@ SRC_URI="mirror://sourceforge/rox/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="svg"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="svg +video"
 
 RDEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.2
 	>=dev-libs/libxml2-2.4.23
 	>=x11-misc/shared-mime-info-0.14
-	svg? ( gnome-base/librsvg )"
+	svg? ( gnome-base/librsvg )
+	>=rox-base/zeroinstall-injector-0.40
+	"
+
+PDEPEND="rox-base/mime-editor
+		rox-base/thumbs
+		video? ( rox-extra/videothumbnail )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20"
@@ -32,33 +39,28 @@ WRAPPERNAME="rox"
 MIMEDIR="/usr/share/mime"
 MIMECONFDIR="/etc/xdg/rox.sourceforge.net"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 }
 
 src_compile() {
-
 	cd ${APPNAME}
 
-	# Most rox self-compiles have a 'read' call to wait for the user to
-	# press return if the compile fails.
-	# Find and remove this:
-	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
+	mkdir build
+	pushd build
+	../src/configure
+	emake
+	popd
 
-	./AppRun --compile || die "make failed"
-	(cd src; make clean) > /dev/null
 	# don't need these directories anymore
 	if [ -n "${KEEP_SRC}" ]; then
-		(cd src; make clean) > /dev/null
+		pushd src
+		make clean > /dev/null
+		popd
 	else
 		rm -rf src
 	fi
 	rm -fr build
-
-	# Restore the original AppRun
-	mv AppRun.bak AppRun
 }
 
 # new streamlined install
@@ -70,9 +72,9 @@ src_install() {
 	cp -r ${APPNAME}/ "${D}/${APPDIR}"
 
 	# add documentation to be proper
-	( cd ${APPNAME}/Help
+	pushd ${APPNAME}/Help
 	dodoc Changes README README-es TODO
-	)
+	popd
 
 	# install shell script
 	dodir /usr/bin
@@ -98,12 +100,12 @@ EOF
 exec "${APPDIR}/${APPNAME}/AppRun" -U "\$@"
 EOF
 
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}"
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}uri"
+	fperms 0755 "/usr/bin/${WRAPPERNAME}"
+	fperms 0755 "/usr/bin/${WRAPPERNAME}uri"
 
-	# install rox.xml
-	insinto ${MIMEDIR}/packages
-	doins rox.xml
+	# Do not install rox.xml - It wrecks any app with a SVG-format .DirIcon
+	#insinto ${MIMEDIR}/packages
+	#doins rox.xml
 
 	# CHOICES system is gone. Now use XDG only
 	# these are shell scripts and must be +x.
@@ -113,11 +115,29 @@ EOF
 	insinto /usr/share/pixmaps
 	newins ${APPNAME}/.DirIcon ${APPNAME}.png
 
-	make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME} "System;Utility;Core;ROX"
+	make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME} "System;FileTools;FileManager"
+
+	# Install the 0install feed
+	local NATIVE_FEED_DIR="/usr/share/0install.net/native_feeds"
+	local ICON_CACHE_DIR="/var/cache/0install.net/interface_icons"
+
+	0distutils ${APPNAME}.xml > tmp.native_feed || die "0distutils feed edit	failed"
+	insinto "${APPDIR}/${APPNAME}"
+	newins tmp.native_feed ${APPNAME}.xml
+
+	local feedname
+	feedname=$(0distutils -e tmp.native_feed) || die "0distutils URI escape	failed"
+	dosym "${APPDIR}/${APPNAME}/${APPNAME}.xml" "${NATIVE_FEED_DIR}/${feedname}"
+
+	local cachedname
+	cachedname=$(0distutils -c tmp.native_feed) || die "0distutils URI escape	failed"
+	dosym "${APPDIR}/${APPNAME}/.DirIcon" "${ICON_CACHE_DIR}/${cachedname}"
 }
 
 pkg_postinst() {
-	update-mime-database ${MIMEDIR}
+	# Do not install rox.xml - It wrecks any app with a SVG-format .DirIcon
+	#update-mime-database ${MIMEDIR}
+
 	einfo "${APPNAME} has been installed in ${APPDIR}."
 	einfo "To run, you may type ${WRAPPERNAME} at a prompt (within a WM) or"
 	einfo "add it to an .xinit or other script during WM startup."