kernel: Don't relie on git, fix empty EXTRAVERSION

6 files changed, 63 insertions, 468 deletions

diff --git a/sys-kernel/longterm-sources/Manifest b/sys-kernel/longterm-sources/Manifest
index 033c8928..86228e0f 100644
--- a/sys-kernel/longterm-sources/Manifest
+++ b/sys-kernel/longterm-sources/Manifest
@@ -1,5 +1,9 @@
-EBUILD longterm-sources-2.6.32.60.ebuild 3738 SHA256 83b9f59fa67845a246feda2ad71659af1c1099ac68b401c2bfed7a7c9d184a5d SHA512 f8b199422750b535d8d1c8b8c4de67203739e40984767a25c602881f6ad26a41d5ffdf1d96d68ffe952b68fafc9fe2980422a2582c0488cba88eab56b68c0603 WHIRLPOOL 830f4f4c2e7ece8bcc520d6e375fb0501e587bafe7d94f03212d2e7d03685b4d23ed0c0046faee817a028d1eeda7ce9fa0969a09fb46fb753fd575a568419dae
-EBUILD longterm-sources-2.6.34.14.ebuild 3738 SHA256 83b9f59fa67845a246feda2ad71659af1c1099ac68b401c2bfed7a7c9d184a5d SHA512 f8b199422750b535d8d1c8b8c4de67203739e40984767a25c602881f6ad26a41d5ffdf1d96d68ffe952b68fafc9fe2980422a2582c0488cba88eab56b68c0603 WHIRLPOOL 830f4f4c2e7ece8bcc520d6e375fb0501e587bafe7d94f03212d2e7d03685b4d23ed0c0046faee817a028d1eeda7ce9fa0969a09fb46fb753fd575a568419dae
-EBUILD longterm-sources-3.0.68.ebuild 3738 SHA256 83b9f59fa67845a246feda2ad71659af1c1099ac68b401c2bfed7a7c9d184a5d SHA512 f8b199422750b535d8d1c8b8c4de67203739e40984767a25c602881f6ad26a41d5ffdf1d96d68ffe952b68fafc9fe2980422a2582c0488cba88eab56b68c0603 WHIRLPOOL 830f4f4c2e7ece8bcc520d6e375fb0501e587bafe7d94f03212d2e7d03685b4d23ed0c0046faee817a028d1eeda7ce9fa0969a09fb46fb753fd575a568419dae
-EBUILD longterm-sources-3.2.40.ebuild 3738 SHA256 83b9f59fa67845a246feda2ad71659af1c1099ac68b401c2bfed7a7c9d184a5d SHA512 f8b199422750b535d8d1c8b8c4de67203739e40984767a25c602881f6ad26a41d5ffdf1d96d68ffe952b68fafc9fe2980422a2582c0488cba88eab56b68c0603 WHIRLPOOL 830f4f4c2e7ece8bcc520d6e375fb0501e587bafe7d94f03212d2e7d03685b4d23ed0c0046faee817a028d1eeda7ce9fa0969a09fb46fb753fd575a568419dae
-EBUILD longterm-sources-3.4.35.ebuild 3738 SHA256 83b9f59fa67845a246feda2ad71659af1c1099ac68b401c2bfed7a7c9d184a5d SHA512 f8b199422750b535d8d1c8b8c4de67203739e40984767a25c602881f6ad26a41d5ffdf1d96d68ffe952b68fafc9fe2980422a2582c0488cba88eab56b68c0603 WHIRLPOOL 830f4f4c2e7ece8bcc520d6e375fb0501e587bafe7d94f03212d2e7d03685b4d23ed0c0046faee817a028d1eeda7ce9fa0969a09fb46fb753fd575a568419dae
+DIST linux-3.0.tar.xz 63798008 SHA256 ef5e8c2dedb20a6eab01bb379e9982cd7d47cf95bd87c9ee3e872272e85c24b6 SHA512 d1ce2369a8f6d73043b7cd992c47953c227afa591bca31e8d5ae8a549052cc2f70c035382332335ae9cf6af2d183cc88c3a41e7f0a582c7f493b8022f82816f5 WHIRLPOOL 0ea5069df287b2d86f148b59f38193ec40d5add585213bfac3efe4aa9e250ecea96017d9c54be6004894106049eac5e8fbef1d8605fd39441795d0c88c96a1c3
+DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
+DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
+DIST patch-3.0.68.xz 811844 SHA256 3051412a842152af6cfce71c3c35fc2a522014c6d2eda583dd2e1bab42fb4424 SHA512 9e32108223f902b503ead263fbb0f1a28d2d0ba36dae5af48b61136fd4d313bee4c5ed5e001b34ee0c1fd42411dd82f40d1122cd07ceadd21f2db2e31cfe7fb2 WHIRLPOOL d51cd2d7f2df865f0fdc604d4d61369381364d5c86a32b6a2507180d15b1d481e0350f0a27918653b2e7c2ecbc4f07e2404c754ed428d0685a739ddcfef77c87
+DIST patch-3.2.40.xz 796532 SHA256 0a246f95049ac45d91416ee978085a3afbed9dd824074bb3dc84ff2574330f4c SHA512 1a88040649bbfe2cdc23d19f1c9982d5fd46a55c66cb3bfc5f4c76582cfdab4512fdc639342acd6fd255cc6ef531fa4532a2089fe772089ea2242a3731f1accc WHIRLPOOL 78282e8b7d569d2f13d8192ce8c43e9f175f09073c506761e74cf6d272c26b87a39e5fbfc76290bca3b0c44c5aec5aeb627c7f607cec18a35b71d7d0ff074da0
+DIST patch-3.4.35.xz 568060 SHA256 0c2c76d6d7fd444d02b90eef3b97c507908650e693e14a761ef9c19e65d1b1ad SHA512 3fdbc42417ba88635bf0e33fa9a9440c4803e892e92b627ebcc540533a7c1e42107cc27ff732dea7147c821405d0f54f9f26e9ba1709e37d015b6ea528302743 WHIRLPOOL f7b56f485135f830634874957d670304a8a66c119f3277bb73f52571a0f0b0d5b59e0b8606b3fa658e572de05280b2bae0a8126fbef44a4d822888eda7c94bca
+EBUILD longterm-sources-3.0.68.ebuild 3467 SHA256 42b76e8e0ed206127f5458cae50631860c01ec70982b868bbcbdebcb9cb80b3a SHA512 8e16fc75ecbe067dda431a01cfdd5bd17ec240594d02ad5b25cb672f20ee38ed8e63445ff5f50c46fc4ea72379d69573a693bbc68e11b7c9d5749f05fa71bc88 WHIRLPOOL 623fce029383b67df6651a9f86934c11da453f522da77923f0c310bdd93bc01104a71ec448f358a819e86c31b2572d47eccf35aea5562fa9154de2e0883696a3
+EBUILD longterm-sources-3.2.40.ebuild 3467 SHA256 42b76e8e0ed206127f5458cae50631860c01ec70982b868bbcbdebcb9cb80b3a SHA512 8e16fc75ecbe067dda431a01cfdd5bd17ec240594d02ad5b25cb672f20ee38ed8e63445ff5f50c46fc4ea72379d69573a693bbc68e11b7c9d5749f05fa71bc88 WHIRLPOOL 623fce029383b67df6651a9f86934c11da453f522da77923f0c310bdd93bc01104a71ec448f358a819e86c31b2572d47eccf35aea5562fa9154de2e0883696a3
+EBUILD longterm-sources-3.4.35.ebuild 3467 SHA256 42b76e8e0ed206127f5458cae50631860c01ec70982b868bbcbdebcb9cb80b3a SHA512 8e16fc75ecbe067dda431a01cfdd5bd17ec240594d02ad5b25cb672f20ee38ed8e63445ff5f50c46fc4ea72379d69573a693bbc68e11b7c9d5749f05fa71bc88 WHIRLPOOL 623fce029383b67df6651a9f86934c11da453f522da77923f0c310bdd93bc01104a71ec448f358a819e86c31b2572d47eccf35aea5562fa9154de2e0883696a3
diff --git a/sys-kernel/longterm-sources/longterm-sources-2.6.32.60.ebuild b/sys-kernel/longterm-sources/longterm-sources-2.6.32.60.ebuild
deleted file mode 100644
index 8056f7e8..00000000
--- a/sys-kernel/longterm-sources/longterm-sources-2.6.32.60.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-ETYPE="sources"
-
-inherit savedconfig kernel-2 git-2
-
-detect_version
-
-SLOT="${PV%.*}"
-
-DESCRIPTION="Kernel stable sources and build"
-HOMEPAGE="http://www.kernel.org"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-EGIT_COMMIT="v${PV}"
-
-SRCDIR="${WORKDIR}/linux-${PV}"
-BUILDDIR="${WORKDIR}/build"
-
-EGIT_SOURCEDIR="${SRCDIR}"
-S="${SRCDIR}"
-
-IUSE="build sources"
-REQUIRED_USE="
-	build? ( savedconfig )
-	symlink? ( sources )
-	"
-
-DEPEND="
-	|| (
-			sys-apps/kmod
-			sys-apps/module-init-tools
-	   )"
-
-configval ()
-{
-	local _v="CONFIG_$1"
-
-	# exxport
-	. <(sed -n "/^${_v}=/ p" ${BUILDDIR}/.config)
-
-	case "${!_v}" in
-		"") declare "$_v=n" ; export $_v ; return 1 ;;
-		*)                    export $_v ; return 0 ;;
-	esac
-}
-
-src_unpack ()
-{
-	git-2_src_unpack
-
-	cd "${SRCDIR}"
-
-	# universal_unpack relie on a tar.bz2
-	universal_unpack () { :; }
-	# detect_version try to apply patch, we relie on git, not necessary
-	unipatch () { :; }
-	kernel-2_src_unpack
-}
-
-do_prepare_build ()
-{
-	mkdir "${BUILDDIR}"
-
-	restore_config "${BUILDDIR}/.config"
-	[ ! -e "${BUILDDIR}/.config" ] && die "Could not locate user configfile"
-
-	mkdir "${WORKDIR}/boot"
-
-	if configval CMDLINE_BOOL && configval CMDLINE ; then
-		einfo "Creating kernel.arg"
-		einfo "  CONFIG_CMDLINE='${CONFIG_CMDLINE}'"
-		echo "${CONFIG_CMDLINE}" > "${WORKDIR}/boot/kernel.arg"
-	fi
-
-	einfo "Creating kernel.ver"
-	einfo "  ${PV}${KV_EXTRA}"
-	echo "${PV}${KV_EXTRA}" > "${WORKDIR}/boot/kernel.ver"
-
-	configval MODULES || ewarn "CONFIG_MODULES is not set"
-}
-
-src_prepare ()
-{
-	bopt=(
-		-C "${BUILDDIR}"
-		-f "${SRCDIR}/Makefile"
-		KBUILD_SRC="${SRCDIR}"
-		KCONFIG_CONFIG="${BUILDDIR}/.config"
-		LDFLAGS_BUILD_ID=
-	)	
-
-	copt=(
-		CC=$(tc-getCC) HOSTCC=${CBUILD}-gcc CROSS_COMPILE=${CHOST}-
-		ARCH=$(tc-arch-kernel) SUBARCH=$(tc-arch-kernel)
-	)
-
-	vopt=(
-		VERSION=${KV_MAJOR} PATCHLEVEL=${KV_MINOR} SUBLEVEL=${KV_PATCH}
-		EXTRAVERSION=${KV_EXTRA} LOCALVERSION=
-		CONFIG_LOCALVERSION=
-		${LOGNAME:+KBUILD_BUILD_USER=$LOGNAME}
-	)
-
-	myopt="${bopt[@]} ${copt[@]} ${vopt[@]}"
-
-	use build && do_prepare_build
-}
-
-do_compile_build ()
-{
-	einfo "Checking configuration file"
-	emake oldconfig ${myopt[@]}
-
-	einfo "Building kernel"
-	emake bzImage ${myopt[@]}
-
-	if configval MODULES ; then
-		einfo "Building modules"
-		emake modules ${myopt[@]}
-	fi
-}
-
-src_compile ()
-{
-	use build && do_compile_build
-}
-
-do_install_sources ()
-{
-	kernel-2_src_install
-}
-
-do_install_build ()
-{
-	emake install ${myopt[@]} \
-		INSTALL_PATH="${WORKDIR}/boot"
-
-	if configval MODULES ; then
-		info "Installing modules"
-		emake modules_install ${myopt[@]} \
-			INSTALL_MOD_PATH="${WORKDIR}"
-
-		einfo "Generate modules.dep"
-		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${PV}${KV_EXTRA}" \
-			|| die "depmod failed"
-
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/build"
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/source"
-	fi
-
-	insinto /boot/${PV}${KV_EXTRA}
-
-	newins "${WORKDIR}/boot/config-${PV}${KV_EXTRA}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${PV}${KV_EXTRA}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${PV}${KV_EXTRA}" System.map
-
-	doins "${WORKDIR}/boot/kernel.ver"
-
-	if configval CMDLINE_BOOL && configval CMDLINE ; then
-		doins "${WORKDIR}/boot/kernel.arg"
-	fi
-
-	if configval MODULES ; then
-		insinto /$(get_libdir)
-		doins -r "${WORKDIR}/lib/modules"
-	fi
-}
-
-src_install ()
-{
-	use build && do_install_build
-	use sources && do_install_sources
-}
-
-pkg_postinst ()
-{
-	kernel-2_pkg_postinst
-
-	einfo "You may need to:"
-	einfo "  cd ${ROOT}usr/src/linux-${PVR}"
-	einfo "  make menuconfig ${copt[@]}"
-}
diff --git a/sys-kernel/longterm-sources/longterm-sources-2.6.34.14.ebuild b/sys-kernel/longterm-sources/longterm-sources-2.6.34.14.ebuild
deleted file mode 100644
index 8056f7e8..00000000
--- a/sys-kernel/longterm-sources/longterm-sources-2.6.34.14.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-ETYPE="sources"
-
-inherit savedconfig kernel-2 git-2
-
-detect_version
-
-SLOT="${PV%.*}"
-
-DESCRIPTION="Kernel stable sources and build"
-HOMEPAGE="http://www.kernel.org"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-EGIT_COMMIT="v${PV}"
-
-SRCDIR="${WORKDIR}/linux-${PV}"
-BUILDDIR="${WORKDIR}/build"
-
-EGIT_SOURCEDIR="${SRCDIR}"
-S="${SRCDIR}"
-
-IUSE="build sources"
-REQUIRED_USE="
-	build? ( savedconfig )
-	symlink? ( sources )
-	"
-
-DEPEND="
-	|| (
-			sys-apps/kmod
-			sys-apps/module-init-tools
-	   )"
-
-configval ()
-{
-	local _v="CONFIG_$1"
-
-	# exxport
-	. <(sed -n "/^${_v}=/ p" ${BUILDDIR}/.config)
-
-	case "${!_v}" in
-		"") declare "$_v=n" ; export $_v ; return 1 ;;
-		*)                    export $_v ; return 0 ;;
-	esac
-}
-
-src_unpack ()
-{
-	git-2_src_unpack
-
-	cd "${SRCDIR}"
-
-	# universal_unpack relie on a tar.bz2
-	universal_unpack () { :; }
-	# detect_version try to apply patch, we relie on git, not necessary
-	unipatch () { :; }
-	kernel-2_src_unpack
-}
-
-do_prepare_build ()
-{
-	mkdir "${BUILDDIR}"
-
-	restore_config "${BUILDDIR}/.config"
-	[ ! -e "${BUILDDIR}/.config" ] && die "Could not locate user configfile"
-
-	mkdir "${WORKDIR}/boot"
-
-	if configval CMDLINE_BOOL && configval CMDLINE ; then
-		einfo "Creating kernel.arg"
-		einfo "  CONFIG_CMDLINE='${CONFIG_CMDLINE}'"
-		echo "${CONFIG_CMDLINE}" > "${WORKDIR}/boot/kernel.arg"
-	fi
-
-	einfo "Creating kernel.ver"
-	einfo "  ${PV}${KV_EXTRA}"
-	echo "${PV}${KV_EXTRA}" > "${WORKDIR}/boot/kernel.ver"
-
-	configval MODULES || ewarn "CONFIG_MODULES is not set"
-}
-
-src_prepare ()
-{
-	bopt=(
-		-C "${BUILDDIR}"
-		-f "${SRCDIR}/Makefile"
-		KBUILD_SRC="${SRCDIR}"
-		KCONFIG_CONFIG="${BUILDDIR}/.config"
-		LDFLAGS_BUILD_ID=
-	)	
-
-	copt=(
-		CC=$(tc-getCC) HOSTCC=${CBUILD}-gcc CROSS_COMPILE=${CHOST}-
-		ARCH=$(tc-arch-kernel) SUBARCH=$(tc-arch-kernel)
-	)
-
-	vopt=(
-		VERSION=${KV_MAJOR} PATCHLEVEL=${KV_MINOR} SUBLEVEL=${KV_PATCH}
-		EXTRAVERSION=${KV_EXTRA} LOCALVERSION=
-		CONFIG_LOCALVERSION=
-		${LOGNAME:+KBUILD_BUILD_USER=$LOGNAME}
-	)
-
-	myopt="${bopt[@]} ${copt[@]} ${vopt[@]}"
-
-	use build && do_prepare_build
-}
-
-do_compile_build ()
-{
-	einfo "Checking configuration file"
-	emake oldconfig ${myopt[@]}
-
-	einfo "Building kernel"
-	emake bzImage ${myopt[@]}
-
-	if configval MODULES ; then
-		einfo "Building modules"
-		emake modules ${myopt[@]}
-	fi
-}
-
-src_compile ()
-{
-	use build && do_compile_build
-}
-
-do_install_sources ()
-{
-	kernel-2_src_install
-}
-
-do_install_build ()
-{
-	emake install ${myopt[@]} \
-		INSTALL_PATH="${WORKDIR}/boot"
-
-	if configval MODULES ; then
-		info "Installing modules"
-		emake modules_install ${myopt[@]} \
-			INSTALL_MOD_PATH="${WORKDIR}"
-
-		einfo "Generate modules.dep"
-		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${PV}${KV_EXTRA}" \
-			|| die "depmod failed"
-
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/build"
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/source"
-	fi
-
-	insinto /boot/${PV}${KV_EXTRA}
-
-	newins "${WORKDIR}/boot/config-${PV}${KV_EXTRA}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${PV}${KV_EXTRA}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${PV}${KV_EXTRA}" System.map
-
-	doins "${WORKDIR}/boot/kernel.ver"
-
-	if configval CMDLINE_BOOL && configval CMDLINE ; then
-		doins "${WORKDIR}/boot/kernel.arg"
-	fi
-
-	if configval MODULES ; then
-		insinto /$(get_libdir)
-		doins -r "${WORKDIR}/lib/modules"
-	fi
-}
-
-src_install ()
-{
-	use build && do_install_build
-	use sources && do_install_sources
-}
-
-pkg_postinst ()
-{
-	kernel-2_pkg_postinst
-
-	einfo "You may need to:"
-	einfo "  cd ${ROOT}usr/src/linux-${PVR}"
-	einfo "  make menuconfig ${copt[@]}"
-}
diff --git a/sys-kernel/longterm-sources/longterm-sources-3.0.68.ebuild b/sys-kernel/longterm-sources/longterm-sources-3.0.68.ebuild
index 8056f7e8..72b1b4e9 100644
--- a/sys-kernel/longterm-sources/longterm-sources-3.0.68.ebuild
+++ b/sys-kernel/longterm-sources/longterm-sources-3.0.68.ebuild
@@ -2,27 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 ETYPE="sources"
 
 inherit savedconfig kernel-2 git-2
