Version cleanup and new release

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 26 insertions, 184 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/Manifest b/rox-base/rox/Manifest
index 93b17d85792f..7924817fc4a9 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX rox-2.8-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
+AUX rox-2.10-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
 AUX rox-2.9-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
-DIST rox-filer-2.8.tar.bz2 1834202 RMD160 9f0aecde32fdd9ecc39efe80bd037b95850bb38c SHA1 7eec68a106a2605b2733025e44d890961b52ea1e SHA256 f43fd00bcce7ef86125c270826c9df48b0de3edf813826a7de8cce2c5507b268
+DIST rox-filer-2.10.tar.bz2 1903129 RMD160 48b64ccaceb96b59fbd2467aa65d8e128ebd960d SHA1 691297d18be69a883db0a38130f5df99f9e1bc29 SHA256 ce8b557c2308c7b764f860f7de3780bb14dfff853e796158380f38daa9c0cfa8
 DIST rox-filer-2.9.tar.bz2 1894519 RMD160 2475b150c228987dc0de732252934c2647f3b6d1 SHA1 23cce525aeab20568b5b3c88919c364a5b802aa3 SHA256 7f6143ea8969d259c932f027a9b75ccba646f4e8075d5af2c02c858fc41eb672
-EBUILD rox-2.8-r1.ebuild 3680 RMD160 8b897a667b671a3f81792a96b8f23c386dbe535e SHA1 ead011b283b1b8659b26bef25955233e06aa43dc SHA256 184489a858b03aa702fd8e72b0268e65d17dbdfa6d73febb5bd78569dadc0da5
-EBUILD rox-2.8.ebuild 3620 RMD160 05becb4f3cfc997ba4f550b1edf8dc5ee527d2f2 SHA1 4907870396b5256fc42ac8c21d7268ac97999827 SHA256 88f6c319fdf4e8c474aafb2fc9e113ecf25dee0f7f29c3b6e339c2d377e27ae5
+EBUILD rox-2.10.ebuild 3510 RMD160 586cd2490c9aac5e1890b1e168d4cd2f2666bdae SHA1 fc8306d1e469f5f5fde2d0c7876cd4276715d242 SHA256 41fdf727320f83780e3e274c7cb378827f7c784491c9cc42dcf1c7a8d7f0152b
 EBUILD rox-2.9.ebuild 3505 RMD160 445da27a687b30b821df4cac78c955acff7f9314 SHA1 0c39ba5f159a74326ca3b9e9077d7221fd36a725 SHA256 3d7eef7b43fd80756bf6512ef24a7bd69555fecedfeaf8c691cf1cb90cd61371
-MISC ChangeLog 14892 RMD160 971b246ad3cba7f4fc69a49978a203f2b5fb1a94 SHA1 c44e16c78aff1a44109c577082199a3768445090 SHA256 4dd8481fb22f9d763b030b64e60da7f7f6742e829301463709521d2cd22eb0eb
+MISC ChangeLog 15114 RMD160 b04195743d4330628d4521732bbb67d7eb1f0abb SHA1 c556ce7090fc086178bb09d69dfa98bbffadc352 SHA256 39dd7744b3a3085d9627a5ae62ae613cb9a6801d6a28a147a85932c7b715f8fc
 MISC metadata.xml 303 RMD160 f0f8f4eccfc33d0cd7fc7c33b79cb37149bc84f3 SHA1 47973f2a8326ce91710b8b343807bd6cbebddfd1 SHA256 61d2d70170955a18a61d47d505c64fe64f9a6eba21a3989eff74ba9f36154b66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkptd8gACgkQAgIglOz4paCUxQCfdgQlDmjagQqlcDuh0C7TkfUz
-ijAAniwxPRRgnGOBdO5OZ3imXX7W5EDs
-=+61p
------END PGP SIGNATURE-----
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."
-}