Version bump - 2.6.1 is released

Package-Manager: portage-2.1.2.8

5 files changed, 170 insertions, 5 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 2fd4e1586551..7dbc04caaaee 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/rox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.39 2007/04/25 21:21:43 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.40 2007/06/12 15:19:26 lack Exp $
+
+*rox-2.6.1 (12 Jun 2007)
+
+  12 Jun 2007; Jim Ramsay <lack@gentoo.org> +files/rox-2.6.1-nostrip.patch,
+  +rox-2.6.1.ebuild:
+  Version bump - 2.6.1 is released
 
   25 Apr 2007; Jim Ramsay <lack@gentoo.org> -rox-2.3.ebuild,
   -rox-2.5.ebuild, -rox-2.5-r1.ebuild:
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index 1b7b7b718160..7dfe01c4a04a 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -6,15 +6,24 @@ AUX rox-2.6-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SH
 MD5 f2e89f5a5d685a0015bb66308a0ec6b8 files/rox-2.6-nostrip.patch 664
 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc files/rox-2.6-nostrip.patch 664
 SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc files/rox-2.6-nostrip.patch 664
+AUX rox-2.6.1-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
+MD5 f2e89f5a5d685a0015bb66308a0ec6b8 files/rox-2.6.1-nostrip.patch 664
+RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc files/rox-2.6.1-nostrip.patch 664
+SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc files/rox-2.6.1-nostrip.patch 664
+DIST rox-filer-2.6.1.tar.bz2 1816711 RMD160 94a3320883c49066072d44f25f417e20739711ca SHA1 5364ac260970ecafa58f92892becf8104db025a3 SHA256 e7efefbfa8e37ba7263771bdfd0b16c9f4b47b09d301b82616012ad53eb03e02
 DIST rox-filer-2.6.tar.bz2 1815735 RMD160 1b4e8c65208ba84b78584471b1a7b711609c7623 SHA1 3f0be6bc480aa0752fe80c83dca321655a2cab19 SHA256 c1f8d7535528de3badf8762ba88bb1f41700f5117788abc575959effb6939960
+EBUILD rox-2.6.1.ebuild 2847 RMD160 4b39f2355f5d9d4b59eac1fe3306e6de569435aa SHA1 cd5f935741b223e31f5c48943eeccfa2d3e53ee7 SHA256 6008d1b59cc63382799eb551b70194ffd1c7cfc0b660726bfd3c209bf6010e1f
+MD5 5f3cbb062cb7b4879420e5e4bbd091c1 rox-2.6.1.ebuild 2847
+RMD160 4b39f2355f5d9d4b59eac1fe3306e6de569435aa rox-2.6.1.ebuild 2847
+SHA256 6008d1b59cc63382799eb551b70194ffd1c7cfc0b660726bfd3c209bf6010e1f rox-2.6.1.ebuild 2847
 EBUILD rox-2.6.ebuild 2812 RMD160 087ee14b323fe40d0d23b4dd4579aedba53d2f5e SHA1 8475a7fdbcf6bdde2fd9db21f5bc8cc1bda56cc6 SHA256 923557796ae6def1a4e422406b9ee35d1e3a89e9482069179704a84995d13e3b
 MD5 360dcf4800eeb89c5b7808ae69aeb649 rox-2.6.ebuild 2812
 RMD160 087ee14b323fe40d0d23b4dd4579aedba53d2f5e rox-2.6.ebuild 2812
 SHA256 923557796ae6def1a4e422406b9ee35d1e3a89e9482069179704a84995d13e3b rox-2.6.ebuild 2812
-MISC ChangeLog 10156 RMD160 92e7a55c7924104bffca7b189fcba38af6c8f73a SHA1 c314bab6d6dcc7459c5901a9fbcd75e9caffb582 SHA256 62ee36f2053062b36292818c03d3e6fa99084c8773d00c1d5d76b15024cc9064
-MD5 a417871aae69f7339386ef5298894fed ChangeLog 10156
-RMD160 92e7a55c7924104bffca7b189fcba38af6c8f73a ChangeLog 10156
-SHA256 62ee36f2053062b36292818c03d3e6fa99084c8773d00c1d5d76b15024cc9064 ChangeLog 10156
+MISC ChangeLog 10315 RMD160 a30578f0e663a08be107ddea8738f8a7c7b394af SHA1 60256d23a33c1af0a62800c2412dcfae16602ca7 SHA256 0c08074f7225276ce6c18fd5609841bb671fd4320b628755ed32f4ddb9323f5c
+MD5 ceb6ce00eb343d6fef13fc9e6eb6ae65 ChangeLog 10315
+RMD160 a30578f0e663a08be107ddea8738f8a7c7b394af ChangeLog 10315
+SHA256 0c08074f7225276ce6c18fd5609841bb671fd4320b628755ed32f4ddb9323f5c ChangeLog 10315
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -22,3 +31,6 @@ SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c metadata
 MD5 4333bb4141d401d3eb717f1e478a7ea3 files/digest-rox-2.6 247
 RMD160 157c17ebb4264c072263d53436cd1e86b2202f31 files/digest-rox-2.6 247
 SHA256 839b253d5048e321d4d49f47b9443f2b615f9297ba85d54ce8b7fa6fe4df255a files/digest-rox-2.6 247
+MD5 a64206d4ce3eebf3d17573c19eddc79b files/digest-rox-2.6.1 253
+RMD160 1f44f44b65752a54d3939e785f25cd9163315c98 files/digest-rox-2.6.1 253
+SHA256 f5661e10c0f8c11a2669919a00605727b7c259c8da5520ff44654075fdacdb9f files/digest-rox-2.6.1 253
diff --git a/rox-base/rox/files/digest-rox-2.6.1 b/rox-base/rox/files/digest-rox-2.6.1
new file mode 100644
index 000000000000..1d387683eae4
--- /dev/null
+++ b/rox-base/rox/files/digest-rox-2.6.1
@@ -0,0 +1,3 @@
+MD5 e7f7b0b8afbbdf3132ff3af043ee213c rox-filer-2.6.1.tar.bz2 1816711
+RMD160 94a3320883c49066072d44f25f417e20739711ca rox-filer-2.6.1.tar.bz2 1816711
+SHA256 e7efefbfa8e37ba7263771bdfd0b16c9f4b47b09d301b82616012ad53eb03e02 rox-filer-2.6.1.tar.bz2 1816711
diff --git a/rox-base/rox/files/rox-2.6.1-nostrip.patch b/rox-base/rox/files/rox-2.6.1-nostrip.patch
new file mode 100644
index 000000000000..2a63ce73f160
--- /dev/null
+++ b/rox-base/rox/files/rox-2.6.1-nostrip.patch
@@ -0,0 +1,20 @@
+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/rox-2.6.1.ebuild b/rox-base/rox/rox-2.6.1.ebuild
new file mode 100644
index 000000000000..7e7f75ba95aa
--- /dev/null
+++ b/rox-base/rox/rox-2.6.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2007 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.1 2007/06/12 15:19:26 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
+}
+
+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 COPYING 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}.png "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."
+}