Version bumped to 3.3.11 final.

(Portage version: 2.1_pre4-r1)

3 files changed, 25 insertions, 21 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index ca3933d3aec3..d35836e5da17 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.128 2006/02/02 14:38:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.129 2006/02/08 04:04:19 wolf31o2 Exp $
+
+*genkernel-3.3.11 (08 Feb 2006)
+
+  08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -genkernel-3.3.11_pre8.ebuild, +genkernel-3.3.11.ebuild:
+  Version bumped to 3.3.11 final.
 
 *genkernel-3.3.11_pre8 (02 Feb 2006)
 
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.3.11_pre8 b/sys-kernel/genkernel/files/digest-genkernel-3.3.11
index b55581f54149..92806d3ffb66 100644
--- a/sys-kernel/genkernel/files/digest-genkernel-3.3.11_pre8
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.3.11
@@ -10,18 +10,15 @@ SHA256 785ef7165f547872fea8bcaa6657f2b3999e34474ef4f61b37bf32f51bf22630 dmraid-1
 MD5 d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz 3621193
 RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c e2fsprogs-1.38.tar.gz 3621193
 SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7 e2fsprogs-1.38.tar.gz 3621193
-MD5 bc0487092d908f555506af538f2cff74 genkernel-3.3.11_pre8.tar.bz2 148222
-RMD160 e795c3ecf59e22166a371cd3d77a62c1afa7eeca genkernel-3.3.11_pre8.tar.bz2 148222
-SHA256 d416b3d831643919f2b83fac969aaa0701e78a61f0413713c2ee5ffae3a6ac97 genkernel-3.3.11_pre8.tar.bz2 148222
-MD5 2616c5c6656831feaa895c58416c2e13 genkernel-pkg-3.3.9.tar.bz2 1524695
-RMD160 abef28f491f3dfa6e7dd49040faf4a7221033e74 genkernel-pkg-3.3.9.tar.bz2 1524695
-SHA256 e720eafb0563fbea7f33f20492f5a9eb00ff617a307e354ac3c4dae60b2d83c4 genkernel-pkg-3.3.9.tar.bz2 1524695
-MD5 d3e3018f7d39e3b895aac9468c1fe58b klibc-1.1.16-sparc2.patch 23927
-RMD160 aff3ec1e0181d50f580952e98aed34009df89604 klibc-1.1.16-sparc2.patch 23927
-SHA256 5e94f0848007f2052b3a9c4ccdcdbbe6dec91b7661899ecbb8958fdc1cdbfed8 klibc-1.1.16-sparc2.patch 23927
-MD5 1e78108d2215d80803140a220601c2e6 klibc-1.1.16.tar.gz 554329
-RMD160 022704d3510f1c49e4177c9737920dd59bed30c6 klibc-1.1.16.tar.gz 554329
-SHA256 6e65f7320e6bccb54787a12917d0af91ff926e191c623fb7ea585c3ccbdebb21 klibc-1.1.16.tar.gz 554329
+MD5 e66104038c81ea5c4e676181876d4a80 genkernel-3.3.11.tar.bz2 142395
+RMD160 14e37ec9a38e896ae605a7ad6452131031267d82 genkernel-3.3.11.tar.bz2 142395
+SHA256 6793188ae1c8539f69b360a7656cc7489d843aa5804061c92e8f6419f91f2ab0 genkernel-3.3.11.tar.bz2 142395
+MD5 ff6fb56b4e4b5ed84180254e8d036344 genkernel-pkg-3.3.11.tar.bz2 1535239
+RMD160 f18ac2b9ce82fa2f7fcc7eaf15d4d622da01c269 genkernel-pkg-3.3.11.tar.bz2 1535239
+SHA256 c8fe8a88036f42656e301a0730ec19b0fc238972e56277de64b63cf0d42574c4 genkernel-pkg-3.3.11.tar.bz2 1535239
+MD5 80b85e84306695ed61049720008dd409 klibc-1.1.16.tar.bz2 451284
+RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6 klibc-1.1.16.tar.bz2 451284
+SHA256 3e7a6f303a7aca1fe938f860c9ee9c93ff7937644b9158bec07df7b1217e8d8b klibc-1.1.16.tar.bz2 451284
 MD5 61ec646daf7795e9777e8f33975408fe udev-077.tar.bz2 222315
 RMD160 c686cc3996bd6fdff53d78c6cbeda46568c4bc11 udev-077.tar.bz2 222315
 SHA256 e9f05ebcf6f5cd07336704803016c9550e587d63d8f645ad3f3e4226d1709ae3 udev-077.tar.bz2 222315