-
 detect_version
 
 SLOT="${PV%.*}"
 
 DESCRIPTION="Kernel stable sources and build"
 HOMEPAGE="http://www.kernel.org"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-EGIT_COMMIT="v${PV}"
+KEYWORDS="amd64 x86"
 
-SRCDIR="${WORKDIR}/linux-${PV}"
+SRCDIR="${WORKDIR}/linux-${KV_FULL}"
 BUILDDIR="${WORKDIR}/build"
 
-EGIT_SOURCEDIR="${SRCDIR}"
+KV_EXTRA="${EXTRAVERSION}"
 S="${SRCDIR}"
 
 IUSE="build sources"
@@ -41,7 +38,7 @@ configval ()
 {
 	local _v="CONFIG_$1"
 
-	# exxport
+	# Export only the needed config value
 	. <(sed -n "/^${_v}=/ p" ${BUILDDIR}/.config)
 
 	case "${!_v}" in
@@ -52,14 +49,6 @@ configval ()
 
 src_unpack ()
 {
-	git-2_src_unpack
-
-	cd "${SRCDIR}"
-
-	# universal_unpack relie on a tar.bz2
-	universal_unpack () { :; }
-	# detect_version try to apply patch, we relie on git, not necessary
-	unipatch () { :; }
 	kernel-2_src_unpack
 }
 
@@ -79,8 +68,8 @@ do_prepare_build ()
 	fi
 
 	einfo "Creating kernel.ver"
-	einfo "  ${PV}${KV_EXTRA}"
-	echo "${PV}${KV_EXTRA}" > "${WORKDIR}/boot/kernel.ver"
+	einfo "  ${KV_FULL}"
+	echo "${KV_FULL}" > "${WORKDIR}/boot/kernel.ver"
 
 	configval MODULES || ewarn "CONFIG_MODULES is not set"
 }
