Minor QA fixes from a dberkholz review

Package-Manager: portage-2.1.4_rc4

3 files changed, 28 insertions, 18 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/Manifest b/rox-base/rox/Manifest
index a9d3a3189718..df8a5feff733 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -16,18 +16,18 @@ EBUILD rox-2.7-r1.ebuild 3627 RMD160 c7e3a764b0f475f4c2f43962353cf0e2dafbd1e1 SH
 MD5 95ec8e53a574c22bac9c7e9995fdb4c6 rox-2.7-r1.ebuild 3627
 RMD160 c7e3a764b0f475f4c2f43962353cf0e2dafbd1e1 rox-2.7-r1.ebuild 3627
 SHA256 1f753f488a452eb9be92652a88b299b6fd68b67c46f4412268adf0ebcd7687f4 rox-2.7-r1.ebuild 3627
-EBUILD rox-2.7-r2.ebuild 3653 RMD160 d5631b1234b01f767ec206d565dd9772dfddb594 SHA1 a70bb6c4b5cb68a2d893347a3a29cfcf20862e93 SHA256 934723aeeb8286512ec5c25e9fbfc8e7b9a75d9dbaeba92afc93aa1608cdefc6
-MD5 8e5addc51e2bdc72dbd40af416a31f70 rox-2.7-r2.ebuild 3653
-RMD160 d5631b1234b01f767ec206d565dd9772dfddb594 rox-2.7-r2.ebuild 3653
-SHA256 934723aeeb8286512ec5c25e9fbfc8e7b9a75d9dbaeba92afc93aa1608cdefc6 rox-2.7-r2.ebuild 3653
+EBUILD rox-2.7-r2.ebuild 3627 RMD160 0f6c8ac4f471dd3ffdcef8b0f2801c733de7fe63 SHA1 2f6b76f66b00e7460e3ebb747b08b556bd2cb689 SHA256 c68e4988a126536f0e1f64b74fc1849a475c13296243e9d0b3d08852a23334c4
+MD5 7d441a635ed443e9890c56d6371369b3 rox-2.7-r2.ebuild 3627
+RMD160 0f6c8ac4f471dd3ffdcef8b0f2801c733de7fe63 rox-2.7-r2.ebuild 3627
+SHA256 c68e4988a126536f0e1f64b74fc1849a475c13296243e9d0b3d08852a23334c4 rox-2.7-r2.ebuild 3627
 EBUILD rox-2.7.ebuild 2845 RMD160 5903769110b983ce4661de3777268250ec2ab8c6 SHA1 e5b2f16ad1b4e21693f181407b4aec12acc7f54b SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726
 MD5 d64d7d908b21b1e0269df03c078f1c85 rox-2.7.ebuild 2845
 RMD160 5903769110b983ce4661de3777268250ec2ab8c6 rox-2.7.ebuild 2845
 SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726 rox-2.7.ebuild 2845
-MISC ChangeLog 11595 RMD160 b37bbe2ddf6e4bed3dc21d1fb3ea49ba1392fd03 SHA1 4c852ff6423c987e0084dc07ef75406b2db69684 SHA256 92dd09530fc8a58015ca491ac2ac9cba0c80c6d1380ff18b048442acb4b842ce
-MD5 979f80910f1ddcf7dea91acb961f010a ChangeLog 11595
-RMD160 b37bbe2ddf6e4bed3dc21d1fb3ea49ba1392fd03 ChangeLog 11595
-SHA256 92dd09530fc8a58015ca491ac2ac9cba0c80c6d1380ff18b048442acb4b842ce ChangeLog 11595
+MISC ChangeLog 11852 RMD160 b25681f1faa88050bce8b47487c0317ca0ff5d48 SHA1 bf9b8cc69f59b580a77e622e06f2d6bdcf252b9a SHA256 46137cf6564b8def181ea6942edbc10259429121b09466bd372423d7900cc0ae
+MD5 711dcefd22df73cfc64d9ee7cddfce39 ChangeLog 11852
+RMD160 b25681f1faa88050bce8b47487c0317ca0ff5d48 ChangeLog 11852
+SHA256 46137cf6564b8def181ea6942edbc10259429121b09466bd372423d7900cc0ae ChangeLog 11852
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
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"