Modified ebuilds to use the RPM eclass not rpm2targz. Bug #30221

5 files changed, 22 insertions, 44 deletions

diff --git a/sys-kernel/redhat-sources/ChangeLog b/sys-kernel/redhat-sources/ChangeLog
index 0cc170d1dccd..f105585fbaaf 100644
--- a/sys-kernel/redhat-sources/ChangeLog
+++ b/sys-kernel/redhat-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/redhat-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/ChangeLog,v 1.10 2003/03/01 11:43:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/ChangeLog,v 1.11 2003/10/03 22:31:07 plasmaroo Exp $
+
+  03 Oct 2003; <plasmaroo@gentoo.org> redhat-sources-2.4.18.24.8.0.ebuild,
+  redhat-sources-2.4.20.2.48-r1.ebuild, redhat-sources-2.4.20.2.48.ebuild:
+  Fixed ebuilds to use the RPM eclass and not depend on rpm2targz. Thanks
+  to Georgi Georgiev <chutz@chubaka.net> for the suggestion! Bug #30221.
 
 *redhat-sources-2.4.20.2.48-r1 (01 Mar 2003)
 
diff --git a/sys-kernel/redhat-sources/Manifest b/sys-kernel/redhat-sources/Manifest
index 4d2d92b78d28..fcc5ee05c0c2 100644
--- a/sys-kernel/redhat-sources/Manifest
+++ b/sys-kernel/redhat-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 f65bc67d4105ea7330468b84fd7e2c2f ChangeLog 1732
-MD5 3ac7374d4b1a97091d1c665b374588f8 redhat-sources-2.4.18.24.8.0.ebuild 2078
-MD5 af3f6df60c9a0f83bfa28e1c8ccdb3bf redhat-sources-2.4.20.2.48-r1.ebuild 2288
-MD5 9f7ebb20b2db007cd50d7995332fd238 redhat-sources-2.4.20.2.48.ebuild 2069
+MD5 354a7deeb7a9b367ef7f2562fa5f7b75 ChangeLog 2032
+MD5 1df9915c3aaefc5dfa0af06d6b33a4eb redhat-sources-2.4.20.2.48.ebuild 1898
+MD5 1fb4015a718b7b755c822ce34f4f530b redhat-sources-2.4.18.24.8.0.ebuild 1999
+MD5 ae4f5a3753601aca6fc0f05aa18812e1 redhat-sources-2.4.20.2.48-r1.ebuild 1901
 MD5 5f0ed4ddd61c2af08e7345026135aae0 files/digest-redhat-sources-2.4.18.24.8.0 83
-MD5 bbd128894771196255f30f4fe139846d files/digest-redhat-sources-2.4.20.2.48 81
 MD5 bbd128894771196255f30f4fe139846d files/digest-redhat-sources-2.4.20.2.48-r1 81
+MD5 bbd128894771196255f30f4fe139846d files/digest-redhat-sources-2.4.20.2.48 81
diff --git a/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild b/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild
index 076befe1ec9a..e021ded2c61a 100644
--- a/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild
+++ b/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.18.24.8.0.ebuild,v 1.3 2003/10/03 22:31:07 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-inherit kernel
+inherit kernel rpm
 OKV=2.4.18
 KV=2.4.18-24.8.0
 EXTRAVERSION="-24.8.0-rhcustom"
@@ -32,8 +32,6 @@ RH_DISTRO_VER="8.0"
 # generate a new diff for every minor version update.  (Also not to many
 # people have 2.4.18 vanilla source tarballs floating around these days)
 
-DEPEND="${DEPEND} app-arch/rpm2targz"
-
 DESCRIPTION="Kernel source tree used in Red Hat distributions (not supported by Red Hat)"
 SRC_URI="http://mirrors.kernel.org/redhat/redhat/linux/updates/8.0/en/os/i386/kernel-source-${KV}.i386.rpm"
 HOMEPAGE="http://www.kernel.org/ http://www.redhat.com/"
