Added USE flags to metadata.xml, and some version cleanup.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo x86_64

5 files changed, 30 insertions, 49 deletions

diff --git a/rox-extra/archive/ChangeLog b/rox-extra/archive/ChangeLog
index 1b1057d053bf..698f523e29b7 100644
--- a/rox-extra/archive/ChangeLog
+++ b/rox-extra/archive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-extra/archive
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/ChangeLog,v 1.16 2008/06/19 15:45:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/ChangeLog,v 1.17 2008/07/29 15:07:42 lack Exp $
+
+  29 Jul 2008; Jim Ramsay <lack@gentoo.org> metadata.xml,
+  -archive-2.1-r3.ebuild, archive-2.2.ebuild:
+  Added USE flags to metadata.xml, and some version cleanup.
 
 *archive-2.2 (19 Jun 2008)
 
diff --git a/rox-extra/archive/Manifest b/rox-extra/archive/Manifest
index e08ddfcfc402..b280bf7bf7ca 100644
--- a/rox-extra/archive/Manifest
+++ b/rox-extra/archive/Manifest
@@ -1,7 +1,6 @@
 DIST archive-2.1.tar.bz2 26879 RMD160 99bfeaf695d62e6167c1437fcb04a99ce8c11844 SHA1 0e2d1528f0f70a86f81624462967ba073c71e9b8 SHA256 2490235d6e28cac3a9ee6b9f55b68c4cee41c35a0e1d0610cd0a4dc2cb364180
 DIST archive-2.2.tar.bz2 29713 RMD160 fd3129edf2b79d327d0e2b9b720721fbf92887e4 SHA1 b809c693d906b1dfd65ab5b8282713198876ab81 SHA256 b792c45ba7fb6a475ea30eb93d7477306ac053e8a525fab38a0fc14c8a466fb2
 EBUILD archive-2.1-r2.ebuild 831 RMD160 3ad5e553a28b43a00b457f2aa01ae1497fe705d1 SHA1 826b8b7733e5e338b64fd733037573a7438e876c SHA256 d12498e8109f7a2de011ac63a327c71eea3335772de1f5e285776100ff882aa4