@@ -101,8 +90,8 @@ src_prepare ()
 	)
 
 	vopt=(
-		VERSION=${KV_MAJOR} PATCHLEVEL=${KV_MINOR} SUBLEVEL=${KV_PATCH}
-		EXTRAVERSION=${KV_EXTRA} LOCALVERSION=
+		VERSION="${KV_MAJOR}" PATCHLEVEL="${KV_MINOR}" SUBLEVEL="${KV_PATCH}"
+		EXTRAVERSION="${KV_EXTRA}" LOCALVERSION=
 		CONFIG_LOCALVERSION=
 		${LOGNAME:+KBUILD_BUILD_USER=$LOGNAME}
 	)
@@ -147,18 +136,18 @@ do_install_build ()
 			INSTALL_MOD_PATH="${WORKDIR}"
 
 		einfo "Generate modules.dep"
-		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${PV}${KV_EXTRA}" \
+		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${KV_FULL}" \
 			|| die "depmod failed"
 
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/build"
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/source"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/build"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/source"
 	fi
 
-	insinto /boot/${PV}${KV_EXTRA}
+	insinto /boot/${KV_FULL}
 
-	newins "${WORKDIR}/boot/config-${PV}${KV_EXTRA}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${PV}${KV_EXTRA}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${PV}${KV_EXTRA}" System.map
+	newins "${WORKDIR}/boot/config-${KV_FULL}"     kernel.cfg
+	newins "${WORKDIR}/boot/vmlinuz-${KV_FULL}"    kernel.img
+	newins "${WORKDIR}/boot/System.map-${KV_FULL}" System.map
 
 	doins "${WORKDIR}/boot/kernel.ver"
 
