move inherit kernel below EXTRAVERSION, clean out some old stuff

8 files changed, 23 insertions, 214 deletions

diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 3b5d0b8f538e..7e5e44543659 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,17 +1,14 @@
 MD5 0cf19cc3ec7138bf81eb7b6bb3353fb0 vanilla-sources-2.0.39.ebuild 2748
-MD5 3495f77500f9ae1ffdd139aae4766af6 vanilla-sources-2.4.20.ebuild 790
+MD5 880ecb8dbf80e64faa3a88c81b19d538 vanilla-sources-2.4.20.ebuild 786
 MD5 bf5bc0719ac3e1561b959d9e386a081f vanilla-sources-2.4.22.ebuild 792
-MD5 3708a62f076e9d0e390df0e98218ab19 vanilla-sources-2.4.18.ebuild 2772
 MD5 21a5e1ed5e13eb5399ec257020decf7f vanilla-sources-2.2.25.ebuild 2747
-MD5 55e6cfeebda7692aee698ec7d3478c08 vanilla-sources-2.4.21.ebuild 796
+MD5 a15893624db5af9cf9a21ff50d71841b vanilla-sources-2.4.21.ebuild 792
 MD5 8cd9d3d154ad27b2c1e69cd16b32025b vanilla-sources-2.2.22.ebuild 2748
 MD5 50721690bfa19e02cc0d9ee70ac92a06 ChangeLog 1912
-MD5 2c039e4eb93b603c1391727aea69f1a0 vanilla-sources-2.4.19.ebuild 2779
+MD5 17ded3e049cc5ea4571a590f031fd463 metadata.xml 449
 MD5 1d8193a0ded31699ec3b7bf85dd6cbfa files/digest-vanilla-sources-2.0.39 66
 MD5 7a3980ee687f27df3784c2bfb432ae67 files/digest-vanilla-sources-2.2.22 67
 MD5 fa8428c6171dc0e9548f0b722a5db1c2 files/digest-vanilla-sources-2.2.25 67
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-vanilla-sources-2.4.18 67
-MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-vanilla-sources-2.4.19 67
 MD5 bbc9b6e1761a30c6c7f7a9f8dec1e7e3 files/digest-vanilla-sources-2.4.20 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-vanilla-sources-2.4.21 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-vanilla-sources-2.4.22 67
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.18 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.18
deleted file mode 100644
index 0768e3e594e0..000000000000
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad92859baaa837847b34d842b9f39d38 linux-2.4.18.tar.bz2 24161675
diff --git a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.19 b/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.19
deleted file mode 100644
index a2f6aa2b5c59..000000000000
--- a/sys-kernel/vanilla-sources/files/digest-vanilla-sources-2.4.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
diff --git a/sys-kernel/vanilla-sources/metadata.xml b/sys-kernel/vanilla-sources/metadata.xml
new file mode 100644
index 000000000000..bb293fe254d3
--- /dev/null
+++ b/sys-kernel/vanilla-sources/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <herd>x86-kernel</herd>
+  <maintainer>
+    <email>x86-kernel@gentoo.org</email>
+    <name>x86 kernel team</name>
+    <description>Actively maintained</description>
+  </maintainer>
+  <longdescription>
+    Vanilla prepatch/rc sources, for people who like to have the latest 2.4 available
+  </longdescription>
+</pkgmetadata>
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.18.ebuild
deleted file mode 100644
index ed86920216bd..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.18.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.18.ebuild,v 1.18 2003/09/07 07:26:01 msterret Exp $
-#OKV=original kernel version, KV=patched kernel version. They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.18
-KV=2.4.18
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.18 kernel sources
-
-DESCRIPTION="Full sources for the Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 ppc sparc "
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux linux-${KV} || die
-	cd ${S}
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${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-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.19.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.19.ebuild
deleted file mode 100644
index 156de9408b56..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.19.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.19.ebuild,v 1.12 2003/09/07 07:26:01 msterret Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.19
-KV=2.4.19
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.19 kernel sources
-
-DESCRIPTION="Full sources for the Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 ppc sparc alpha"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-#	mv linux linux-${KV} || die
-	cd ${S}
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${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-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
index 1d9852ba9ec4..b6a4caec0e8a 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.7 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.20.ebuild,v 1.8 2003/11/16 19:14:04 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
-ETYPE="sources"
-inherit kernel
 OKV=2.4.20
 KV=2.4.20
 EXTRAVERSION=""
 S=${WORKDIR}/linux-${KV}
+ETYPE="sources"
+inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
index 861732d58dcb..92869455b937 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.4 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-2.4.21.ebuild,v 1.5 2003/11/16 19:14:04 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
-ETYPE="sources"
-inherit kernel
 OKV=2.4.21
 KV=2.4.21
 EXTRAVERSION=""
 S=${WORKDIR}/linux-${KV}
+ETYPE="sources"
+inherit kernel
 
 # What's in this kernel?