Synchronize zfs-9999.ebuild with zfs-0.6.0_rc13-r1.ebuild, bug #451016. Thanks Marcin

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 16 insertions, 16 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 69a0a0982f65..8723986b294a 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.54 2013/01/05 16:21:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.55 2013/01/11 06:13:59 ryao Exp $
+
+  11 Jan 2013; Richard Yao <ryao@gentoo.org> zfs-9999.ebuild:
+  Synchronize zfs-9999.ebuild with zfs-0.6.0_rc13-r1.ebuild, bug #451016. Thanks
+  Marcin
 
 *zfs-0.6.0_rc13-r1 (05 Jan 2013)
 *zfs-0.6.0_rc11-r2 (05 Jan 2013)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 8bcfbc0bf9fe..3d4f0678568c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -7,6 +7,6 @@ EBUILD zfs-0.6.0_rc10-r3.ebuild 2467 SHA256 d7f870e42e5176a46f881879ef6e125ce3de
 EBUILD zfs-0.6.0_rc11-r2.ebuild 2467 SHA256 7056cd5086c08bb7fd7b2b1b573ae1e5535ba4f37564ff43dfdee8c2b533a8c2 SHA512 5474b8d3ff1d9a8116a4659e0739f46f16d71cfb90ccd04507471a00223c42940ea7f44084b8d318488862ae5f86e2d07cbfe74665b0bd720593593a4492097d WHIRLPOOL 3d42751fb60873ec2b78023c85e296dc6beaea5c231586d59f9315a600bf17815893df10a7f1fd6a1e0bd902cb2b83b0b2b4beddf8f0c3d3fc7e7fa7eceecfee
 EBUILD zfs-0.6.0_rc12-r2.ebuild 2467 SHA256 9c93b75f2cf728c527a21db81e6b4dd9a6c1e9fc7a74f33f8a599423aaffb6e6 SHA512 394b109689887030331b4a6a729be9a6f8265cfebb247a48e072ff211e8022d255127f251ca33522f7679c2aa0a84b635f1bf8ebda680c5e4158fb9746e503a1 WHIRLPOOL 138b65decb7a8f4f6fd420ab8477d37b473ea4a7be15256c93fb0003147fa35c2a722847eba867ca8a9efbd171574b690e6370f446b8dc570e4478736af90ab1
 EBUILD zfs-0.6.0_rc13-r1.ebuild 2471 SHA256 ecd49aaca535b2eb1b363f86526f2f2cd1bba8eb1905953383f21ba8fc38b6f6 SHA512 235a3298ebce3e1a389dbaacde14f532afdf39272131f2c20c9de82bc54c9b4268bcf1f56f311ff6c079dec2dc9b7b11ad692a6ba826f49c6508f3d8d3a6f4df WHIRLPOOL cdc6a465d1409c1fc00cecf3cb6530274726399465f82f8e559866af4347aa2a3c4ee6ae8e635e4849816dce038a7e3ce9264775604d69286795c3f20cc0a292
-EBUILD zfs-9999.ebuild 2528 SHA256 fe33d29e7e10a27fa9d326daf070e211da2f5b4a6446b8027ebd70ab91f22fdd SHA512 30f4d76f13e5d323a4f7ebe3f126ce962a7f827924e8319bdfeb81d982b67aa219de7ce4d6f2028ed26916bb1d8c05a6ed4e8b02a90cfe44b932b48e02437b74 WHIRLPOOL 193012ae7ec570c3b14b75f57cde145d54974ac53aefb16d7f3a2c72a8eb776cd082f78cffa93713e93b9d1587f8c1a842f9ba9379992f10390b15cae48a3da0
-MISC ChangeLog 10326 SHA256 6ae03b8a8f704800c85bb2082ec863e3afc7c6e2fdf0c9476440330d93e42c4c SHA512 cb5d14b0c9aefa77cf2a2e275fef4c4185d36becb789e7541883798f8dbc551775e8f5f9870c4fa5fe07e305f9ea86faac92449a1d80a6c8ebdd7494db2dcc5c WHIRLPOOL 8a3201b016d541bc8cd828f1b43fe2d3c68e724c8a25c1757fc2ad997028da01d57e52b053a474b9890a768bd98731da6c7a4162136cc0272b4a3c5e71325541
+EBUILD zfs-9999.ebuild 2463 SHA256 a00dc2e4b025302d05b23328c50f38b2fcb869bba26a53720fd8a520729036b8 SHA512 f1d002eba547fd278b8639c238750f5e0730bfe14c7759f4310456152d6d2fa6b6adb69bfdf1553365a7365cf21f54dee051191d20285ae0b6d1dc56ef4bc1bc WHIRLPOOL 6a495bb09dd97aa1ac1fe006d741a852b92501d14b7d68f2eb267e4698e16d7248c2c27c3fd262485f1150a3187df0a74ec223b629884aabbbf728b5c1f9d249
+MISC ChangeLog 10479 SHA256 7ce201abee8dcf77e750abdc1ff0d67e955d6d7b0780502c3147eb1e5eb6ccf3 SHA512 bb71b87c067333b414047577a0aaea4cd8f43af53d35d888e72a2f71f992aefcb388cca1fb53ec12ea3af6e4b9a72313d66c7831ce087e2d1a58d877e7a06683 WHIRLPOOL 4636102c1b4f647e9cf86e2f8d84b6124af4cc23667a816c7ddb2d9564eaa4892419b34c6ddfbac035309800d40716b42e4f0f11bebd2575ccc3ac33f39310e3
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index fdc762b92763..10d9d7a9264b 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.39 2012/12/03 02:03:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.40 2013/01/11 06:13:59 ryao Exp $
 
 EAPI="4"
 
@@ -16,8 +16,8 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -86,13 +86,6 @@ src_install() {
 	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
-	if use rootfs
-	then
-		doinitd "${FILESDIR}/zfs-shutdown"
-		exeinto /usr/share/zfs
-		doexe "${FILESDIR}/linuxrc"
-	fi
-
 	newbashcomp "${FILESDIR}/bash-completion" zfs
 
 }
@@ -102,7 +95,10 @@ pkg_postinst() {
 	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
 		|| ewarn 'You should add zfs to the boot runlevel.'
 
-	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
-		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
 
 }