Version cleanup and new release

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 22 insertions, 169 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 1ff140f65fd9..41d3bb401eec 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/rox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.74 2009/07/27 09:47:35 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.75 2009/08/05 15:24:36 lack Exp $
+
+*rox-2.10 (05 Aug 2009)
+
+  05 Aug 2009; Jim Ramsay <lack@gentoo.org> -rox-2.8.ebuild,
+  -rox-2.8-r1.ebuild, -files/rox-2.8-nostrip.patch, +rox-2.10.ebuild,
+  +files/rox-2.10-nostrip.patch:
+  Version cleanup and new release
 
   27 Jul 2009; Tiago Cunha <tcunha@gentoo.org> rox-2.9.ebuild:
   stable sparc, bug 275392
diff --git a/rox-base/rox/files/rox-2.8-nostrip.patch b/rox-base/rox/files/rox-2.10-nostrip.patch
index 2a63ce73f160..2a63ce73f160 100644
--- a/rox-base/rox/files/rox-2.8-nostrip.patch
+++ b/rox-base/rox/files/rox-2.10-nostrip.patch
diff --git a/rox-base/rox/rox-2.8-r1.ebuild b/rox-base/rox/rox-2.10.ebuild
index 18a133db76c1..f631ca48b275 100644
--- a/rox-base/rox/rox-2.8-r1.ebuild
+++ b/rox-base/rox/rox-2.10.ebuild
@@ -1,8 +1,8 @@
 # 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.8-r1.ebuild,v 1.6 2009/06/03 17:43:32 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.10.ebuild,v 1.1 2009/08/05 15:24:36 lack Exp $
 
-EAPI=1
+EAPI=2
 inherit eutils multilib
 
 MY_P="rox-filer-${PV}"
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/rox/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="svg +video"
+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
+	>=rox-base/zeroinstall-injector-0.40
 	"
 
 PDEPEND="rox-base/mime-editor
@@ -39,22 +39,18 @@ 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
-
-	./AppRun --compile || die "make failed"
+	mkdir build
+	pushd build
+	../src/configure
+	emake
+	popd
 
 	# don't need these directories anymore
 	if [ -n "${KEEP_SRC}" ]; then
@@ -65,9 +61,6 @@ src_compile() {
 		rm -rf src
 	fi
 	rm -fr build
-
-	# Restore the original AppRun
-	mv AppRun.bak AppRun
 }
 
 # new streamlined install
@@ -142,7 +135,9 @@ EOF
 }
 
 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."
diff --git a/rox-base/rox/rox-2.8.ebuild b/rox-base/rox/rox-2.8.ebuild
deleted file mode 100644
index 76c41a4e1979..000000000000
--- a/rox-base/rox/rox-2.8.ebuild
+++ /dev/null
@@ -1,149 +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.8.ebuild,v 1.5 2008/08/31 21:15:26 armin76 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"
-
-	# 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;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."
-}