@@ -183,6 +172,6 @@ pkg_postinst ()
 	kernel-2_pkg_postinst
 
 	einfo "You may need to:"
-	einfo "  cd ${ROOT}usr/src/linux-${PVR}"
+	einfo "  cd ${ROOT}usr/src/linux-${KV_FULL}"
 	einfo "  make menuconfig ${copt[@]}"
 }
diff --git a/sys-kernel/longterm-sources/longterm-sources-3.2.40.ebuild b/sys-kernel/longterm-sources/longterm-sources-3.2.40.ebuild
index 8056f7e8..72b1b4e9 100644
--- a/sys-kernel/longterm-sources/longterm-sources-3.2.40.ebuild
+++ b/sys-kernel/longterm-sources/longterm-sources-3.2.40.ebuild
@@ -2,27 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 ETYPE="sources"
 
 inherit savedconfig kernel-2 git-2
-
 detect_version
 
 SLOT="${PV%.*}"
 
 DESCRIPTION="Kernel stable sources and build"
 HOMEPAGE="http://www.kernel.org"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-EGIT_COMMIT="v${PV}"
+KEYWORDS="amd64 x86"
 
-SRCDIR="${WORKDIR}/linux-${PV}"
+SRCDIR="${WORKDIR}/linux-${KV_FULL}"
 BUILDDIR="${WORKDIR}/build"
 
