Switch to linux-info eclass; Replace spl-0.6.0_rc14-symlink-headers.patch with dosym in src_install()

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

8 files changed, 34 insertions, 32 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 3664e78dbcb0..88e57a3f3c72 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.46 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.47 2013/03/16 16:59:00 ryao Exp $
+
+  16 Mar 2013; Richard Yao <ryao@gentoo.org>
+  -files/spl-0.6.0_rc14-symlink-headers.patch, spl-0.6.0_rc10.ebuild,
+  spl-0.6.0_rc11-r2.ebuild, spl-0.6.0_rc12-r1.ebuild, spl-0.6.0_rc13-r2.ebuild,
+  spl-0.6.0_rc14-r2.ebuild, spl-9999.ebuild:
+  Switch to linux-info eclass; Replace spl-0.6.0_rc14-symlink-headers.patch with
+  dosym in src_install()
 
 *spl-0.6.0_rc14-r2 (15 Mar 2013)
 
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch
deleted file mode 100644
index 49fe57bd0c51..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-symlink-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 4d8ab0e..6c1a7a5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -35,6 +35,8 @@ install-data-local:
- 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
- 		$(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \
- 	done
-+	release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
-+	ln -s spl-$$release/$(LINUX_VERSION) $(DESTDIR)/usr/src/spl;
- endif
- 
- ctags:
diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
index 194e8af00b33..5b22dbebb8b0 100644
--- a/sys-kernel/spl/spl-0.6.0_rc10.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.9 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.10 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
@@ -37,6 +37,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
diff --git a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
index d6655b9dcd31..14693faa7195 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.8 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.9 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
@@ -37,6 +37,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
diff --git a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
index 5798f9b5ab17..20149307ccc9 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.6 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.7 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
@@ -37,6 +37,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
index b99c08948ebd..218a7f541000 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.3 2013/02/11 23:25:16 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.4 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
@@ -37,6 +37,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
diff --git a/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild
index fb3b7222e91c..a0e6e344fbe7 100644
--- a/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild,v 1.1 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r2.ebuild,v 1.2 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
+	MY_PV=9999
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	inherit eutils versionator
@@ -37,6 +38,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
@@ -59,9 +61,6 @@ src_prepare() {
 	# Workaround for hard coded path
 	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
 
-	# Provide /usr/src/spl symlink for lustre
-	epatch "${FILESDIR}/${P}-symlink-headers.patch"
-
 	if [ ${PV} != "9999" ]
 	then
 		# Fix x86 build failures on Linux 3.4 and later, bug #450646
@@ -100,6 +99,9 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 	dodoc AUTHORS DISCLAIMER INSTALL README.markdown
+
+	# Provide /usr/src/spl symlink for lustre
+	dosym "spl-${MY_PV}/${KV_FULL}" /usr/src/spl
 }
 
 src_test() {
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index d77f5f5d16ce..b49961432e90 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.29 2013/03/15 13:17:03 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.30 2013/03/16 16:59:00 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic linux-mod autotools-utils
+inherit flag-o-matic linux-info autotools-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
+	MY_PV=9999
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	inherit eutils versionator
@@ -37,6 +38,7 @@ AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		!GRKERNSEC_HIDESYM
@@ -59,9 +61,6 @@ src_prepare() {
 	# Workaround for hard coded path
 	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
 
-	# Provide /usr/src/spl symlink for lustre
-	epatch "${FILESDIR}/${P}-symlink-headers.patch"
-
 	if [ ${PV} != "9999" ]
 	then
 		# Fix x86 build failures on Linux 3.4 and later, bug #450646
@@ -100,6 +99,9 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 	dodoc AUTHORS DISCLAIMER INSTALL README.markdown
+
+	# Provide /usr/src/spl symlink for lustre
+	dosym "spl-${MY_PV}/${KV_FULL}" /usr/src/spl
 }
 
 src_test() {