Version bump - Rox 2.6 is released

Package-Manager: portage-2.1.2-r10

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 5c15d4d1b2e59c60d50145f3226b454319bdbcbe..49706e2145503cc492aa0e4517a56ab5c5215c8a 100644 (file)
--- 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.32 2007/02/10 20:10:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.33 2007/02/27 15:45:31 lack Exp $
+
+*rox-2.6 (27 Feb 2007)
+
+  27 Feb 2007; Jim Ramsay <lack@gentoo.org> +files/rox-2.6-nostrip.patch,
+  +rox-2.6.ebuild:
+  Version bump - Rox 2.6 is released
 
   10 Feb 2007; Jim Ramsay <lack@gentoo.org> -files/rox-2.2.0-gcc4.patch,
   -rox-2.2.0.ebuild, rox-2.3.ebuild:

diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index 2d884f95f544d7f85e7353e2501c3712e2ba1b12..94ef7d030b4ef5651922307a6f9ab24f0b0cc0e3 100644 (file)
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -2,9 +2,14 @@ AUX rox-2.5-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SH
 MD5 f2e89f5a5d685a0015bb66308a0ec6b8 files/rox-2.5-nostrip.patch 664
 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc files/rox-2.5-nostrip.patch 664
 SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc files/rox-2.5-nostrip.patch 664
+AUX rox-2.6-nostrip.patch 664 RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc SHA1 b9f0fe536442382a393e059ed8a2c830663427cb SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc
+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
 DIST 01_all_rox-cvs-fix.patch.bz2 52369 RMD160 e3a18045f6aac0862b5dd13c152fe150093d62ce SHA1 2fc49d6e02669c86a029275fa1be3fa83ffe780d SHA256 0f20cf0e1f976cd270756f8f0a068e82ebd0e923016401d2cadc8ddd0a8bc8b2
 DIST rox-2.3.tgz 2246715 RMD160 073227bf60046e325e6b414c19db62fa1be3d43d SHA1 44a2879d77bb101cbe29d6a372a45b7acfbc3d53 SHA256 268704b4dd5910a8713afc36a8e53f728516b766a635a4a361fb034a47689ba0
 DIST rox-filer-2.5.tar.bz2 1785317 RMD160 a0d2f9fcc3eca8063b77d93460a19ab38600e815 SHA1 062e54d98169413eccd41b23e2b4766718004e7e SHA256 d91120d78e770c9c09822560dacb42fca641d092cbe52064ca7232f089062921
+DIST rox-filer-2.6.tar.bz2 1815735 RMD160 1b4e8c65208ba84b78584471b1a7b711609c7623 SHA1 3f0be6bc480aa0752fe80c83dca321655a2cab19 SHA256 c1f8d7535528de3badf8762ba88bb1f41700f5117788abc575959effb6939960
 EBUILD rox-2.3.ebuild 2288 RMD160 9c7cab124f2da4831e3c29eb941ac7019d28651d SHA1 a4d14546fba0999ce92a9b819180a855d05c0fa4 SHA256 6171c444df91f0d805df8cc9b04d16dc8cacb08b76cb460bcccae36f75687e08
 MD5 588061393807a5157b0f1a2e2e186a15 rox-2.3.ebuild 2288
 RMD160 9c7cab124f2da4831e3c29eb941ac7019d28651d rox-2.3.ebuild 2288
@@ -17,10 +22,14 @@ EBUILD rox-2.5.ebuild 2321 RMD160 7aa6702cb4b7a35d3d85988960586aadc4f6cc08 SHA1
 MD5 d0b244cbf2aeaec0c05c666ee7eb5e4f rox-2.5.ebuild 2321
 RMD160 7aa6702cb4b7a35d3d85988960586aadc4f6cc08 rox-2.5.ebuild 2321
 SHA256 90dfb535ab2b35b0f942e6f1575eba97bd7ea942815df775749fe76e387ea64b rox-2.5.ebuild 2321