@@ -41,15 +39,10 @@ KEYWORDS="~x86"
 SLOT="${KV}"
 
 src_unpack() {
-
+	rpm_unpack ${DISTDIR}/kernel-source-${KV}.i386.rpm
 	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/kernel-source-${KV}.i386.rpm
-	tar xvzf kernel-source-${KV}.i386.tar.gz
-
 	mv usr/src/linux-${KV} ${WORKDIR}
-
 	cd ${S}
-
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild b/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild
index 83a7567c4c1c..51b4d152138f 100644
--- a/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild
+++ b/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48-r1.ebuild,v 1.3 2003/10/03 22:31:07 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-inherit kernel
+inherit kernel rpm
 OKV=2.4.20
 KV=2.4.20-2.48
 EXTRAVERSION="-2.48-rhcustom"
@@ -27,10 +27,7 @@ S=${WORKDIR}/linux-${KV}
 # The easiest way to grab Red Hat kernel sources is from the rpm file
 # itself.  We used to generate a patch against vanilla sources trees but
 # the added dependency of rpm2targz is minimal compared with having to
-# generate a new diff for every minor version update.  (Also not to many
-# people have 2.4.18 vanilla source tarballs floating around these days)
-
-DEPEND="${DEPEND} app-arch/rpm2targz"
+# generate a new diff for every minor version update.
 
 DESCRIPTION="Kernel source tree used in Red Hat distributions (not supported by Red Hat)"
 SRC_URI="http://csociety-ftp.ecn.purdue.edu/pub/redhat/linux/beta/phoebe/en/os/i386/RedHat/RPMS/kernel-source-${KV}.i386.rpm"
@@ -39,19 +36,10 @@ KEYWORDS="~x86"
 SLOT="${KV}"
 
 src_unpack() {
-
+	rpm_unpack ${DISTDIR}/kernel-source-${KV}.i386.rpm
 	cd ${WORKDIR}
-	# Defining TMPDIR avoids breaking if /tmp is mounted in RAM
-	# and too small to hold all the temp files.
-	# Portage probably shouldn't create any files outside of
-	# /var/tmp/portage just yet anyway. :)
-	TMPDIR=${T} rpm2targz ${DISTDIR}/kernel-source-${KV}.i386.rpm
-	tar xvzf kernel-source-${KV}.i386.tar.gz
-
 	mv usr/src/linux-${KV} ${WORKDIR}
-
 	cd ${S}
-
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild b/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild
index bcd07686dddb..0bcf27acd2ca 100644
--- a/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild
+++ b/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/redhat-sources/redhat-sources-2.4.20.2.48.ebuild,v 1.3 2003/10/03 22:31:07 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
-inherit kernel
+inherit kernel rpm
 OKV=2.4.20
 KV=2.4.20-2.48
 EXTRAVERSION="-2.48-rhcustom"
@@ -27,10 +27,7 @@ S=${WORKDIR}/linux-${KV}
 # The easiest way to grab Red Hat kernel sources is from the rpm file
 # itself.  We used to generate a patch against vanilla sources trees but
 # the added dependency of rpm2targz is minimal compared with having to
-# generate a new diff for every minor version update.  (Also not to many
-# people have 2.4.18 vanilla source tarballs floating around these days)
-
-DEPEND="${DEPEND} app-arch/rpm2targz"
+# generate a new diff for every minor version update.
 
 DESCRIPTION="Kernel source tree used in Red Hat distributions (not supported by Red Hat)"
 SRC_URI="http://csociety-ftp.ecn.purdue.edu/pub/redhat/linux/beta/phoebe/en/os/i386/RedHat/RPMS/kernel-source-${KV}.i386.rpm"
@@ -39,15 +36,10 @@ KEYWORDS="~x86"
 SLOT="${KV}"
 
 src_unpack() {
-
+	rpm_unpack ${DISTDIR}/kernel-source-${KV}.i386.rpm
 	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/kernel-source-${KV}.i386.rpm
-	tar xvzf kernel-source-${KV}.i386.tar.gz
-
 	mv usr/src/linux-${KV} ${WORKDIR}
-
 	cd ${S}
-
 	kernel_universal_unpack
 }