patch to make new rpm2targz backwards compat to avoid problems.

4 files changed, 31 insertions, 4 deletions

diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog
index 707ee9425b7d..1adc5ab6bcf6 100644
--- a/app-arch/rpm2targz/ChangeLog
+++ b/app-arch/rpm2targz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm2targz
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.9 2003/06/21 13:00:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.10 2003/06/21 13:40:27 liquidx Exp $
+
+  21 Jun 2003; Alastair Tse <liquidx@gentoo.org> rpm2targz-9.0.ebuild,
+  files/rpm2targz-9.0-gentoo.patch:
+  patch to make src.rpm extraction backwards compatible with rpm2targz-8.0's
+  behavious
 
 *rpm2targz-9.0 (21 Jun 2003)
 
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 63179bb73119..f6e9076d87b8 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,5 +1,6 @@
-MD5 9696b44a1147b681361c0dfa1d7f2c19 ChangeLog 1543
+MD5 706ff044cbd73a99f4e798cfe33893f4 ChangeLog 1741
 MD5 00179eb24b8e3f49d583d10b22b6b68e rpm2targz-8.0.ebuild 1003
-MD5 804e407ffc054d56b4b2320853c93e5a rpm2targz-9.0.ebuild 799
+MD5 9a826ac99eea485088465913563eef3a rpm2targz-9.0.ebuild 878
 MD5 242377a7ef1b45e246460cbbf4bb6984 files/digest-rpm2targz-8.0 163
 MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0 63
+MD5 a850046e92cebae159a1a554cdab3f91 files/rpm2targz-9.0-gentoo.patch 554
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-gentoo.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-gentoo.patch
new file mode 100644
index 000000000000..17d01adea573
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-gentoo.patch
@@ -0,0 +1,15 @@
+--- rpm2targz	2003-06-21 13:25:33.000000000 +0100
++++ rpm2targz	2003-06-21 14:26:30.000000000 +0100
+@@ -79,9 +79,9 @@
+     dd ibs=`rpmoffset < $i` skip=1 if=$i 2> /dev/null | gzip -dc > $ofn
+   fi
+   DEST=$TMPDIR/rpm2targz$COOKIE
+-  if [ "$isSource" = "1" ]; then
+-     DEST=$DEST/$(basename $(basename $i .rpm) .src)
+-  fi
++  #if [ "$isSource" = "1" ]; then
++  #   DEST=$DEST/$(basename $(basename $i .rpm) .src)
++  #fi
+   mkdir -p $DEST
+   ( cd $DEST
+     cpio --extract --preserve-modification-time --make-directories < $ofn 1> /dev/null 2> /dev/null
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
index e05836613344..7b5e1121a8c0 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.1 2003/06/21 13:00:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.2 2003/06/21 13:40:27 liquidx Exp $
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -17,8 +17,14 @@ DEPEND="virtual/glibc
 	sys-apps/cpio
 	sys-apps/file"
 
+
 S=${WORKDIR}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
 src_compile() {
 	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }