Removed MIME hint that set all .DirIcon files to image/png - Breaks rox apps like XDGMenu who have SVG icons.

Package-Manager: portage-2.1.6_rc1/cvs/Linux 2.6.26-gentoo-r1 i686

3 files changed, 158 insertions, 2 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 5626838d1d26..94d9fc1d6973 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.62 2008/08/31 21:15:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.63 2008/11/26 21:40:08 lack Exp $
+
+*rox-2.8-r1 (26 Nov 2008)
+
+  26 Nov 2008; Jim Ramsay <lack@gentoo.org> +rox-2.8-r1.ebuild:
+  Removed MIME hint that set all .DirIcon files to image/png - Breaks rox
+  apps like XDGMenu who have SVG icons.
 
   31 Aug 2008; Raúl Porcel <armin76@gentoo.org> rox-2.8.ebuild:
   alpha/sparc stable wrt #236057
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index 1cf96d7542b3..5c9ca9188ed7 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -7,6 +7,7 @@ DIST rox-filer-2.7.tar.bz2 1829001 RMD160 f378129073b00e388559380fc551b23437cd4c
 DIST rox-filer-2.8.tar.bz2 1834202 RMD160 9f0aecde32fdd9ecc39efe80bd037b95850bb38c SHA1 7eec68a106a2605b2733025e44d890961b52ea1e SHA256 f43fd00bcce7ef86125c270826c9df48b0de3edf813826a7de8cce2c5507b268
 EBUILD rox-2.6.1.ebuild 2835 RMD160 221c18c70625a0b8a9a2126604d843d9810e8d3a SHA1 851d6e50af026d29a6e42997c53fe1c1fc795e2f SHA256 4883e5dcc6108f3fd3b921e0e4faa1a889795c80cfc4ae907c367894f74447cb
 EBUILD rox-2.7.ebuild 2880 RMD160 4eba693f28bcaf6f02c9cf1e837fc452987cf423 SHA1 832e31c25939a55bd9ae9a4d13028b88b8c144c7 SHA256 d32cbfef276312ff23b9ea84cfee503d36360e81ba9351e9b173def80fb4f7a3
+EBUILD rox-2.8-r1.ebuild 3681 RMD160 f6fff5aa5857cf81f6499e10ba6af08e567d76f9 SHA1 c4dde427ea2274c8ed099d12da3657956b3fbec7 SHA256 95b3509df582191eeb2ce9d336b90bddbf8a895b7ec24625f0338360d770f416
 EBUILD rox-2.8.ebuild 3620 RMD160 05becb4f3cfc997ba4f550b1edf8dc5ee527d2f2 SHA1 4907870396b5256fc42ac8c21d7268ac97999827 SHA256 88f6c319fdf4e8c474aafb2fc9e113ecf25dee0f7f29c3b6e339c2d377e27ae5
-MISC ChangeLog 13413 RMD160 d22411167d12d49cdbf2146e8b066654ec65f545 SHA1 cc4a5676d87107f056a1cec2f965eed4e1e54b2f SHA256 dfce8dff5e0b641bb892218814caeb7c4998d83dd3ea38469114d01993f07b77
+MISC ChangeLog 13616 RMD160 d1c2ea71b9d12a7036f0f653e86d12927fd1039e SHA1 c75765b13314a3f914ecad28f418cc9d6b6cf1aa SHA256 d189d8d22a499d63f532a413775dcbe3f48f81e6da00a35adcfd7a8ba12b3fbd
 MISC metadata.xml 303 RMD160 f0f8f4eccfc33d0cd7fc7c33b79cb37149bc84f3 SHA1 47973f2a8326ce91710b8b343807bd6cbebddfd1 SHA256 61d2d70170955a18a61d47d505c64fe64f9a6eba21a3989eff74ba9f36154b66
diff --git a/rox-base/rox/rox-2.8-r1.ebuild b/rox-base/rox/rox-2.8-r1.ebuild
new file mode 100644
index 000000000000..f1d0a98c5085
--- /dev/null
+++ b/rox-base/rox/rox-2.8-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.8-r1.ebuild,v 1.1 2008/11/26 21:40:08 lack Exp $
+
+EAPI=1
+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 +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 )
+	>=rox-base/zeroinstall-injector-0.31-r1
+	"
+
+PDEPEND="rox-base/mime-editor
+		rox-base/thumbs
+		video? ( rox-extra/videothumbnail )"
+
+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
+}
+
+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"
+
+	# don't need these directories anymore
+	if [ -n "${KEEP_SRC}" ]; then
+		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
+
+src_install() {
+	doman rox.1
+
+	dodir ${APPDIR}
+	cp -r ${APPNAME}/ "${D}/${APPDIR}"
+
+	# add documentation to be proper
+	pushd ${APPNAME}/Help
+	dodoc Changes README README-es TODO
+	popd
+
+	# 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
+
+	fperms 0755 "/usr/bin/${WRAPPERNAME}"
+	fperms 0755 "/usr/bin/${WRAPPERNAME}uri"
+
+	# 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.
+	exeinto ${MIMECONFDIR}/MIME-types
+	doexe Choices/MIME-types/*
+
+	insinto /usr/share/pixmaps
+	newins ${APPNAME}/.DirIcon ${APPNAME}.png
+
+	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}
+	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."
+}