-EGIT_SOURCEDIR="${SRCDIR}"
+KV_EXTRA="${EXTRAVERSION}"
 S="${SRCDIR}"
 
 IUSE="build sources"
@@ -41,7 +38,7 @@ configval ()
 {
 	local _v="CONFIG_$1"
 
-	# exxport
+	# Export only the needed config value
 	. <(sed -n "/^${_v}=/ p" ${BUILDDIR}/.config)
 
 	case "${!_v}" in
@@ -52,14 +49,6 @@ configval ()
 
 src_unpack ()
 {
-	git-2_src_unpack
-
-	cd "${SRCDIR}"
-
-	# universal_unpack relie on a tar.bz2
-	universal_unpack () { :; }
-	# detect_version try to apply patch, we relie on git, not necessary
-	unipatch () { :; }
 	kernel-2_src_unpack
 }
 
@@ -79,8 +68,8 @@ do_prepare_build ()
 	fi
 
 	einfo "Creating kernel.ver"
-	einfo "  ${PV}${KV_EXTRA}"
-	echo "${PV}${KV_EXTRA}" > "${WORKDIR}/boot/kernel.ver"
+	einfo "  ${KV_FULL}"
+	echo "${KV_FULL}" > "${WORKDIR}/boot/kernel.ver"
 
 	configval MODULES || ewarn "CONFIG_MODULES is not set"
 }
