From d031d102728856e6bbaeaa55ec22e9ae95e4785b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 2 Apr 2018 17:45:29 +0100
Subject: sys-fs/{spl,zfs} : version bump

---
 sys-fs/spl-utils/Manifest               |   2 +-
 sys-fs/spl-utils/spl-utils-0.7.6.ebuild |  60 ----------------
 sys-fs/spl-utils/spl-utils-0.7.7.ebuild |  60 ++++++++++++++++
 sys-fs/spl/spl-0.7.6.ebuild             |  17 -----
 sys-fs/spl/spl-0.7.7.ebuild             |  17 +++++
 sys-fs/zfs-utils/Manifest               |   2 +-
 sys-fs/zfs-utils/zfs-utils-0.7.6.ebuild | 122 --------------------------------
 sys-fs/zfs-utils/zfs-utils-0.7.7.ebuild | 122 ++++++++++++++++++++++++++++++++
 sys-fs/zfs/zfs-0.7.6.ebuild             |  18 -----
 sys-fs/zfs/zfs-0.7.7.ebuild             |  18 +++++
 10 files changed, 219 insertions(+), 219 deletions(-)
 delete mode 100644 sys-fs/spl-utils/spl-utils-0.7.6.ebuild
 create mode 100644 sys-fs/spl-utils/spl-utils-0.7.7.ebuild
 delete mode 100644 sys-fs/spl/spl-0.7.6.ebuild
 create mode 100644 sys-fs/spl/spl-0.7.7.ebuild
 delete mode 100644 sys-fs/zfs-utils/zfs-utils-0.7.6.ebuild
 create mode 100644 sys-fs/zfs-utils/zfs-utils-0.7.7.ebuild
 delete mode 100644 sys-fs/zfs/zfs-0.7.6.ebuild
 create mode 100644 sys-fs/zfs/zfs-0.7.7.ebuild

(limited to 'sys-fs')

