summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2007-12-21 17:28:20 +0000
committerJim Ramsay <lack@gentoo.org>2007-12-21 17:28:20 +0000
commit1e21af84b2ebfb1e85b9409cf482533d0edf6c9e (patch)
tree9ec33dd6e493ba39f66325b89c6cba53a1a38677 /rox-base
parentFix executable permissions for installed binary, amd64 stable wrt #184548 (diff)
downloadgentoo-2-1e21af84b2ebfb1e85b9409cf482533d0edf6c9e.tar.gz
gentoo-2-1e21af84b2ebfb1e85b9409cf482533d0edf6c9e.tar.bz2
gentoo-2-1e21af84b2ebfb1e85b9409cf482533d0edf6c9e.zip
Minor QA fixes from a dberkholz review
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'rox-base')
-rw-r--r--rox-base/rox/ChangeLog10
-rw-r--r--rox-base/rox/rox-2.7-r2.ebuild20
2 files changed, 20 insertions, 10 deletions
diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 132f2244ed0a..31a415fc8951 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,9 @@
# 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.50 2007/12/17 15:05:56 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.51 2007/12/21 17:28:20 lack Exp $
+
+ 21 Dec 2007; Jim Ramsay <lack@gentoo.org> rox-2.7-r2.ebuild:
+ Minor QA fixes from a dberkholz review
*rox-2.7-r2 (17 Dec 2007)
@@ -13,6 +16,11 @@
14 Dec 2007; Jim Ramsay <lack@gentoo.org> +rox-2.7-r1.ebuild:
Now installs zero-install native feed (Bug 202275)
+*rox-2.7-r1 (05 Dec 2007)
+
+ 05 Dec 2007; Jim Ramsay <lack@gentoo.org> +rox-2.7-r1.ebuild:
+ Added feed support and dependency on zeroinstall-injector
+
*rox-2.7 (30 Nov 2007)
30 Nov 2007; Jim Ramsay <lack@gentoo.org> -files/rox-2.5-nostrip.patch,
diff --git a/rox-base/rox/rox-2.7-r2.ebuild b/rox-base/rox/rox-2.7-r2.ebuild
index 8d6cfec6e504..1953c7e0a43b 100644
--- a/rox-base/rox/rox-2.7-r2.ebuild
+++ b/rox-base/rox/rox-2.7-r2.ebuild
@@ -1,6 +1,6 @@
# 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.7-r2.ebuild,v 1.1 2007/12/17 15:05:56 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7-r2.ebuild,v 1.2 2007/12/21 17:28:20 lack Exp $
EAPI=1
inherit eutils multilib
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/rox/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="+svg +video"
+IUSE="svg +video"
RDEPEND=">=x11-libs/gtk+-2.4
>=dev-libs/glib-2.2
@@ -53,10 +53,12 @@ src_compile() {
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
+ pushd src
+ make clean > /dev/null
+ popd
else
rm -rf src
fi
@@ -75,9 +77,9 @@ src_install() {
cp -r ${APPNAME}/ "${D}/${APPDIR}"
# add documentation to be proper
- ( cd ${APPNAME}/Help
+ pushd ${APPNAME}/Help
dodoc Changes README README-es TODO
- )
+ popd
# install shell script
dodir /usr/bin
@@ -103,8 +105,8 @@ EOF
exec "${APPDIR}/${APPNAME}/AppRun" -U "\$@"
EOF
- chmod 0755 "${D}/usr/bin/${WRAPPERNAME}"
- chmod 0755 "${D}/usr/bin/${WRAPPERNAME}uri"
+ fperms 0755 "/usr/bin/${WRAPPERNAME}"
+ fperms 0755 "/usr/bin/${WRAPPERNAME}uri"
# install rox.xml
insinto ${MIMEDIR}/packages
@@ -118,7 +120,7 @@ EOF
insinto /usr/share/pixmaps
newins ${APPNAME}/.DirIcon ${APPNAME}.png
- make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME}.png "System;Utility;Core;ROX"
+ make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME} "System;FileTools;FileManager"
# Install the 0install feed
local NATIVE_FEED_DIR="/usr/share/0install.net/native_feeds"