Updating ebuild to use the new kernel.eclass

3 files changed, 10 insertions, 66 deletions

diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog
index 4430bf4a4e2a..add099e844dc 100644
--- a/sys-kernel/gentoo-dev-sources/ChangeLog
+++ b/sys-kernel/gentoo-dev-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gentoo-dev-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.2 2003/11/02 18:15:34 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.3 2003/11/04 22:00:44 johnm Exp $
+
+  04 Nov 2003; John Mylchreest <johnm@gentoo.org>;
+  gentoo-dev-sources-2.6.0_beta9.ebuild:
+  Updating ebuild to support kernel.eclass properly
 
   02 Nov 2003; Brad House <brad_mssw@gentoo.org>
   gentoo-dev-sources-2.6.0_beta9.ebuild:
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index d7a9a3a72c44..2de202f461a9 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 b4fb9afe91c700b5fdc13083246712d8 ChangeLog 861
-MD5 40030afdb7e14a56981c3f2997e196d5 gentoo-dev-sources-2.6.0_beta9.ebuild 3872
+MD5 c8d61c77df2f54c77e1badbdcebf8b44 gentoo-dev-sources-2.6.0_beta9.ebuild 2322
+MD5 922f991d6c4c174c24f7366cbe3df05e ChangeLog 1002
 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636
 MD5 2c930a031439b36d073cdbadc16a5bbc files/digest-gentoo-dev-sources-2.6.0_beta9 142
diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
index afd62cdda2e2..b6482defd432 100644
--- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild
+++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.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/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild,v 1.2 2003/11/02 18:15:34 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.0_beta9.ebuild,v 1.3 2003/11/04 22:00:44 johnm Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 #Original Kernel Version before Patches
@@ -15,8 +15,6 @@ GPV=0.3
 KV=${OKV}${EXTRAVERSION}
 
 ETYPE="sources"
-IUSE="build"
-
 inherit kernel
 
 DESCRIPTION="Full sources for the development branch of the Linux kernel (2.6)"
@@ -46,69 +44,11 @@ src_unpack() {
 	# apply gentoo patches
 	epatch ${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2
 
-	#-----
-	## Current kernel_universal_unpack is broken with 2.6
-	## using this until the issue has been rectified.
-	#kernel_universal_unpack
-
-	# remove all tilde suffixed files
-	find . -iname "*~" -exec rm {} \;
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	# also fix the EXTRAVERSION
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 -$(echo ${KV} | cut -d- -f2,3,4,5):" \
-		Makefile.orig > Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-
-	cd  ${S}/Documentation/DocBook
-	sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-			&& mv Makefile.new Makefile
-	cd ${S}
-
-	if [ ${ETYPE} == "headers" ]
-	then
-		MY_ARCH=${ARCH}
-		unset ${ARCH}
-		make mrproper || die "make mrproper died"
-		ARCH=${MY_ARCH}
-	fi
+	kernel_universal_unpack
 }
 
 pkg_install() {
-	## Using this until kernel_src_unpack works with 2.6
-	#
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R root:root *
-	chmod -R a+r-w+X,u+w *
-
-	cd ${S}
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		if [ -d "${WORKDIR}/${KV}/docs/" ]
-		then
-			for file in $(ls -1 ${WORKDIR}/${KV}/docs/)
-			do
-				echo "XX_${file}*" >> patches.txt
-				cat ${WORKDIR}/${KV}/docs/${file} >> patches.txt
-			done
-		fi
-		if [ -f patches.txt ]; then
-			dodoc patches.txt
-		fi
-		mv ${WORKDIR}/linux* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm/* ${D}/usr/include/asm
-	fi
+	kernel_src_install
 }
 
 pkg_postinst() {