Add support for dumping rpms to a tar file and skipping the slow gzip stage.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 111 insertions, 11 deletions

diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog
index 67a8ded2e70a..74cb6a24b90e 100644
--- a/app-arch/rpm2targz/ChangeLog
+++ b/app-arch/rpm2targz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm2targz
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.37 2005/08/10 23:43:39 ka0ttic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.38 2005/08/22 23:02:18 vapier Exp $
+
+*rpm2targz-9.0-r4 (22 Aug 2005)
+
+  22 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/rpm2targz-9.0-rpm2tar.patch, +rpm2targz-9.0-r4.ebuild:
+  Add support for dumping rpms to a tar file and skipping the slow gzip stage.
 
   10 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> rpm2targz-9.0-r3.ebuild:
   Stable on mips.
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index f2df773636e4..b026ff4e2be1 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d7ea8d62490d872cd9526e54dc939172 ChangeLog 4655
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 448bca5e5f0e53872f20fc4464e9e0aa rpm2targz-9.0-r2.ebuild 1203
-MD5 a034c07be42942113576600290f2ed19 rpm2targz-9.0-r3.ebuild 1297
-MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r2 63
-MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r3 63
-MD5 75217fcb7780c16c88ead1295d8e9d7b files/rpm2targz-9.0-bzip2.patch 800
+MD5 6517f69e4f73807f5dfe9d949d73b4e8 rpm2targz-9.0-r3.ebuild 1287
+MD5 92580be31724b667f7f0cb2a8a5c4f35 ChangeLog 4881
+MD5 c2ca72c7937f5ca2d9eabbe40914550c rpm2targz-9.0-r4.ebuild 1405
 MD5 96b33b5b51d34b9764ed9c50ffac18d6 files/rpm2targz-9.0-bzip2_rpm2targz.patch 2100
 MD5 a850046e92cebae159a1a554cdab3f91 files/rpm2targz-9.0-gentoo.patch 554
+MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r3 63
+MD5 2d6452f47ccae7e9748ddc16ee8e3b35 files/rpm2targz-9.0-rpm2tar.patch 1270
+MD5 75217fcb7780c16c88ead1295d8e9d7b files/rpm2targz-9.0-bzip2.patch 800
+MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r2 63
+MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r4 63
 MD5 8330f5b78d10fc54fe334875adc8edaf files/rpm2targz-9.0-secure_temp_handling.patch 4068
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC+pGpEZCkKN40op4RAmUJAJ9LYBlJzEHCVVOZVj33KrE+q+f6zACffcUj
-mvG2YMCF0Nq7pDUKmZVBWKc=
-=KDPP
+iD8DBQFDClmngIKl8Uu19MoRAnkBAJ0Wgh1idOqV2/hO71rnf3tCXC3DgQCfbq+E
+HnsNV7E+BQW49wX7P/iSShw=
+=fyjo
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4
new file mode 100644
index 000000000000..154805e3f598
--- /dev/null
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4
@@ -0,0 +1 @@
+MD5 7b8ba680dcbe7e1e4e349698400bcea6 rpm2targz-9.0.tar.gz 2639
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-rpm2tar.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-rpm2tar.patch
new file mode 100644
index 000000000000..2dee633816f6
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-rpm2tar.patch
@@ -0,0 +1,41 @@
+Add support for turning rpm's into tar's and skipping the gzip stage ...
+Much faster on slower boxes and useful when you just want to rip apart 
+a rpm and look at the insides.
+
+--- rpm2targz
++++ rpm2targz
+@@ -35,6 +35,7 @@
+ 	exit 1
+ fi
+ 
++BASENAME="`basename $0`"
+ if [ "$1" = "" ]; then
+   echo "$0:  Converts RPM format to standard GNU tar + GNU zip format."
+   if [ -e /etc/slackware-version ]; then
+@@ -44,8 +45,10 @@
+   fi
+   echo
+   echo "Usage:      $0 <file.rpm>"
+-  if [ "`basename $0`" = "rpm2tgz" ]; then
++  if [ "$BASENAME" = "rpm2tgz" ]; then
+     echo "            (Outputs \"file.tgz\")"
++  elif [ "$BASENAME" = "rpm2tar" ]; then
++    echo "            (Outputs \"file.tar\")"
+   else
+     echo "            (Outputs \"file.tar.gz\")"
+   fi
+@@ -118,9 +121,11 @@
+     rm -f $ofn
+     find . -type d -perm 700 -exec chmod 755 {} \; )
+   ( cd ${WORKDIR} ; tar cf - . ) > `basename $i .rpm`.tar
+-  gzip -9 `basename $i .rpm`.tar
+-  if [ "`basename $0`" = "rpm2tgz" ]; then
+-    mv `basename $i .rpm`.tar.gz `basename $i .rpm`.tgz
++  if [ "$BASENAME" != "rpm2tar" ]; then
++    gzip -9 `basename $i .rpm`.tar
++    if [ "$BASENAME" = "rpm2tgz" ]; then
++      mv `basename $i .rpm`.tar.gz `basename $i .rpm`.tgz
++    fi
+   fi
+   ( rm -rf "${WORKDIR}/*" )
+   echo
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r4.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r4.ebuild
new file mode 100644
index 000000000000..89e997e7fb61
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r4.ebuild,v 1.1 2005/08/22 23:02:18 vapier Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
+#       so we don't explicitly set it as a dependency.
+DEPEND="app-arch/cpio
+	sys-apps/file"
+RDEPEND="${DEPEND}
+	sys-apps/util-linux
+	sys-apps/which"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# makes rpm2targz extract in current dir
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	# adds bzip2 detection (#23249)
+	epatch "${FILESDIR}"/${P}-bzip2.patch
+	# adds bzip2 decompression to rpm2targz (#31164)
+	epatch "${FILESDIR}"/${P}-bzip2_rpm2targz.patch
+	# secures temp file handling (#96192)
+	epatch "${FILESDIR}"/${P}-secure_temp_handling.patch
+	# add supprot for a quicker rpm2tar
+	epatch "${FILESDIR}"/${P}-rpm2tar.patch
+}
+
+src_compile() {
+	emake rpmoffset CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dobin rpmoffset rpm2targz || die
+	dosym rpm2targz /usr/bin/rpm2tar
+	dodoc rpm2targz.README
+}