Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 16 insertions, 23 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 1d83b1ed4ec3..58fdb6db150b 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.81 2013/01/27 22:21:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.82 2013/01/29 13:11:14 aballier Exp $
+
+  29 Jan 2013; Alexis Ballier <aballier@gentoo.org> freebsd-sources-9.1.ebuild:
+  Install to /usr/src/PN-RV to ease upgrades, bug #454414 by Yuta SATOH
 
   27 Jan 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-sources-9.1_rc1.ebuild, -freebsd-sources-9.1_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 51c334f95f71..115e47ee98f2 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -42,13 +42,13 @@ EBUILD freebsd-sources-7.2-r3.ebuild 3943 SHA256 f6b279fd482a0b156924fc23fbb7a11
 EBUILD freebsd-sources-8.0.ebuild 3671 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262 SHA512 89a9b735d64b24e192e546154d066d7ad4492054bc1c5079b64eae01c7ec992295d911a4fe55ea05a77885a4549775a3d85e1ed4f6d87560db1509bd2ed28b43 WHIRLPOOL 7be82aae09e023fc1cb25fb8f9ebee963c5874d2223e75fef878d167d7df967ee9356a710666a6f563ebf377e18cace1eab1017f7778f69bc23a63e59d54f883
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.0-r5.ebuild 3500 SHA256 9c08ac66025fd0dff16233546f408581e92f0c9c77fd9d803668cd451d86b4a5 SHA512 90e7cef893c4e096e916eceff6b4263330c20cc11ac0f7469e9f190c4e0aea0f781ed604cee9b3956b774389b7c4ae5776fadbb4400e8efb4aa8416ac528d3ff WHIRLPOOL 0e11564b0bd7e6978a03e96600d4ab32b7d07f197c7ba98374c1785dd1e7e65b60061770505d208b59472696a80b107b5f2e73612897ca8d94330e9b4a40ffaa
-EBUILD freebsd-sources-9.1.ebuild 2977 SHA256 c0ae9d524056966d613fdd05a3b7ac3e7aad9cb989024f95ac6d38e412667094 SHA512 ce22bc76f0dfd1c306bde96f0fa6fe7cf3ecbe7b7b913a558f3656a307480637d360a4593d6ac2ade97112b3b4bb31ed435de3d557cbcca41d010a5a569fe78c WHIRLPOOL 19d8d1d9d58a31872dfa062406225342d1b3e11e0bc505bd0e49f6cdb9ee60db4c028cb171a3f27630a2c7c81697780c986bfc9389da4d03fc68b589d5b2b28b
-MISC ChangeLog 21155 SHA256 421d207e9ff7ca0aa6612d568ab143bc69c2553a634cded8e267a5615cc83b7a SHA512 b4ed179fee74099395020ed681fd851c47b90240c195d7353e4f3e541692f3895651740e17161a93694667f76d274ecb4dedf8955cbd9274ea97cd5c0b919599 WHIRLPOOL 386aa97513a2805e5548d952296d748eb983e132c6f880d3fba9d2cbe3f05fd8e684811a69cd1bd6d9759a0bfde6edd7ec20cf48223b2d2baf4144904cced46c
+EBUILD freebsd-sources-9.1.ebuild 2525 SHA256 f596ff32a38a09b6f0dd7ccf8d137231a1032fd5869ae19f4d146280d2753075 SHA512 eb6e794e1308501f0af53a7e8aaf8d6e0cfbd063fcfe2953f193448da3c8002eb0352887ffad506291addd49c62f853d442be8581e306ffb82e6974d8901b224 WHIRLPOOL 8022d14dbfaa3384abd9a482d463a7a1e416c77a849d871b18b0a6a75fe66633922bdf4068663ce10b6218e1a97ff7f3d7f0c5ba9423fb921de0848da0263774
+MISC ChangeLog 21308 SHA256 05b55ea0f108d8dfb4f5d9bd6c89b67167ed5cae074fe68c81cc8b0dc6f5dcef SHA512 55c5a9de2b05035da3330474bb9ec4efd56fe3cf01687fc007a4b832a6bf78c6f0f7cff7dd57036bc39e3fd590302d7693197db32e218898b5f8f2d4c5dc1ed9 WHIRLPOOL f541dc9aa2a76aa9727d63f05d9b668a0090826c2496b89511e8ba2e3137ace9587ad782ec3c021c4db0802cb2a232ceafd4546187fe59f958368c0093a217cb
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEFqHAACgkQvFcC4BYPU0rh/wCgy0T1hsoL7nHgkztr4Fr4ynNn
-WFAAoJuMCeZ/KVYnF4rocRj9MlMWW0/G
-=uP1Z
+iEYEAREIAAYFAlEHynMACgkQvFcC4BYPU0oCGQCdH5mABtk0nwdjI+CPD3bV1LZZ
+6RUAn07RCLTfC/pwZG1ID8IEvBy8demW
+=HqvO
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild
index 23f06d93ee73..1dcf6dbba18d 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.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-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild,v 1.1 2013/01/27 21:28:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1.ebuild,v 1.2 2013/01/29 13:11:14 aballier Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
+SLOT="${RV}"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 
 IUSE="symlink"
@@ -19,10 +19,6 @@ RESTRICT="strip binchecks"
 
 S="${WORKDIR}/sys"
 
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
 PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-9.1-gentoo.patch"
 	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
@@ -59,27 +55,21 @@ src_compile() {
 }
 
 src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
+	insinto "/usr/src/sys-${RV}"
 	doins -r "${S}/"*
 }
 
 pkg_postinst() {
 	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..."
+		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
 	elif use symlink; then
 		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+		rm "${ROOT}/usr/src/sys" || \
 			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
 	fi
 
 	if use sparc-fbsd ; then