-MISC ChangeLog 9401 RMD160 f67c9e0400e7fa2c01fbc82ba07dcd3cddd2379d SHA1 794da91fd55a171602c7b5e57b6fb4a8fb828995 SHA256 601a5921e105f3acd28feb7a775420904a298d25fff3809fcd7fc79d6f28bf4c
-MD5 8280aa15a082390cb0d44c24215f8f1f ChangeLog 9401
-RMD160 f67c9e0400e7fa2c01fbc82ba07dcd3cddd2379d ChangeLog 9401
-SHA256 601a5921e105f3acd28feb7a775420904a298d25fff3809fcd7fc79d6f28bf4c ChangeLog 9401
+EBUILD rox-2.6.ebuild 2816 RMD160 c0f2dcb4ade26aeeae94074da15005f4f25ea504 SHA1 17d23b1fad11fcc0fbafbc1db50014ada8582056 SHA256 06485495fa67ce7824a4ce3c301432f8dc50c4bd567159a45720fd6c17b337be
+MD5 9985186fdb40f50fa3b4b4f4bb414f5b rox-2.6.ebuild 2816
+RMD160 c0f2dcb4ade26aeeae94074da15005f4f25ea504 rox-2.6.ebuild 2816
+SHA256 06485495fa67ce7824a4ce3c301432f8dc50c4bd567159a45720fd6c17b337be rox-2.6.ebuild 2816
+MISC ChangeLog 9556 RMD160 e0e3464f4dabdafedd72f2c17b2694d13610d204 SHA1 92461cd9cfdad2f03c1198a5daf15a63d1766e4a SHA256 1607a0c8492e8c1cd097852b8d7fe43d546381a506261a2b5e3a961b4cc54ce9
+MD5 bccc327063ad553b4f7aa37fab5a9504 ChangeLog 9556
+RMD160 e0e3464f4dabdafedd72f2c17b2694d13610d204 ChangeLog 9556
+SHA256 1607a0c8492e8c1cd097852b8d7fe43d546381a506261a2b5e3a961b4cc54ce9 ChangeLog 9556
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -34,3 +43,6 @@ SHA256 80aa922b52d2abdb4c36a84de64c7898fbe8ac09f547d26e969e4e32b015e3cb files/di
 MD5 129b0aba331c1b60b4f4d36dc9ec6285 files/digest-rox-2.5-r1 247
 RMD160 e88ed5793da89d95aa649731e02ac493946768c8 files/digest-rox-2.5-r1 247
 SHA256 80aa922b52d2abdb4c36a84de64c7898fbe8ac09f547d26e969e4e32b015e3cb files/digest-rox-2.5-r1 247
+MD5 4333bb4141d401d3eb717f1e478a7ea3 files/digest-rox-2.6 247
+RMD160 157c17ebb4264c072263d53436cd1e86b2202f31 files/digest-rox-2.6 247
+SHA256 839b253d5048e321d4d49f47b9443f2b615f9297ba85d54ce8b7fa6fe4df255a files/digest-rox-2.6 247

diff --git a/rox-base/rox/files/digest-rox-2.6 b/rox-base/rox/files/digest-rox-2.6
new file mode 100644 (file)
index 0000000..3ac5172
--- /dev/null
+++ b/rox-base/rox/files/digest-rox-2.6
@@ -0,0 +1,3 @@
+MD5 fe4fca077e05257772f2eeaf5be38379 rox-filer-2.6.tar.bz2 1815735
+RMD160 1b4e8c65208ba84b78584471b1a7b711609c7623 rox-filer-2.6.tar.bz2 1815735
+SHA256 c1f8d7535528de3badf8762ba88bb1f41700f5117788abc575959effb6939960 rox-filer-2.6.tar.bz2 1815735

diff --git a/rox-base/rox/files/rox-2.6-nostrip.patch b/rox-base/rox/files/rox-2.6-nostrip.patch
new file mode 100644 (file)
index 0000000..2a63ce7
--- /dev/null
+++ b/rox-base/rox/files/rox-2.6-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.ebuild b/rox-base/rox/rox-2.6.ebuild
new file mode 100644 (file)
index 0000000..19b72b9
--- /dev/null
+++ b/rox-base/rox/rox-2.6.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.ebuild,v 1.1 2007/02/27 15:45:31 lack Exp $
+
+inherit eutils
+
+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/lib/rox"
+LIBDIR="/usr/lib/"
+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."
+}