Move custom autogen logic to the ebuild and call eautoreconf.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index d6dc5eda907ae6b5a79bb986dcfe39225dd55032..20177055b8d8d3e221cb10c604e60c0b7b92823e 100644 (file)
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.96 2015/02/09 21:55:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.97 2015/02/14 02:21:33 floppym Exp $
+
+  14 Feb 2015; Mike Gilbert <floppym@gentoo.org> btrfs-progs-9999.ebuild:
+  Move custom autogen logic to the ebuild and call eautoreconf.
 
   09 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org> btrfs-progs-9999.ebuild:
   Run upstream ./autogen.sh (bug #539434 by Helmut Jarausch).

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index c2182e76d8ea4f368601c8ecc07c84d640f16a39..2410cfa050ffc5938ac3851061b6c6a0471d6122 100644 (file)
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -41,13 +41,13 @@ 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 1376 SHA256 661998b1482baace675154f78febc000ed48821ff041efad88aee0f7d9e4a0c4 SHA512 3b425e201b1ac871cebdcf75f376be209b3ed065e369ecc0fcfb7c2d778777b35a58f0608215b9495bff1a9763d3346fae6ef5e4b98e8962f96d466be58dd1e5 WHIRLPOOL 7ca1b17951b72e38d83c9e2a533e417645e5205e0f10c191f1cce754a12ddc2b41dc21daab223d22783f263901a905c062e6b60a442cb431348b6936643e1106
 EBUILD btrfs-progs-3.18.ebuild 1375 SHA256 18f9d479a3cc3d50005c35fcf5dbab77a15deae51f7883c8f8460d50afce46a2 SHA512 1d83b3205d8384a5f3ce8ee77e3a3d0f71e42e20129462d1c743287a2ac406a990d6468c7b5d6c1e2c23a18399e713d6c87aa67805004afb4f51cf7fd6cecfa4 WHIRLPOOL 5e5a1fa370542b6a6f9540e3a5a7f9b661086651f55e0fdbe6cdbf6808da158005b55a2047dbafce8462f03be3911d5489d8470d54209b38a910b4bbabb4fd3c
-EBUILD btrfs-progs-9999.ebuild 1266 SHA256 82ba311e8ede22b3a350939d99ad0e2260b314f3896f7695361470be3a1b4994 SHA512 f100be80e001a921c85ccc71ae38c7ee2a9432075a040415a0d175f4b4a4404adc8156b83d7c3e0cef93dd8bfc037dbf95cca57342262ceeabea3321a8c50c42 WHIRLPOOL 9955ad3d45fb4e6d5b99a47de858b9eb6b478083ffb4678569459f8df60b2856ad4ea9f29e8f5893825b0b26352dde846c6b268cada21063b61bcb4a37133b88
-MISC ChangeLog 14759 SHA256 eeebf528c01e51db6b12ad286d40b3b7c92332fde98c36d3a90b29d49c783c0a SHA512 b2499949430f034209fb45746fc25b93d6385c62f35db0a775f902ca5697a54bd50a977308633ca6f6e0a644bc6ecb697e161886eb1cbb9fd3d57d8faca4f630 WHIRLPOOL e566f69e969940e94b21cf8ccb51079130e802d7540f279200a4559df04680e19e81368610e039d4c9063477e87f1ba573bc6283e854679877f3932011de62dd
+EBUILD btrfs-progs-9999.ebuild 1524 SHA256 04d05f2c38f6eebee38be2390c93c559713fc9a110a4b1ed8a42785be2869cc7 SHA512 83cbdf30b3bff5b4d683390cd5322ae26f20dfac713640b5b78011945dacb63fbb9d7035201e40a07e5fecd7d66e0c7de69a34dd522a9b924e7321e1cdf1396c WHIRLPOOL 3de2369069303726e8fade5aad6936a74b54eafd450245bd726bcb1737355231e171727916f9df7116afab2a32a335d7d896145fef593d869c6fb1e262f62678
+MISC ChangeLog 14899 SHA256 2f0e15a534aeec23bb64d94a2594a78bcfe384d2beadbdcecfbf70e361bb8cf8 SHA512 8a0beb182e64910613043b4a7cb2b33c4ea6451b0697f52bec02c97c715e1696fd24e930215d34d2dc05c1711349ea248bffaf1441490bd596ac3a69cf755a70 WHIRLPOOL 35d236e28b7279bffa6087bbaa5fdb25ccdfde799be50d2235fb5272de84ac17854b5a30e1a42eb420ddba346cdf2f7e3bc74e6b583698c413e5ee47c36066f0
 MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTZLNQACgkQcaHudmEf86rp/QCeKIli/hAnWUpEu+Fsnpv7SXtH
-JusAn0duq7lnnWIfUBwM2/ywhjeQ0sqw
-=be7s
+iF4EAREIAAYFAlTesTAACgkQC77qH+pIQ6SMPgD6A/OC+mh8oJcNvFpG8/6hHem4
+q0YHF5yRT+G9suttYjIA/jrnjowlVBzpH6LMLlTU5p3WeCYtrKTfLwG91CVKl4XJ
+=PdNi
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index daaf876402b892d28230104230b75749b7837cc6..816c38951a0b3afa1dab5fde2d3a564903f38ce3 100644 (file)
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.38 2015/02/09 21:55:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.39 2015/02/14 02:21:33 floppym Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
        SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
        S="${WORKDIR}"/${PN}-${MY_PV}
 else
-       inherit git-r3
+       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
@@ -40,17 +40,19 @@ DEPEND="${RDEPEND}
        app-text/xmlto
 "
 
-if [[ ${PV} = 9999 ]]; then
-DEPEND+="
-       sys-devel/autoconf
-       sys-devel/automake
-       sys-devel/libtool
-"
+if [[ ${PV} == 9999 ]]; then
+       DEPEND+=" sys-devel/gnuconfig"
 fi
 
 src_prepare() {
        epatch_user
-       [[ ${PV} = 9999 ]] && ./autogen.sh
+       if [[ ${PV} == 9999 ]]; then
+               eautoreconf
+               mkdir config || die
+               ln -s "${EPREFIX}"/usr/share/automake-${WANT_AUTOMAKE}/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_compile() {