Version bump to 3.4.10_pre7 for testing.

svn path=/; revision=157

2 files changed, 8 insertions, 15 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 2f21177..7920872 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -4,6 +4,5 @@ DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c1
 DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-DIST genkernel-3.4.10_pre5.tar.bz2 206472 RMD160 68f4ddc2352c7aae7cd65475654b45600d4f4700 SHA1 1ea177aaaadf84287a7170a0651a0d95b021a800 SHA256 07ad8e244bd97a80a9c6a4bf3169433b268e384e519ee27ab1fa9b3cd83abf93
-DIST genkernel-pkg-3.4-r4.tar.bz2 1915990 RMD160 5b07a74677f6c2be6b2bbd41bfe4ff87f05fa4f8 SHA1 96dc2703128ad05251be6fd26c0830bd9e628b9c SHA256 1a5150ee6106c49b641ade2743ce03232f8e3663b6d0597bf28f5b468e534aff
-EBUILD genkernel-3.4.10_pre5.ebuild 4238 RMD160 e215591eeef4487185a39ea5e410a473a65ff5a7 SHA1 96138bf1176c2fa6bfe3ae7cc9abdb600bb2cfc6 SHA256 75981e55a13f0f531b485407471c57c5e91c9e67c3a1195dde7ff262fd89d5f5
+DIST genkernel-3.4.10_pre7.tar.bz2 208112 RMD160 c51d432d07b4295eadccf9c9a2572e8b8439d7a1 SHA1 a9d74336402ed919c4b0f3217c5015555e26ba27 SHA256 be06e5c5ffb635c0727907799d249b73b2f21b3f10f5e2658965f03f45100363
+EBUILD genkernel-3.4.10_pre7.ebuild 3968 RMD160 d1e8dfe02b62adb67d203026e5f4a0f03ea3f141 SHA1 855b48039e7fb62838eb2ebd1deab87d2d6fc522 SHA256 6d6bcd0d8bc6d9bc0b5f71542dc2deaa3a5df1fee72ac5e3638d6a57901fdfd7
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre7.ebuild
index 9f2cc37..a2d124f 100644
--- a/sys-kernel/genkernel/genkernel-3.4.10_pre5.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.10_pre7.ebuild
@@ -11,7 +11,6 @@ VERSION_DMAP='1.02.22'
 VERSION_DMRAID='1.0.0.rc14'
 VERSION_E2FSPROGS='1.39'
 VERSION_LVM='2.02.28'
-VERSION_PKG='3.4-r4'
 
 MY_HOME="http://dev.gentoo.org/~wolf31o2"
 RH_HOME="ftp://sources.redhat.com/pub"
@@ -37,9 +36,7 @@ then
 else
 	inherit bash-completion eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
 		${MY_HOME}/${P}.tar.bz2
-		${MY_HOME}/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
 		${COMMON_URI}"
 fi
 
@@ -65,8 +62,6 @@ src_unpack() {
 		subversion_src_unpack
 	else
 		unpack ${P}.tar.bz2
-		cd "${S}"
-		unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
 	fi
 	use selinux && sed -i 's/###//g' gen_compile.sh
 }
@@ -80,6 +75,12 @@ src_install() {
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+	# Here, we modify our DISTDIR based on what's set in our ENV
+	if [ "${DISTDIR}" != "/usr/portage/distfiles" ]
+	then
+		sed -i "s:/usr/portage/distfiles:${DISTDIR}:" "${T}"/genkernel.conf \
+			|| die "distdir update"
+	fi
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
@@ -95,13 +96,6 @@ src_install() {
 	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 -f "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-	"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
-	"${D}"/usr/share/genkernel/pkg || die "copying pkg"
-
 	dobashcompletion "${FILESDIR}"/genkernel.bash
 }