From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- sys-libs/libblockdev/Manifest | 4 +- sys-libs/libblockdev/libblockdev-2.23-r1.ebuild | 123 ++++++++++++++++++++++++ sys-libs/libblockdev/libblockdev-2.23.ebuild | 122 ----------------------- sys-libs/libblockdev/libblockdev-9999.ebuild | 3 +- 4 files changed, 127 insertions(+), 125 deletions(-) create mode 100644 sys-libs/libblockdev/libblockdev-2.23-r1.ebuild delete mode 100644 sys-libs/libblockdev/libblockdev-2.23.ebuild (limited to 'sys-libs/libblockdev') diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index c598473fbb9e..5314751b8495 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -3,6 +3,6 @@ DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a333 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 EBUILD libblockdev-2.20-r2.ebuild 2014 BLAKE2B 07fcb7f6852eb655275daa50d69607a05f91c51818cf7cdf14eedd78ee896a819ad98add227534847b2018e7903d4687d254be942234a5b27cda0ae84aa19909 SHA512 e82fa99136c0390ca347fde1939f39620ed9fc7a6ada8ed2197174631505b50e8da1df32096f7626e9a239fcc5b86dec0773e540654ad5c80bb4a713e38e8234 EBUILD libblockdev-2.22.ebuild 2516 BLAKE2B ad58734ac9bfee6cf0e8078eb36ee66b51744fd706dd14f248a576789c76b244ca0392772191f9d3af8d6fee164696cc76b7d93efee9d3b3d8625f2022e49adf SHA512 14b9ae846175817e5213018993f1d78c7ca0265394539b3e1baee5c8e9c1bf5c2609356d644a485964bfd1a59c04d0a22f569a87349e81be0430a9677279c85d -EBUILD libblockdev-2.23.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1 -EBUILD libblockdev-9999.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1 +EBUILD libblockdev-2.23-r1.ebuild 2599 BLAKE2B 2db7daa281a94bfe24a322b493b7ada80ede81fb1970f8c8c550c77509cfbd6d498fd4770f4a8d10fc0ac8ba6ba56021094cd62817218d082abe3dec90a09304 SHA512 b14af9a77420373693bc44e21096097f8a40c2b049ac56cc248784a49b13c5a5418ab62ab2c069e146af2aa3c88fe039405d9cce03b2397029df0d8e3226547b +EBUILD libblockdev-9999.ebuild 2606 BLAKE2B f4780c6c02ca95eca1a1b8968c0a28741f06e785e7c7f920d8d9b7dd27f29f1f932e07037db6873a872bba840b522d39e85c034a87929515744562892d236ccc SHA512 eb41e982a8e9607fbd0272aced19f3fecce0a35486cc841af45f4b000eadc1551d0a131d7ac1d480747b38ad0be67b23c216be9d959ad19bdc37721580ce2dc2 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9 diff --git a/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild new file mode 100644 index 000000000000..c252b7d2104f --- /dev/null +++ b/sys-libs/libblockdev/libblockdev-2.23-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-single-r1 xdg-utils + +DESCRIPTION="A library for manipulating block devices" +HOMEPAGE="https://github.com/storaged-project/libblockdev" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" + BDEPEND=" + sys-devel/autoconf-archive + " +else + MY_PV="${PV}-1" + #MY_P="${PN}-${MY_PV}" + #SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" + #S="${WORKDIR}/${MY_P}" +fi +LICENSE="LGPL-2+" +SLOT="0" +IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.42.2 + dev-libs/libbytesize + >=sys-apps/kmod-19 + >=sys-apps/util-linux-2.27 + >=sys-block/parted-3.1 + cryptsetup? ( + escrow? ( + >=dev-libs/nss-3.18.0 + dev-libs/volume_key + ) + >=sys-fs/cryptsetup-1.6.7:= + ) + device-mapper? ( sys-fs/lvm2 ) + dmraid? ( + sys-fs/dmraid + sys-fs/lvm2 + ) + lvm? ( + sys-fs/lvm2 + virtual/udev + ) + vdo? ( dev-libs/libyaml ) + ${PYTHON_DEPS} +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND+=" + dev-util/gtk-doc-am + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + escrow? ( cryptsetup )" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + xdg_environment_reset #623992 + default + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-btrfs + --with-fs + --with-part + --without-mpath + --without-nvdimm + $(use_enable introspection) + $(use_enable test tests) + $(use_with bcache) + $(use_with cryptsetup crypto) + $(use_with device-mapper dm) + $(use_with dmraid) + $(use_with escrow) + $(use_with gtk-doc) + $(use_with kbd) + $(use_with lvm lvm) + $(use_with lvm lvm-dbus) + $(use_with tools) + $(use_with vdo) + ) + if python_is_python3 ; then + myeconfargs+=( + --without-python2 + --with-python3 + ) + else + myeconfargs+=( + --with-python2 + --without-python3 + ) + fi + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die + # This is installed even with USE=-lvm, but libbd_lvm are omitted so it + # doesn't work at all. + if ! use lvm; then + rm -f "${ED}"/usr/bin/lvm-cache-stats || die + fi + python_optimize #718576 +} diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild deleted file mode 100644 index 5b61abdcb972..000000000000 --- a/sys-libs/libblockdev/libblockdev-2.23.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit python-single-r1 xdg-utils - -DESCRIPTION="A library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" - BDEPEND=" - sys-devel/autoconf-archive - " -else - MY_PV="${PV}-1" - #MY_P="${PN}-${MY_PV}" - #SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - #S="${WORKDIR}/${MY_P}" -fi -LICENSE="LGPL-2+" -SLOT="0" -IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.42.2 - dev-libs/libbytesize - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.27 - >=sys-block/parted-3.1 - cryptsetup? ( - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - >=sys-fs/cryptsetup-1.6.7:= - ) - device-mapper? ( sys-fs/lvm2 ) - dmraid? ( - sys-fs/dmraid - sys-fs/lvm2 - ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - vdo? ( dev-libs/libyaml ) - ${PYTHON_DEPS} -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND+=" - dev-util/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup )" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - [[ "${PV}" == *9999 ]] && eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --without-mpath - --without-nvdimm - $(use_enable introspection) - $(use_enable test tests) - $(use_with bcache) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with dmraid) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with kbd) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with tools) - $(use_with vdo) - ) - if python_is_python3 ; then - myeconfargs+=( - --without-python2 - --with-python3 - ) - else - myeconfargs+=( - --with-python2 - --without-python3 - ) - fi - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi -} diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild index 5b61abdcb972..1ea252a8b26c 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-single-r1 xdg-utils DESCRIPTION="A library for manipulating block devices" @@ -119,4 +119,5 @@ src_install() { if ! use lvm; then rm -f "${ED}"/usr/bin/lvm-cache-stats || die fi + python_optimize #718576 } -- cgit v1.2.3