Non-maintainer commit. Revbump to fix bug #464246. Move to autotools-utils, EAPI=5 and fix underlinking

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

3 files changed, 150 insertions, 8 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 0f2136104170..18b5264decd2 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/rox
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.82 2013/03/02 07:52:47 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.83 2014/05/30 02:22:15 grknight Exp $
+
+*rox-2.10-r1 (30 May 2014)
+
+  30 May 2014; Brian Evans <grknight@gentoo.org> +rox-2.10-r1.ebuild:
+  Non-maintainer commit. Revbump to fix bug #464246. Move to autotools-utils,
+  EAPI=5 and fix underlinking
 
   02 Mar 2013; Pacho Ramos <pacho@gentoo.org> -rox-2.9.ebuild, metadata.xml:
   Cleanup due http://gentoo.2317880.n4.nabble.com/rox-herd-looks-inactive-for-a
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index d4f67454f2d4..0cb374c37c58 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -3,14 +3,19 @@ Hash: SHA256
 
 AUX rox-2.10-nostrip.patch 664 SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc SHA512 0b289f1e140018fd96ae0f9cf1113cc4c964ffc36e6378dca3cf007eeec98199fcc6e28b41a2531cf0d8589b39b079765515e6463bcaa3f737b7a6b4f4512b4f WHIRLPOOL adb66b583a05a56ddab5c13748b45e5367e827f4e9b9d6b55036fd5a81e1676e77961aa1afe2353e4ee349952d7e9b73d34e9a3694cd48e6e5b022355f3ffe28
 AUX rox-2.9-nostrip.patch 664 SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc SHA512 0b289f1e140018fd96ae0f9cf1113cc4c964ffc36e6378dca3cf007eeec98199fcc6e28b41a2531cf0d8589b39b079765515e6463bcaa3f737b7a6b4f4512b4f WHIRLPOOL adb66b583a05a56ddab5c13748b45e5367e827f4e9b9d6b55036fd5a81e1676e77961aa1afe2353e4ee349952d7e9b73d34e9a3694cd48e6e5b022355f3ffe28
-DIST rox-filer-2.10.tar.bz2 1903129 SHA256 ce8b557c2308c7b764f860f7de3780bb14dfff853e796158380f38daa9c0cfa8
+DIST rox-filer-2.10.tar.bz2 1903129 SHA256 ce8b557c2308c7b764f860f7de3780bb14dfff853e796158380f38daa9c0cfa8 SHA512 e2157d9b93855218647266d95abbabc6ab300b24dd78ebf66f553eb93c72a6a206ebc1f7cc4d63726c303815ef6de4069485b2062b930130ef04790155949ef6 WHIRLPOOL 3ee83c954cf1e5fa88e90441cf1d07d588719f99b4c8d4fbe4fbcf07ee9f925e7411bd1ac881b0c84bd92d301922ff1b95028f36ef110c5470fb156dbf67b584
+EBUILD rox-2.10-r1.ebuild 3541 SHA256 eba4546d6d2b6523df53751ea6e43831e9175051ef7e2226ea8bf9113b600d3b SHA512 878fa95c80d73534770c6ba6c501919debf62802806f90cc729d441d1b570a592c68f0a3ec22aa1fda67b4517cf94af8d3459d24d9a159c9a5051790d530666e WHIRLPOOL 0b4bd0bdb434d1fd9f1abd2a76af57d90b1c1c8fbed1eee85e3f2da9295148246df60046ec4566e3c029f8d82d71c133dbd5434dd0163c4dbf54d9e1af823d65
 EBUILD rox-2.10.ebuild 3486 SHA256 0d6600374159366cc5cfce937e86ae8c33bfd2eb665d913d0a4f888ba0fba5aa SHA512 3e0b24a921cdd0527c374030e939e8b704bd6653eca32f72a8d5b095d1e95a29d67b40bf851333e5240eb3f0acc6892cb247342270cbb663851682c4a1023d5e WHIRLPOOL 7599e93072b468a74d4622cdbea9d4a31ea18422cf769b255d6c3298ce75f140ae36dd5225b9520ce1f740f22613bc9d3dac0df5fc75c86a215357183c3f442e