@@ -101,8 +90,8 @@ src_prepare ()
 	)
 
 	vopt=(
-		VERSION=${KV_MAJOR} PATCHLEVEL=${KV_MINOR} SUBLEVEL=${KV_PATCH}
-		EXTRAVERSION=${KV_EXTRA} LOCALVERSION=
+		VERSION="${KV_MAJOR}" PATCHLEVEL="${KV_MINOR}" SUBLEVEL="${KV_PATCH}"
+		EXTRAVERSION="${KV_EXTRA}" LOCALVERSION=
 		CONFIG_LOCALVERSION=
 		${LOGNAME:+KBUILD_BUILD_USER=$LOGNAME}
 	)
@@ -147,18 +136,18 @@ do_install_build ()
 			INSTALL_MOD_PATH="${WORKDIR}"
 
 		einfo "Generate modules.dep"
-		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${PV}${KV_EXTRA}" \
+		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${KV_FULL}" \
 			|| die "depmod failed"
 
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/build"
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/source"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/build"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/source"
 	fi
 
-	insinto /boot/${PV}${KV_EXTRA}
+	insinto /boot/${KV_FULL}
 
-	newins "${WORKDIR}/boot/config-${PV}${KV_EXTRA}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${PV}${KV_EXTRA}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${PV}${KV_EXTRA}" System.map
+	newins "${WORKDIR}/boot/config-${KV_FULL}"     kernel.cfg
+	newins "${WORKDIR}/boot/vmlinuz-${KV_FULL}"    kernel.img
+	newins "${WORKDIR}/boot/System.map-${KV_FULL}" System.map
 
 	doins "${WORKDIR}/boot/kernel.ver"
 
