From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- sys-fs/vhba/Manifest | 6 ++- sys-fs/vhba/metadata.xml | 4 +- sys-fs/vhba/vhba-20170610.ebuild | 4 +- sys-fs/vhba/vhba-20190302.ebuild | 81 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 sys-fs/vhba/vhba-20190302.ebuild (limited to 'sys-fs/vhba') diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest index a219468904f4..ca98f9084c45 100644 --- a/sys-fs/vhba/Manifest +++ b/sys-fs/vhba/Manifest @@ -1,3 +1,5 @@ DIST vhba-module-20170610.tar.bz2 15622 BLAKE2B 7556f13dba719779a8c9c2acb03c51f9f4b33153b46146109cd3387094a9e3ca2ad9750e4564139696c2a417a5aad347c32a33eeb7b69594477efc2ceab0e12e SHA512 bf27a6a7a6aabf6c1a4c1f16b1a08dce460ee675ea53b141c6db8edf0637dffa900e03b9141f9f1a672fcd8f84e6f2be86a07e1f78bc5667a7a7669d45f1f687 -EBUILD vhba-20170610.ebuild 2155 BLAKE2B e454477dd5783e9acef5bc166f6cb39e63eb8ff5a9bbe8d43ebdc5be635439c48335fccb71e5e056e596161550494f170449163a97f012dd2eba69b1af9a8eb5 SHA512 06dcdbd12d4db2483ca3af4212c867ddfbaaf6559deb713f0bf39fd50843071f544711c947fa12421169031fd3a4753fa6e8a96dc454c09f32331c75fbc282cf -MISC metadata.xml 341 BLAKE2B 6ba11bf269584edd58facdc939cb6fe9ab5992148902a243f40daeb9fc2626fe341139ea8353a810f4857ccd1fe34c0df3658248ffcf792555725df444c27f97 SHA512 a401a5cdb6f7cc87654f66a5617246f081840d8dbadf376f8590d55c1ab528e79cbe1708d58e41bf1ed104ababcfda79da69595a107e0236ccaa974144304e09 +DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38 +EBUILD vhba-20170610.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c +EBUILD vhba-20190302.ebuild 2148 BLAKE2B 8b3d1dd8f8d8e21da1a6d59356b789cc1cc703c6f68ecc6cbdf04890ed3942024753b3e26f6855e757a68a338a2c4c9e7ae9c35125035ea1580ffb99505b9555 SHA512 4a23aa165510d5b3f518bc47e8aea33053a42b14db27d3b3682a726f2ca840f114a34cbdeb34a0c3661d98a4c059cc9a2dcd351d1930d19d4ad8c54d5989a4a7 +MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0 diff --git a/sys-fs/vhba/metadata.xml b/sys-fs/vhba/metadata.xml index f998f663a174..be81b6000604 100644 --- a/sys-fs/vhba/metadata.xml +++ b/sys-fs/vhba/metadata.xml @@ -2,8 +2,8 @@ - tetromino@gentoo.org - Alexandre Rostovtsev + mgorny@gentoo.org + Michał Górny cdemu diff --git a/sys-fs/vhba/vhba-20170610.ebuild b/sys-fs/vhba/vhba-20170610.ebuild index ffb1252014db..157ae2ff9f9d 100644 --- a/sys-fs/vhba/vhba-20170610.ebuild +++ b/sys-fs/vhba/vhba-20170610.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="virtual/udev" diff --git a/sys-fs/vhba/vhba-20190302.ebuild b/sys-fs/vhba/vhba-20190302.ebuild new file mode 100644 index 000000000000..8969ab8b663f --- /dev/null +++ b/sys-fs/vhba/vhba-20190302.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils linux-mod udev + +MY_P=vhba-module-${PV} +DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite" +HOMEPAGE="http://cdemu.org" +SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} +MODULE_NAMES="vhba(block:${S})" +BUILD_TARGETS=modules + +pkg_setup() { + CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG" + check_extra_config + BUILD_PARAMS="KDIR=${KV_OUT_DIR}" + linux-mod_pkg_setup +} + +src_prepare() { + # Avoid "make jobserver unavailable" warning and -Werror problems + sed -e '/ccflags/s/-Werror$/-Wall/' \ + -i Makefile || die "sed failed" + + eapply_user +} + +src_install() { + dodoc AUTHORS ChangeLog README + linux-mod_src_install + + einfo "Generating udev rules ..." + dodir "$(get_udevdir)"/rules.d + cat > "${D}/$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die + # do not edit this file, it will be overwritten on update + # + KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" + EOF +} + +pkg_postinst() { + # Older versions of vhba installed their rule file in /etc/udev/rules.d, + # which overrides rules in /lib/udev/rules.d. We remove the old file + # automatically if it is identical to the default one installed by + # vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules + # file states that it can be automatically overwritten by the system. + old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + 2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* ) + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || + eerror "Failed, please remove ${old_rules} manually." + ;; + * ) + ewarn + ewarn "The ${old_rules} file from a previous" + ewarn "installation of ${PN} is overriding ${P}'s" + ewarn "udev rules. Unless you had deliberately customized it," + ewarn "you should remove it." + ewarn + ;; + esac + fi + + linux-mod_pkg_postinst +} -- cgit v1.2.3