-EBUILD archive-2.1-r3.ebuild 1349 RMD160 b70fcaea35a23a8e15c6d4d398605969406ade4a SHA1 ac363185f68cfb2acdf4aaa22728a63a91e707ff SHA256 353b71946a2cfd45fe7142ba7e4c6b4a72a63d0026e0c5da542ffd14652b1fac
-EBUILD archive-2.2.ebuild 1406 RMD160 01dc531db10f7612875206b2c7d2afa297bd63af SHA1 4beb7157687dfb37034718e53e35c6441d123d9d SHA256 b01a1c5f1dc83b9bf33bf80258d778dcdf42d7f58d3745804e1f8d57093eea90
-MISC ChangeLog 2298 RMD160 2abb5455af453c64fc2b73e16374378a6a6ca1ee SHA1 6a9a31f69aa40bcb318b35140ff0757c8679bbb6 SHA256 7e47aef9cd709149a43e2006ec0f3ee2f70f8986a8fc731879bec0f941fe7693
-MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
+EBUILD archive-2.2.ebuild 1518 RMD160 ee31bcdedda76d425c8ae37968818ca0cd24e40f SHA1 a16450161f7d36ae0a3e1442e0f73a33dea12953 SHA256 30f5e61e76abebc60f97f5647ad62b9272203f49ef6da03d25cdfddbdea7be37
+MISC ChangeLog 2464 RMD160 65cb11b996c636da5cbdb84b9f5009217814c5ab SHA1 6fa8ce8e52738147a466a8291d81f761e7b1abc3 SHA256 69e8e0a10a38cfa2323bf94395899832317b07a74da1cefcd1bc286eef685443
+MISC metadata.xml 814 RMD160 8b581f62b5a4893a6ed1d39379aba999c0e81c21 SHA1 341a3ba6b8d7c44cec7d0ddc423da35a5f4881e3 SHA256 d0e9a219e7f9c255b06431f2efcd24a18a5b11fed97f14e046cac5e65c821b78
diff --git a/rox-extra/archive/archive-2.1-r3.ebuild b/rox-extra/archive/archive-2.1-r3.ebuild
deleted file mode 100644
index 258b704816d1..000000000000
--- a/rox-extra/archive/archive-2.1-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/archive-2.1-r3.ebuild,v 1.1 2007/11/28 17:24:32 lack Exp $
-
-ROX_LIB_VER=2.0.0
-inherit rox
-
-DESCRIPTION="Archive is a simple archiver for ROX Desktop"
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="bzip2 compress rar uuencode zip ace rpm cpio"
-
-RDEPEND="virtual/gzip
-	app-arch/tar
-	bzip2? ( app-arch/bzip2 )
-	compress? ( app-arch/ncompress )
-	rar? ( app-arch/rar )
-	uuencode? ( app-arch/sharutils )
-	zip? ( app-arch/unzip app-arch/zip )
-	ace? ( app-arch/unace )
-	rpm? ( app-arch/rpm app-arch/cpio )
-	cpio? ( app-arch/cpio )"
-
-APPNAME=Archive
-APPCATEGORY="Utility;Archiving"
-
-src_install() {
-	APPMIME="application/x-gzip;application/x-tar;application/x-compressed-tar
-		$(usemime bzip2 "application/x-bzip;application/x-bzip-compressed-tar" )
-		$(usemime compress "application/x-compress;application/x-tarz" )
-		$(usemime rar "application/x-rar" )
-		$(usemime uuencode "application/x-shar")
-		$(usemime zip "application/zip")
-		$(usemime ace "application/x-ace")
-		$(usemime rpm "application/x-rpm" )
-		$(usemime cpio "application/x-cpio;application/x-cpio-compressed")"
-	rox_src_install
-}
diff --git a/rox-extra/archive/archive-2.2.ebuild b/rox-extra/archive/archive-2.2.ebuild
index b697bd0a4af6..63dffdde5fad 100644
--- a/rox-extra/archive/archive-2.2.ebuild
+++ b/rox-extra/archive/archive-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/archive-2.2.ebuild,v 1.1 2008/06/19 15:45:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-extra/archive/archive-2.2.ebuild,v 1.2 2008/07/29 15:07:42 lack Exp $
 
 ROX_LIB_VER=2.0.0
 inherit rox-0install
@@ -40,5 +40,10 @@ src_install() {
 		$(usemime ace "application/x-ace")
 		$(usemime rpm "application/x-rpm" )
 		$(usemime cpio "application/x-cpio;application/x-cpio-compressed")"
+	if use rpm && ! use cpio; then
+		APPMIME="${APPMIME}
+			application/x-cpio;application/x-cpio-compressed"
+	fi
+
 	rox-0install_src_install
 }
diff --git a/rox-extra/archive/metadata.xml b/rox-extra/archive/metadata.xml
index 36402044950c..d7a254872be3 100644
--- a/rox-extra/archive/metadata.xml
+++ b/rox-extra/archive/metadata.xml
@@ -2,4 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>rox</herd>
+	<use>
+		<flag name='ace'>Enable .ace extraction via
+			<pkg>app-arch/unace</pkg></flag>
+		<flag name='compress'>Enable tar.Z and *.Z extraction via
+			<pkg>app-arch/ncompress</pkg></flag>
+		<flag name='cpio'>Enable .cpio extraction via
+			<pkg>app-arch/cpio</pkg></flag>
+		<flag name='rar'>Enable .rar extraction via
+			<pkg>app-arch/unrar</pkg></flag>
+		<flag name='rpm'>Enable .rpm extraction via rpm2cpio from
+			<pkg>app-arch/rpm</pkg></flag>
+		<flag name='uuencode'>Enable .uue extraction via
+			<pkg>app-arch/sharutils</pkg></flag>
+		<flag name='zip'>Enable .zip extraction via <pkg>app-arch/unzip</pkg>
+			and <pkg>app-arch/zip</pkg></flag>
+	</use>
 </pkgmetadata>