@@ -183,6 +172,6 @@ pkg_postinst ()
 	kernel-2_pkg_postinst
 
 	einfo "You may need to:"
-	einfo "  cd ${ROOT}usr/src/linux-${PVR}"
+	einfo "  cd ${ROOT}usr/src/linux-${KV_FULL}"
 	einfo "  make menuconfig ${copt[@]}"
 }
diff --git a/sys-kernel/longterm-sources/longterm-sources-3.4.35.ebuild b/sys-kernel/longterm-sources/longterm-sources-3.4.35.ebuild
index 8056f7e8..72b1b4e9 100644
--- a/sys-kernel/longterm-sources/longterm-sources-3.4.35.ebuild
+++ b/sys-kernel/longterm-sources/longterm-sources-3.4.35.ebuild
@@ -2,27 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 ETYPE="sources"
 
 inherit savedconfig kernel-2 git-2
-
 detect_version
 
 SLOT="${PV%.*}"
 
 DESCRIPTION="Kernel stable sources and build"
 HOMEPAGE="http://www.kernel.org"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-EGIT_COMMIT="v${PV}"
+KEYWORDS="amd64 x86"
 
-SRCDIR="${WORKDIR}/linux-${PV}"
+SRCDIR="${WORKDIR}/linux-${KV_FULL}"
 BUILDDIR="${WORKDIR}/build"
 