diff --git a/sys-kernel/genkernel/genkernel-3.3.11_pre8.ebuild b/sys-kernel/genkernel/genkernel-3.3.11.ebuild
index 0f4e6dc7f5b9..be69b4b35e40 100644
--- a/sys-kernel/genkernel/genkernel-3.3.11_pre8.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.3.11.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.3.11_pre8.ebuild,v 1.1 2006/02/02 14:38:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.3.11.ebuild,v 1.1 2006/02/08 04:04:19 wolf31o2 Exp $
 
 VERSION_DMAP='1.00.17'
 VERSION_DMRAID='1.0.0.rc9'
 VERSION_E2FSPROGS='1.38'
 VERSION_LVM2='2.00.25'
-VERSION_PKG='3.3.9'
+VERSION_PKG='3.3.11'
 VERSION_UNIONFS='1.1.1'
 VERSION_UDEV="077"
 VERSION_KLIBC="1.1.16"
 
 DESCRIPTION="Gentoo autokernel script"
 HOMEPAGE="http://www.gentoo.org"
-SRC_URI="http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
+SRC_URI="http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/${P}.tar.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/genkernel/genkernel-pkg-${VERSION_PKG}.tar.bz2
 	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
 	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
@@ -21,9 +21,7 @@ SRC_URI="http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${VERSION_UNIONFS}.tar.gz
 	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz
 	mirror://kernel/linux/utils/kernel/hotplug/udev-${VERSION_UDEV}.tar.bz2
-	http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-${VERSION_KLIBC}.tar.gz
-	http://dev.gentoo.org/~wolf31o2/sources/dump/klibc-1.1.16-sparc2.patch
-	mirror://gentoo//klibc-1.1.16-sparc2.patch"
+	http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-${VERSION_KLIBC}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -54,6 +52,10 @@ src_install() {
 		-e "s:VERSION_KLIBC:$VERSION_KLIBC:" \
 		${D}/etc/genkernel.conf || die "Could not adjust versions"
 
+	# This is because I switched to using the bzip2 for klibc
+	sed -i -e 's:KLIBC_VER}.tar.gz:KLIBC_VER}.tar.bz2:' \
+		${D}/etc/genkernel.conf || die "Could not adjust klibc tarball"
+
 	dodir /usr/share/genkernel
 	use ibm && cp ${S}/ppc64/kernel-2.6-pSeries ${S}/ppc64/kernel-2.6 || cp ${S}/ppc64/kernel-2.6.g5 ${S}/ppc64/kernel-2.6
 	cp -Rp ${S}/* ${D}/usr/share/genkernel
@@ -72,9 +74,8 @@ src_install() {
 	${DISTDIR}/device-mapper.${VERSION_DMAP}.tgz \
 	${DISTDIR}/unionfs-${VERSION_UNIONFS}.tar.gz \
 	${DISTDIR}/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	${DISTDIR}/klibc-${VERSION_KLIBC}.tar.gz \
+	${DISTDIR}/klibc-${VERSION_KLIBC}.tar.bz2 \
 	${DISTDIR}/udev-${VERSION_UDEV}.tar.bz2 \
-	${DISTDIR}/klibc-1.1.16-sparc2.patch \
 	${D}/usr/share/genkernel/pkg
 }