-MISC ChangeLog 15916 SHA256 c4f3411807abc506f7f1e6eedb74f1943e8780a0e3b0afc326b583b0e3b55a53 SHA512 68d56ae9f57da4c555eb2dab4fa341523cdb2a786ef584c1f27a78d7e09b4efb4c48ecdb1899909cea1215ae612e379fc2826f94dd79821abe653347466216b8 WHIRLPOOL 90db2f77d5b04b75d5178225a417d04d72642d09110ad6af06c549f2ac1eccf4c37ed4f3cc1d90dedc43a3e075dbf72e208aec79c88de2162ccce300b7a5c340
+MISC ChangeLog 16126 SHA256 f3ff3afd55a019f7b12e61b50ac8d41d4bc9b2089af50d542172916df4966084 SHA512 db966a7e7f86446ed6ffefdcd0cf2fe85c8dcc52b7e3329e321caaaebf3b9b1d93db376dffca7ce269534d7524ae13a8ee2711fe8295736ce8de5811714b6ee8 WHIRLPOOL 2726efea0df8442e028092835d31de4cbac0248addb0e7d8cc6d2999c85fae070199f45cd425abfe5ca60311710aceeb094497e19a5692052efedfc1120ef4d2
 MISC metadata.xml 417 SHA256 80aca9cab050d33210bba349f7d918494a322d6202bafb04e3f4c47abbe12181 SHA512 8bc681474a2a57ba18af07b72bb4bfcb026586b5cf7245894b0055bdf71bb5ed840eae95f3432c6bf8b881bef54fb74b6f508e8097433a8d151c18763ec18f1f WHIRLPOOL d455b9f71bf4d4c6bedc5a018cf46a03e9791c114b624dae85a99fd619ba3ee66ed87cc7a1ff3f2d8420b10b45ddc5babffb439d9aa49cdd3b41d3dce7a779bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlExr9AACgkQCaWpQKGI+9Su6QCghb1ncr+eE/bm3QLCUB6rDssk
-r4UAn3PFnVtHmUVLZV2PQXeYO9EMulF+
-=o/gE
+iQEcBAEBCAAGBQJTh+tfAAoJEE4V4vFnx44dJvgIAI6CU9L+vTMUoBwSEh9Db43s
+JbO5S4X1Jegd2wGnhZ4YubwG+J9h1YankjYM7jptW91iIqAOc5prN1+/aBHe+PbI
+R6FBvrrBSElhwboWOsLpgL74xmq33P9sKuXn3uvEv2RnEHX8XSFkRUcz0dtz4OGJ
+8Sz2M/+I6dlhbZw/DUM4OYMbXVQsf9PvFS9tBK8nHAAr2oKeM/GDjjipXKgP/yxM
+nsbla0XukNXxsgmMzmOSHrAZlAr6v03zGAtg4n7P/+WO1gaR2/ZQhIrU7W1GKR4x
+qLYkD8zagZVmv4khg0W9u2MQGsJZkQHMgws4mXkOJW3hmFyWUvgvZiPSf45L1Yw=
+=ZHQQ
 -----END PGP SIGNATURE-----
diff --git a/rox-base/rox/rox-2.10-r1.ebuild b/rox-base/rox/rox-2.10-r1.ebuild
new file mode 100644
index 000000000000..61d115ca191f
--- /dev/null
+++ b/rox-base/rox/rox-2.10-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.10-r1.ebuild,v 1.1 2014/05/30 02:22:15 grknight Exp $
+
+EAPI=5
+inherit eutils multilib autotools-utils
+
+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
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	>=x11-misc/shared-mime-info-0.14
+	svg? ( gnome-base/librsvg:2 )
+	>=rox-base/zeroinstall-injector-0.40
+	"
+
+PDEPEND="rox-base/mime-editor
+		rox-base/thumbs
+		video? ( rox-extra/videothumbnail )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+APPNAME="ROX-Filer"
+APPDIR="/usr/$(get_libdir)/rox"
+LIBDIR="/usr/$(get_libdir)/"
+WRAPPERNAME="rox"
+MIMEDIR="/usr/share/mime"
+MIMECONFDIR="/etc/xdg/rox.sourceforge.net"
+
+PATCHES=( "${FILESDIR}"/${P}-nostrip.patch )
+ECONF_SOURCE="${S}/${APPNAME}/src"
+AUTOTOOLS_AUTORECONF="yes"
+
+src_prepare() {
+	pushd "${ECONF_SOURCE}" || die
+	sed -r -i "s:(AC_CHECK_LIB\(intl, gettext\)):\1\n\nAC_SEARCH_LIBS([floor],[m])\nAC_SEARCH_LIBS([dlsym],[dl]):" "configure.in" || die
+	autotools-utils_src_prepare
+	popd
+}
+
+# new streamlined install
+
+src_install() {
+	doman rox.1
+
+	dodir ${APPDIR}
+	cp -r ${APPNAME}/ "${D}/${APPDIR}" || die
+
+	# 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() {
+	# 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."
+}