-EGIT_SOURCEDIR="${SRCDIR}"
+KV_EXTRA="${EXTRAVERSION}"
 S="${SRCDIR}"
 
 IUSE="build sources"
@@ -41,7 +38,7 @@ configval ()
 {
 	local _v="CONFIG_$1"
 
-	# exxport
+	# Export only the needed config value
 	. <(sed -n "/^${_v}=/ p" ${BUILDDIR}/.config)
 
 	case "${!_v}" in
@@ -52,14 +49,6 @@ configval ()
 
 src_unpack ()
 {
-	git-2_src_unpack
-
-	cd "${SRCDIR}"
-
-	# universal_unpack relie on a tar.bz2
-	universal_unpack () { :; }
-	# detect_version try to apply patch, we relie on git, not necessary
-	unipatch () { :; }
 	kernel-2_src_unpack
 }
 
@@ -79,8 +68,8 @@ do_prepare_build ()
 	fi
 
 	einfo "Creating kernel.ver"
-	einfo "  ${PV}${KV_EXTRA}"
-	echo "${PV}${KV_EXTRA}" > "${WORKDIR}/boot/kernel.ver"
+	einfo "  ${KV_FULL}"
+	echo "${KV_FULL}" > "${WORKDIR}/boot/kernel.ver"
 
 	configval MODULES || ewarn "CONFIG_MODULES is not set"
 }
@@ -101,8 +90,8 @@ src_prepare ()
 	)
 
 	vopt=(
-		VERSION=${KV_MAJOR} PATCHLEVEL=${KV_MINOR} SUBLEVEL=${KV_PATCH}
-		EXTRAVERSION=${KV_EXTRA} LOCALVERSION=
+		VERSION="${KV_MAJOR}" PATCHLEVEL="${KV_MINOR}" SUBLEVEL="${KV_PATCH}"
+		EXTRAVERSION="${KV_EXTRA}" LOCALVERSION=
 		CONFIG_LOCALVERSION=
 		${LOGNAME:+KBUILD_BUILD_USER=$LOGNAME}
 	)
@@ -147,18 +136,18 @@ do_install_build ()
 			INSTALL_MOD_PATH="${WORKDIR}"
 
 		einfo "Generate modules.dep"
-		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${PV}${KV_EXTRA}" \
+		depmod -ae -F "${BUILDDIR}/System.map" -b "${WORKDIR}" "${KV_FULL}" \
 			|| die "depmod failed"
 
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/build"
-		rm "${WORKDIR}/lib/modules/${PV}${KV_EXTRA}/source"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/build"
+		rm "${WORKDIR}/lib/modules/${KV_FULL}/source"
 	fi
 
-	insinto /boot/${PV}${KV_EXTRA}
+	insinto /boot/${KV_FULL}
 
-	newins "${WORKDIR}/boot/config-${PV}${KV_EXTRA}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${PV}${KV_EXTRA}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${PV}${KV_EXTRA}" System.map
+	newins "${WORKDIR}/boot/config-${KV_FULL}"     kernel.cfg
+	newins "${WORKDIR}/boot/vmlinuz-${KV_FULL}"    kernel.img
+	newins "${WORKDIR}/boot/System.map-${KV_FULL}" System.map
 
 	doins "${WORKDIR}/boot/kernel.ver"
 
@@ -183,6 +172,6 @@ pkg_postinst ()
 	kernel-2_pkg_postinst
 
 	einfo "You may need to:"
-	einfo "  cd ${ROOT}usr/src/linux-${PVR}"
+	einfo "  cd ${ROOT}usr/src/linux-${KV_FULL}"
 	einfo "  make menuconfig ${copt[@]}"
 }