diff --git a/sys-fs/spl-utils/Manifest b/sys-fs/spl-utils/Manifest
index 8646e5d7..4555f1f0 100644
--- a/sys-fs/spl-utils/Manifest
+++ b/sys-fs/spl-utils/Manifest
@@ -1 +1 @@
-DIST spl-0.7.6.tar.gz 550089 SHA256 648148762969d1ee94290c494c4f022aeacabe0e84cddf65906af608be666f95 SHA512 b8e74e4ad8c16df1a4742639f00c4c4162607d136145bae58489f9a34539dcc5569da18639a67ac5d9d52b5feac93e052323ebf6efce6a92ba9a2b965f940fdd WHIRLPOOL 0e2ca78be72a46e84e6829c23229a68c657a64e3f47e1a1e3c0eab0cb6e52fd0efb9f50941a95e53590d6feb95558e5fce0d7bfc900149a9b11cc822e6be4c1b
+DIST spl-0.7.7.tar.gz 551498 BLAKE2B 6372777f4f4e2eb9048eaff0120414289bec532487bfa5cd8b9bde7632469ead204c4b5198a701775e92dbd6ecd94f343b612557e87a60c18b3ba7cd9594fe0c SHA512 22d0d2eb65063a59acf3d34a5781285978d85087ba18176c4f30d9b8d8a888adc5e75b06d4157de1655bbc144c67c6646f5a4209e674c3eb4b16c39da3447987
diff --git a/sys-fs/spl-utils/spl-utils-0.7.6.ebuild b/sys-fs/spl-utils/spl-utils-0.7.6.ebuild
deleted file mode 100644
index 02a1ed1b..00000000
--- a/sys-fs/spl-utils/spl-utils-0.7.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit flag-o-matic autotools-utils
-
-MY_PN="spl"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-RESTRICT="debug? ( strip ) test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS DISCLAIMER )
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-redcore/" "${S}/META" || die "Could not set Redcore release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	filter-ldflags -Wl,*
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sys-fs/spl-utils/spl-utils-0.7.7.ebuild b/sys-fs/spl-utils/spl-utils-0.7.7.ebuild
new file mode 100644
index 00000000..02a1ed1b
--- /dev/null
+++ b/sys-fs/spl-utils/spl-utils-0.7.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit flag-o-matic autotools-utils
+
+MY_PN="spl"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
+
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="debug"
+
+RESTRICT="debug? ( strip ) test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="dev-lang/perl
+	virtual/awk"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS DISCLAIMER )
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-redcore/" "${S}/META" || die "Could not set Redcore release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	filter-ldflags -Wl,*
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sys-fs/spl/spl-0.7.6.ebuild b/sys-fs/spl/spl-0.7.6.ebuild
deleted file mode 100644
index 78495265..00000000
--- a/sys-fs/spl/spl-0.7.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Solaris Porting Layer meta-package (Gentoo compatibility ebuild)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="~sys-fs/spl-utils-${PV}
-	~sys-kernel/spl-dkms-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/spl/spl-0.7.7.ebuild b/sys-fs/spl/spl-0.7.7.ebuild
new file mode 100644
index 00000000..78495265
--- /dev/null
+++ b/sys-fs/spl/spl-0.7.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Solaris Porting Layer meta-package (Gentoo compatibility ebuild)"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="~sys-fs/spl-utils-${PV}
+	~sys-kernel/spl-dkms-${PV}"
+RDEPEND="${DEPEND}"
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index 8fa0c82a..759ef360 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-0.7.6.tar.gz 6409035 SHA256 1687f4041a990e35caccc4751aa736e8e55123b81d5f5a35b11916d9e580c23d SHA512 d9d45696b81080234068a4731276f888382e6680a6ca30d302110dbd1fa00d38ef17bd59de4b787b1ce91c3184ccb403c5db6b064a611f6f8572fa077a989cdb WHIRLPOOL 5b1f6f185c83dafe0ac078efca2e5ae3fa77d177abbd5f8cc68cd18a6b52fbbee9d7591b9d7bb79773bcfddf28c78e7171d020dd3ce3be73957c397c3d2caafd
+DIST zfs-0.7.7.tar.gz 6516501 BLAKE2B f9366952bd4d8a8a81f1e4ec9c3306c4076fed7d0e79c246f7a178ccb9a12861f097cadf47b79e570242e0395426cb1455257b1054747164b19845da9fa4187f SHA512 ee935459994ed3ec2e50c3d89f0d79e4e24d58aebb035b5ddac53898181fdb00337de05b0d3a2e3692ce8b08b94a75459041153ed27971d6e896b88c44b74b14
diff --git a/sys-fs/zfs-utils/zfs-utils-0.7.6.ebuild b/sys-fs/zfs-utils/zfs-utils-0.7.6.ebuild
deleted file mode 100644
index 527ced05..00000000
--- a/sys-fs/zfs-utils/zfs-utils-0.7.6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-MY_PN="zfs"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug +rootfs test-suite"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="sys-apps/util-linux
-	sys-libs/zlib
-	virtual/awk"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!=sys-apps/grep-2.13*
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		)
-	sys-fs/udev-init-scripts
-	~sys-fs/spl-utils-${PV}"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="/usr/$(get_libdir)/dracut"
-		--with-udevdir="$(get_udevdir)"
-		--with-blkid
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-}
diff --git a/sys-fs/zfs-utils/zfs-utils-0.7.7.ebuild b/sys-fs/zfs-utils/zfs-utils-0.7.7.ebuild
new file mode 100644
index 00000000..527ced05
--- /dev/null
+++ b/sys-fs/zfs-utils/zfs-utils-0.7.7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+MY_PN="zfs"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="debug +rootfs test-suite"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="sys-apps/util-linux
+	sys-libs/zlib
+	virtual/awk"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+	sys-fs/udev-init-scripts
+	~sys-fs/spl-utils-${PV}"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="/usr/$(get_libdir)/dracut"
+		--with-udevdir="$(get_udevdir)"
+		--with-blkid
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
diff --git a/sys-fs/zfs/zfs-0.7.6.ebuild b/sys-fs/zfs/zfs-0.7.6.ebuild
deleted file mode 100644
index 381dc3f9..00000000
--- a/sys-fs/zfs/zfs-0.7.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="~sys-fs/spl-${PV}
-	~sys-fs/zfs-utils-${PV}
-	~sys-kernel/zfs-dkms-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/zfs/zfs-0.7.7.ebuild b/sys-fs/zfs/zfs-0.7.7.ebuild
new file mode 100644
index 00000000..381dc3f9
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="~sys-fs/spl-${PV}
+	~sys-fs/zfs-utils-${PV}
+	~sys-kernel/zfs-dkms-${PV}"
+RDEPEND="${DEPEND}"
-- 
cgit v1.2.3