diff options
Diffstat (limited to 'sys-libs/libblockdev')
| -rw-r--r-- | sys-libs/libblockdev/Manifest | 6 | ||||
| -rw-r--r-- | sys-libs/libblockdev/libblockdev-2.23.ebuild (renamed from sys-libs/libblockdev/libblockdev-2.21.ebuild) | 46 | ||||
| -rw-r--r-- | sys-libs/libblockdev/libblockdev-9999.ebuild | 5 |
3 files changed, 38 insertions, 19 deletions
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index a85d52113389..2fd31859b309 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,8 +1,8 @@ DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3 -DIST libblockdev-2.21-1.tar.gz 342121 BLAKE2B a0a1958303d38760a49eb2aca11ee84dfc16ebecac37d0b8322f88e078931737695e4a600efef42511bad4e027799ca38d0e3b42527a0b9189035f7a02a10f35 SHA512 9991e5b776b4fe62b7f703753630e8ec4769c043047452d63de08d93f823b778179e4568b8b78c3963daf6219422afc9eb82bcc5b07b7f0a422162037b569e41 DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45 +DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 EBUILD libblockdev-2.20-r2.ebuild 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084 -EBUILD libblockdev-2.21.ebuild 2029 BLAKE2B 52b4450eee896acef06c19b4ce5565739139ded79438b9a3ebbbe4c9e4d6cc37d02410b0d1c39533ff81427479efbdddb97855550a13e5aa8a5437163be3ad8b SHA512 d2b6dd2c454a83be8b2733ee215a24b4d21f200ef4c65aeb7bca293d47b92eb0ca4a69b520b623c1165b18287fefd5d9afdc37bebf75e0b994d91903285df4d8 EBUILD libblockdev-2.22.ebuild 2498 BLAKE2B 249e31af2e2e8f0d19dc37d3dfd069a32e8bc6ec2d4cc8edae1d232a64c5c844fb5cf97b4e1d648f5b45405e2e0292b2c84ca7dd7fb9542deb0391f3d4a4a982 SHA512 0b54fd3f202027e4c7d95b381ab4503a32cb294a8e3419896621e0c3770b6ed32f7ac87d2aff9c751e3888b9c1ba7885c9275482525ac729345f7eab76f580c2 -EBUILD libblockdev-9999.ebuild 2393 BLAKE2B 168e982cd69a773f96a51b5273c7529a885431b06f3c632d27e1e4858ac8c07ef14860aeff54b7c3d5ed071d3ed1b921c87cdc477383aaa066c0c8397ad14d43 SHA512 0f4cbb4d0fbb2cf2dfd300685fd3ef75ef9fe21981f4cd53a5f9b2b659520c7cb8784bc904cd5fd68d10f7f9fee13506441cd085e11b14c4e6151fc9716b1e4d +EBUILD libblockdev-2.23.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2 +EBUILD libblockdev-9999.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9 diff --git a/sys-libs/libblockdev/libblockdev-2.21.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild index 896f932d1c63..6108db98a24f 100644 --- a/sys-libs/libblockdev/libblockdev-2.21.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild @@ -4,18 +4,28 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit autotools python-single-r1 xdg-utils - -MY_PV="${PV}-1" -MY_P="${PN}-${MY_PV}" +inherit python-single-r1 xdg-utils DESCRIPTION="A library for manipulating block devices" HOMEPAGE="https://github.com/storaged-project/libblockdev" -SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" + BDEPEND=" + sys-devel/autoconf-archive + gtk-doc? ( dev-util/gtk-doc ) + " +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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test +tools vdo" +IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" RDEPEND=" >=dev-libs/glib-2.42.2 @@ -46,17 +56,15 @@ RDEPEND=" DEPEND=" ${RDEPEND} " -BDEPEND=" - >=dev-libs/gobject-introspection-1.3.0 - sys-devel/autoconf-archive - doc? ( dev-util/gtk-doc ) + +BDEPEND+=" + dev-util/gtk-doc-am + introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) " REQUIRED_USE="${PYTHON_REQUIRED_USE} escrow? ( cryptsetup )" -S="${WORKDIR}/${MY_P}" - pkg_setup() { python-single-r1_pkg_setup } @@ -64,7 +72,7 @@ pkg_setup() { src_prepare() { xdg_environment_reset #623992 default - eautoreconf + [[ "${PV}" == *9999 ]] && eautoreconf } src_configure() { @@ -74,13 +82,14 @@ src_configure() { --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 doc gtk-doc) $(use_with escrow) + $(use_with gtk-doc) $(use_with kbd) $(use_with lvm lvm) $(use_with lvm lvm-dbus) @@ -103,5 +112,10 @@ src_configure() { src_install() { default - find "${ED}" -name "*.la" -delete || die + 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 fb0c5edf2187..6108db98a24f 100644 --- a/sys-libs/libblockdev/libblockdev-9999.ebuild +++ b/sys-libs/libblockdev/libblockdev-9999.ebuild @@ -113,4 +113,9 @@ src_configure() { 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 } |