From 92077083ecf35609b91b0c99ba5049f62e0bdc73 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 26 Mar 2015 21:20:45 +0000 Subject: [PATCH] Version bump, bug 544602. Install bash completion file, bug 544414. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- sys-fs/btrfs-progs/ChangeLog | 8 +- sys-fs/btrfs-progs/Manifest | 12 +-- sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild | 79 ++++++++++++++++++++ sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 ++-- 4 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog index 67207b50e045..263d3b9c2711 100644 --- a/sys-fs/btrfs-progs/ChangeLog +++ b/sys-fs/btrfs-progs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/btrfs-progs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.101 2015/03/25 01:00:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.102 2015/03/26 21:20:40 floppym Exp $ + +*btrfs-progs-3.19.1 (26 Mar 2015) + + 26 Mar 2015; Mike Gilbert +btrfs-progs-3.19.1.ebuild, + btrfs-progs-9999.ebuild: + Version bump, bug 544602. Install bash completion file, bug 544414. 25 Mar 2015; Mike Gilbert btrfs-progs-9999.ebuild: Add note about --enable-convert being broken. diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 6ee9a653b062..575300481d8d 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -24,6 +24,7 @@ DIST btrfs-progs-v3.17.3.tar.xz 588424 SHA256 e7bd9ff8d95b515973d3a1255c17fd481b DIST btrfs-progs-v3.17.tar.xz 370560 SHA256 ecafbf71e729c7e907dac488c2e0c94983dd38420f56dce85e2a4310a06bf0a0 SHA512 2363e4493f375c9e74398ea859bc63d5d5b5534554aae02ad08dcef8e974cf9e9643823552beb76d78c4884cb4f1db85f305a5186b9985f164b99b1a33d87900 WHIRLPOOL d7153b68187508dfeb9da6ce44b954668dd82ce6266b20b6f7d9896c666bf2999df1bc6cb207e8f0c7be12f87995a876a3cb04ad79aa030a72a128d50b6dca15 DIST btrfs-progs-v3.18.2.tar.xz 1029228 SHA256 dd8ddb4d201e5ffd32a15ed0e1f33fbc2c8fb16383f1519a9fae136698c2dfec SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4 WHIRLPOOL e5df056188abc2f57941b92be2774208fd1409f580c9604242f81aeda78f4be6d95f4cacfcf39917db363a033fb3b11f1eb864c15cccf24491fc1b660fce3803 DIST btrfs-progs-v3.18.tar.xz 1026948 SHA256 f9a4ab0b2d66461ca78ffefd03ddd017164d0c6ad2d9532ac2baf8d79f61044d SHA512 3265628f24fc941493d7819f2a1dfdc6665236ebdbc4039f87d7bbdecf9840e48bb238a57222919dcf54e63e702825a0db33faaa02db0f92d20ec1b792e059db WHIRLPOOL 9ab4f292947126e87fbd11ba9cc04cdaf7a466811bfa5bbf570d2e293614c0e3583e42e25e306ab006eb7ce72edcbb573edaf3ecdb243785461947a23c2dcc23 +DIST btrfs-progs-v3.19.1.tar.xz 1101168 SHA256 248862a7e7e06188bb495bbaa05d3e0e34628b61a10ef03234b3b00698ce88db SHA512 c8b1c348afe3e32f54a72fcf361700bd63c12272e34ab34774936a2eca338dbea568d452f494d6ddd3c7be75b37a6d400fec33500548ed9b6df008212613d7f5 WHIRLPOOL 75bb08fe5ab49711f264d6cd35ddac39ea722ef2bcd57c53ad0d483cdf329b1b1b89c0b70280dea161568fd78c44eae30c76fb574ee649200237a13b3df1d8d4 DIST btrfs-progs-v3.19.tar.xz 1099840 SHA256 b23965d7214ebc93937df658f18fefe020fc2fd2be4d591094ef1aae168a36c8 SHA512 2581d586d8cdb688bc344fc6f064cfa346cedb5b78d6741e319c5752da2cd218c2c19dde342b55d6be552d47657cb87bd0d5bd536d75de216d506e7f354c4139 WHIRLPOOL 77ad2f82f3cc470a0bcdbf4de5a1785184eaebd0dba5e6b12219ed1986d83d8c3466fa7018b9b83fb079651572df5ae558c55796a40f7aed8840e5342d81955c EBUILD btrfs-progs-0.19-r3.ebuild 2733 SHA256 77ae329be086d9d70848c9f63ecb46dc6f820ebacba9e3bf094c092094a0ff8b SHA512 97d92488a923e1efc938f8bed4ece3f6893192fd16976dcb24bf28a778e319dfd4442c8660e9599d73a97ca4e269a416364422a1d7c80868938a4e23728152a8 WHIRLPOOL e1d4f67116c48aafea82c96bd5fb895dac531f6aa62ca225b8e14df10feffda0a7e5c6ef5563992bf20d14e7ccf7e1df035ab8561849e4d9a48b9579a14e7e5b EBUILD btrfs-progs-0.19.11.ebuild 1687 SHA256 93e3661de2904fbc30d6a553b9bf580670b31976daa00b972844b473a1f9ef73 SHA512 1812c567a8382ea1d0ef42866303afc44fbbb685e98a78f584bd7c3f73d9310ebf4891d22f24efbc0cee0729e8595da2481e244f6651dd843303d47dc46d494c WHIRLPOOL a406c5d018a2412f20fbf5bc53218fbe211d35a2777533047872dac2372e7d811308890d04e22dbabb23a9ceff3233d1f0512622ec9205d9225c4b8cc7ba3d8b @@ -42,14 +43,15 @@ EBUILD btrfs-progs-3.17.3.ebuild 1377 SHA256 9acc82972b8a89a04dda69bbd699482cede EBUILD btrfs-progs-3.17.ebuild 1374 SHA256 afffe34a5be5c30fd44eb93ce55dd579b1f82fd905b6d8614f47f86b96212a87 SHA512 3df391fae3037637c725627c9f37f2df62b339d3f7e0a88346fd759c4ddbf40d67dbd5d250e6ba990f2ee251d081828b3ddc9db1bf39f94e119b2d3b3548c99e WHIRLPOOL 170f5b158501ad17cfd618d3d11c8bac553ed4021e07130bf02587c75e89c97af0a9a76658e696afbac099a72878599f88b3bcb32ca68769678ef70b40717074 EBUILD btrfs-progs-3.18.2.ebuild 1381 SHA256 b132133a7d6f697097b86db98defb7731a7d2f30e2415b9c6bd2689f280e1b3b SHA512 c3512536e76a005de90beeb6a32673e7a32e6d501bff711263d6e09e614ba7200995abc62cfafec4d28fd47b57db7aca955f2b332b8f1d6c92dc421aef2ab3e1 WHIRLPOOL 520d7482fb4fba789e12364d5b9bcf303b79f4fdb9db829a1733f471abba53423fecf4741c24f06fadf56cec082aebce12c16584fff6857f477db242f9835b87 EBUILD btrfs-progs-3.18.ebuild 1375 SHA256 18f9d479a3cc3d50005c35fcf5dbab77a15deae51f7883c8f8460d50afce46a2 SHA512 1d83b3205d8384a5f3ce8ee77e3a3d0f71e42e20129462d1c743287a2ac406a990d6468c7b5d6c1e2c23a18399e713d6c87aa67805004afb4f51cf7fd6cecfa4 WHIRLPOOL 5e5a1fa370542b6a6f9540e3a5a7f9b661086651f55e0fdbe6cdbf6808da158005b55a2047dbafce8462f03be3911d5489d8470d54209b38a910b4bbabb4fd3c +EBUILD btrfs-progs-3.19.1.ebuild 1944 SHA256 2a524fee75507c447b64152621e25c4ae687fc33d0883b326aa94ca6bf1a8e88 SHA512 d46c72f0d33f2db90e0c6f1d902186ce0bae18b6832bf51b77da0929953deca3af4e6506557aa8ca05cce9182e0be1285a21e93611fa358ac49ae76c2aedf561 WHIRLPOOL d2ee44d5c6270e235ec969589b3e7c36ab5ed39e8bfaad4470b0fdb3eb101d392bc0f086379e5d24e793c01d75bf02a4fdb8d949b241feb1f8035e7fc5d20548 EBUILD btrfs-progs-3.19.ebuild 1874 SHA256 6a437c7f661ffeecff3f03682c2bacf5ddbabee74e321eb12a331e2a5d5bd738 SHA512 61d5b0c9a517f1531f64f93f313322e0e81a1fe37b3ae83b9329b586f8963cd9b1dc51c3dfb5bdd11ca079983f1a0ca06010291dd66ce534de634d72703a7607 WHIRLPOOL 7a4b8c560c65faf4ff7a8ad392a58ed71cf6b02d9fe507c64758778dd5f85e8b705521af1854e71834e67f0137d9f13ff9526ae0b0c209c9ec58afd4b3bf5055 -EBUILD btrfs-progs-9999.ebuild 1971 SHA256 a4bb686046929a30b6f4d4620fa337a029af68553bd49514a82df6d0cf7636cc SHA512 fa421923ecf6b23347f8f2bae0b53e5dab250124b4b7c7d8f58c83a2f467cb4b1a9b4f2372e6c8c3ff7d76e60854cdc2e4b3b7def6ef82f1e70f5577b9bf5695 WHIRLPOOL 54de12aa98a238396001fc855dcdbc6f9ff4bc07510e32d7889677386909f55e36e9efb935b41c252568c581453df7662c238fd5e7af1ccbed0e0def02b54f4e -MISC ChangeLog 15475 SHA256 d4f15b3e77eddf4e2f59a929c1f9f8e410efe77f3e38300a2d815f1780f78a67 SHA512 bb128a52911f977946115417861d8e1035f11ee760e1eaa4ba63aff3d7f23bcc7f84559cb72c9bd34d1feffa59ba7404f0b24974e934260892f891a8a5ac2393 WHIRLPOOL d42e0d3bcc908ccb3cb2f57000ec8ad60d794a0efe7fb2774ef14c76dab00d711908b939eb4783682a73799e52f97014ee2a766e2162fcb92b1b9f66a3d48476 +EBUILD btrfs-progs-9999.ebuild 1943 SHA256 37be755699931d0b8f908d27a866a850e1c91e464c98f25a50f51a9ee72731f6 SHA512 9323ca2ad2d5e04c32efeb5d7bbfb8219e96dd008023b4d8e60a8b4a9f17aecf73412f99d3542d4766fddb577025a81f57cfb1fc3220b616ddf568da61782e68 WHIRLPOOL 288a4499434f3c71a23211596aced69cc2da94e8062f1e269094b9c45838f1f327681f3b68403a7ba122e405de8ab3791114b204ad6e5c8eca6653e7ae02c450 +MISC ChangeLog 15685 SHA256 b61a704cafb77ced3fe9f962058b1d9deff93d25810ab761ce17289f5dd3408c SHA512 f4dbd354569bdf89a5dd01e6f34e26916918f0d3bdb670325b66d95e032b25e284b5c87abed0ecf9ec869e40b6c03665421c5d9538bc046b4d3c2148270481ad WHIRLPOOL e8a4be84ff6416dcfccbd9055fafe8b6c9bdd40e1bb76ddddb2c84e416fa5334ee441c7dc77dc5bef78d2416c70b7149ffb3aafb4f82a53123672083a2894821 MISC metadata.xml 510 SHA256 9ee234e55d228cbf75a49949089b9cb9075bccd89918a73f8b95822f96778fd6 SHA512 ea29beac8f737c269cb51a5e7a6971defbc6c3e76f009e3fd587298c12542930d521f211f3024e965cf0e0bbc8fb59b187bfa8d65bb564d76205917cf3c0f665 WHIRLPOOL 1cadd8850d532c009f3d5cfb6f2615db5e36d72f1c3b1d3f1cc1f44f2c4f68e93f295afdab6a0627b20a71602bf2a8857e01beffdcb43dc82ba2017e964ec744 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlUSCKgACgkQC77qH+pIQ6QNxgD/aMHw6N3chpnMAagJ71XZ6IkL -sdP/B0EQbtwq4EqXTr8BALyvLsAtKOWvTgw2yBZnpsBfU6L20PtVlfPlIO+c2CiC -=G3QC +iF4EAREIAAYFAlUUeCwACgkQC77qH+pIQ6Sc4gEAmFnTRG4QJI0BZkgwydDVU7YK +DPdL0EyESQRLEoL9GW4BAICPW3AaAybMSCoB8Aj78A1JbhaWQP1sL8Rtf6xHrUf6 +=1J9L -----END PGP SIGNATURE----- diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild new file mode 100644 index 000000000000..0d21e3152389 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild,v 1.1 2015/03/26 21:20:40 floppym Exp $ + +EAPI=5 + +inherit bash-completion-r1 eutils multilib toolchain-funcs + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV=v${PV} + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + S="${WORKDIR}"/${PN}-${MY_PV} +else + WANT_LIBTOOL=none + inherit autotools git-r3 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git + https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert" + +RESTRICT=test # tries to mount repared filesystems + +RDEPEND=" + dev-libs/lzo:2= + sys-libs/zlib:0= + convert? ( + sys-fs/e2fsprogs:0= + sys-libs/e2fsprogs-libs:0= + ) +" +DEPEND="${RDEPEND} + convert? ( sys-apps/acl ) + app-text/asciidoc + app-text/docbook-xml-dtd:4.5 + app-text/xmlto +" + +if [[ ${PV} == 9999 ]]; then + DEPEND+=" sys-devel/gnuconfig" +fi + +src_prepare() { + epatch_user + if [[ ${PV} == 9999 ]]; then + eautoreconf + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + $(use_enable convert) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 +} + +src_install() { + default + newbashcomp btrfs-completion btrfs +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index a56caba56680..9843b596987f 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.42 2015/03/25 01:00:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.43 2015/03/26 21:20:40 floppym Exp $ EAPI=5 -inherit eutils multilib toolchain-funcs +inherit bash-completion-r1 eutils multilib toolchain-funcs libbtrfs_soname=0 @@ -64,10 +64,7 @@ src_prepare() { src_configure() { local myeconfargs=( --bindir="${EPREFIX}"/sbin - - # --enable-convert is broken - # http://thread.gmane.org/gmane.comp.file-systems.btrfs/43873 - $(usex convert '' --disable-convert) + $(use_enable convert) ) econf "${myeconfargs[@]}" } @@ -75,3 +72,8 @@ src_configure() { src_compile() { emake V=1 } + +src_install() { + default + newbashcomp btrfs-completion btrfs +} -- 2.26.2