summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-06-19 21:05:26 +0000
committerMike Gilbert <floppym@gentoo.org>2014-06-19 21:05:26 +0000
commit25f4aa54c2678017556fcfed464623148eec5863 (patch)
tree437d1e627abd540c0cb914b252cd1f74d6d07045
parentBump 4.1.7, add fix for CVE-2013-4495 (#491270) (diff)
downloadhistorical-25f4aa54c2678017556fcfed464623148eec5863.tar.gz
historical-25f4aa54c2678017556fcfed464623148eec5863.tar.bz2
historical-25f4aa54c2678017556fcfed464623148eec5863.zip
Version bump.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
-rw-r--r--sys-fs/btrfs-progs/ChangeLog8
-rw-r--r--sys-fs/btrfs-progs/Manifest14
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild61
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-9999.ebuild10
4 files changed, 83 insertions, 10 deletions
diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 409c92dd3a82..6a06ea76f5c8 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.79 2014/05/20 14:47:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.80 2014/06/19 21:05:24 floppym Exp $
+
+*btrfs-progs-3.14.2 (19 Jun 2014)
+
+ 19 Jun 2014; Mike Gilbert <floppym@gentoo.org> +btrfs-progs-3.14.2.ebuild,
+ btrfs-progs-9999.ebuild:
+ Version bump.
*btrfs-progs-3.14.1-r1 (20 May 2014)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e3a225eaa961..f17f26674b34 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -15,6 +15,7 @@ DIST btrfs-progs-0.20_rc1_p358.tar.gz 326938 SHA256 42dabee7c5cdcc353a0aa5d3244a
DIST btrfs-progs-0.20_rc1_p56.tar.gz 252929 SHA256 dd7746524465f47cdb740a5e46ebf2d1da4ed4631ddba5d4d550547828726d50 SHA512 bb47f2f5d30222fc6dd8b558de4d56c5f39d2833519af5fda595dbc67907133853dafb240baf65f6e0d344d7a80c0571e16db888b884e27ca1a75333b3556890 WHIRLPOOL ad5d59ad3ebc07489dadeaf769fdd6955812eb913ebee5b40419bf7607590048be34906b3b416539807223be06f0587d14d28278716d9c54ddbfe09427c6089c
DIST btrfs-progs-v3.12.tar.xz 261220 SHA256 097e63561c91c1fbfdf99e7a60ed55b51fa0f057b3875c08413e362c93938cdf SHA512 655e8d9ecf297281d07312bd19a6ab942f354a370147e0ca46a22e5bcd7485ed0d415247ba21162617a23b7f9def202cab3bb5dc23ccfa96496043b48dfda785 WHIRLPOOL b8e50c90c2a5f5bf9f5db7a1d7ea841b767fbb4ffdea52d913f7365965f6c58c612388f5b95a8a190826f9bcc6af783e09d4867a4b153040462b3ed353d56050
DIST btrfs-progs-v3.14.1.tar.xz 271480 SHA256 19e83ff22c0ee3c01d10369cf7c37f1927f1307389d371744000dfbb4344dbea SHA512 65c5ae6dc8302a8ca2b18c1b3d776462e9ac583e5e059574512056f92390fbf02c83e8c5ce5ae929e1ed46a84bf8a1768774c4b7283241fb1c0512ebd264cfd0 WHIRLPOOL 6381fe68af31ff56a2961c33639611e7363d53e1007fc3470c643e9919129d8e3ac2ffea42878003a261d70835a9c45d00c777899c3c1dd7d161184ba4ca369f
+DIST btrfs-progs-v3.14.2.tar.xz 275372 SHA256 70e1d0ca887bfa5062dc74cc5d4556c19adb08453fbfa57edae6802d9c917793 SHA512 02f0cf7581b41143707769e53debecfdd3f5a1dd717530c33d4a657b09feafd73bb43408516a58fb6d2754365803018673321c7c1898b81bb36194f05a0d8955 WHIRLPOOL 4561adf84b6570e165be04c8c7b014646f4be11b7f9840a5929103271cb7e121006b515645968f9a4b7cbaf8b0a407c2e74b82b91bd6688b7f58b06fedf70e95
DIST btrfs-progs-v3.14_pre20140414.tar.xz 271452 SHA256 8de4be03beabf6df9aa4a31114a77cfd68e0730b8a1f0dc371bdf570a837ac8a SHA512 556ee86eac6616aebc3d83d43a0603c30d82f482d40fba0cbdb125523d6395b16c19d9f5f2e04c844fae089d9323241e868e41fd89b9f557f7399fe7aff0d20c WHIRLPOOL b1f89253ab76f8a25509ca18217ebdbee9b1c4abf4f2091690aadc0a6fbb5a33f79054ff99b72f7c19419b6a099bb61109218c715294dd1370c9b150a8593bea
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
@@ -26,14 +27,15 @@ EBUILD btrfs-progs-3.12-r2.ebuild 1352 SHA256 aa54631b74410214e3e66c0f1e9bce461c
EBUILD btrfs-progs-3.12.ebuild 1245 SHA256 8f801a7d5de7b9fffc6f312618a5beeec25d4475d3671faf0a288f757bc22086 SHA512 44ea5d9cd347badfddcbc06298634338c0a492a15083e2b36320de905f38a1c912fd30c37878ff3e3b8753f822a15f2b61b008e5759ca4e5b97cc1935146e978 WHIRLPOOL 7a441dba6b985cd41202256f2fd07d16952244c451bc381fa69a0ab117f3c6587685af755d1ae4958f627715ce5075b736d391631e6b17fc5a055401ab0f7502
EBUILD btrfs-progs-3.14.1-r1.ebuild 1297 SHA256 19770b96213d3ef8cf7b54924698c183ee76b3e45d94f40412ef60e21c73bb2b SHA512 61c0a4b5c26698371c76c9ca502493687d190e28cc2c440eaca16c3e77229fee192645d854498bc3c4476988e3c2483c3e58f075de98e354e83197e63662aec7 WHIRLPOOL 733e4b07334c2476fe7e3ecadcafb08326bf3b918f6bbcc101eec3ec9f10b835eb70a8fcfa036a5121f8644d4d73c9ce6e041274846a1ce8ebce74b6edd535c0
EBUILD btrfs-progs-3.14.1.ebuild 1248 SHA256 a125f1df1373fc9f265408fdc00d78ad7696e2a8802002420e6da661e9664872 SHA512 bf1e23362d998c46cc32b34b01727eaa24de60f21768e80d047e31ae1605cc11b359ff4d8fbde42f75efaea92023329fba671da9e5d7b42205abc6ed3fd5f994 WHIRLPOOL 7537764f73d37209ea1ac4f12afc493b330e2cddb59bafacc80e522af67a7fb60bf3c5d5c09fd476f541705cd92c35ff7bb0ced01f62393fc2539ea5c0800f3e
+EBUILD btrfs-progs-3.14.2.ebuild 1315 SHA256 02f867c2b00bf406f4cccd296842f41acebcdb43667fe020e1bcb6f212f9bd19 SHA512 517f20e3e300f7d8cbe5ffb3d0b4da75d7a003be2b906929575da218aa9dd73d6f238942b5a9b7d881917f16f81bbd078be360c0f657cd104a9dab731159163f WHIRLPOOL 577f95ef2e8b2fc2efbc8d945f1e76ca93237415225b4121dd2e4495a95f05f1f626b3e499b7e6f90d4977c4602765f7b2768a36e6ad139a220141185ea42e72
EBUILD btrfs-progs-3.14_pre20140414.ebuild 1332 SHA256 828cd875d6efb2dbdd946e05c4bad0a117b4a9b6af99ed1edb18733485c0b72b SHA512 a699c4309ee30ad07157bdda5a1428f7ac48ad77f0a0c0438eecd6f95fe45bb41bf25918076577af88a2e7109f642edf4565727a441bcb39057064da396914c1 WHIRLPOOL 7b50e18d93c22a650b943e6e3320fd5e5423a648f769838570a800da62b8a6d6fe97397b2ab92c190ef1900ac2bf83fe9691027e322af06c80215995fea09652
-EBUILD btrfs-progs-9999.ebuild 1246 SHA256 6fbc3a7e4e084579171da19cafa4ff4e456bfd148bf4df86b239310b3daa201f SHA512 ed4e1b526bce032f5b9b9c7ab7ab7b3cf5601c2c53502e6f623c9a173629cc6163536dd8a660f3b22e601bcbecf514bb4923aa4499f5804a2fb31d6b9c43bc24 WHIRLPOOL 2f69a4e386a3174542c3caded0c7acf8dc65c313ad7c8d8f9b40f760a8b51188485c3d1fc62bc1f8f88228bca23c9f0d12c435aee7d5e41e79fdfb49692f2800
-MISC ChangeLog 12252 SHA256 6a8a80bdfdfaff845857f03d68a86cf8b2b64e7d0fbfbaac1c67e0ce74c612ee SHA512 78b5988e9e172fe9f7eb197bb95b5dff688a6c9397f5616552c19e6eba0a0509aae74737be4846613a6e3968baa8b36ab3e833fd9ff4000cf13361a2d0eaf914 WHIRLPOOL bf7a0037822f13d3656dcfafc4c2221f6fe958cbc81985a8352d16a0c0d6faf9860c2616b10ae4cf93524ca1af4f55a193df28ddcee1e7ecec6f98585c60d31f
+EBUILD btrfs-progs-9999.ebuild 1314 SHA256 7e01c3ffc619a97587012edb6058d3dd35aef0947a8e50d301296862773a89cc SHA512 82f9a59a04507c11f8a6894c62dc2029947b921f53ac5aac093ad8c5658de87be404f7f1e6dba588fdc800feabed743332b398b4a54ff5a35cbccb8a16d88070 WHIRLPOOL 312dae44110ac283b10ef61f0fd9a5620fca1028616249b10c5b8ba323f03885f97a88074e9a527b78389e15b9cc9709faacc017287b51f7dddba3e747dd1d39
+MISC ChangeLog 12408 SHA256 8dd72a4f52ecabe87a5c5bc1801f4715e4c98a595ba33ea8cdc99a804469907e SHA512 d4018b0e216f6298a01411d81035aed856abc21b7348378502c5094d59591d083589dfe09ce894326ebecb9fc81bd131ad7ec2cd784f901b3374244f70311041 WHIRLPOOL 1f8b3050b0bb6a7e539d808c6a48778e16972d94052c2dabe01540e42c0c50cde35202b91c31ec7222e1a82d34acbbafe8d38401bee94a71dbf028352bbe8cf7
MISC metadata.xml 432 SHA256 45049c27e84490ae5258d3beaa9c6defe80360aa7f03733da492fd38d026a5e0 SHA512 1dda7aa3a62062d6b42579efff9468c08fcca001b28e180c8257291332ac1874f749a19a4053daec072d7b878c13873557f05d82ad42428f105556c4cd304460 WHIRLPOOL 970b4a981f1afbe87ad4240fc2dd5ebfc4bb134a2e3c188519ecb6a87d230b196a902381de3e6346855e68c6e92f883c4d6b4aa01bcdb090e2de8f230e1cecff
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iF4EAREIAAYFAlN7augACgkQC77qH+pIQ6SHxQD+Om1ZTSB0pVXZGcS1PLk8R9iU
-LmIs9IiLwlpQPpv3augBAKM1EGnbvVkU3u7qqO4XZ3jxKAcZIZsjLBntUo18lCK6
-=yjpI
+iF4EAREIAAYFAlOjUJUACgkQC77qH+pIQ6RNJQD9EwFIgFVEB3wBsgWf4WMWScCp
+HaQb3xDvD87Pfrdr5dwA/jPsbruXzuFc62ceiauWYhkQJ0gsoY+qTEUUEuD7ZU8U
+=rzcn
-----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
new file mode 100644
index 000000000000..d80d44288b2a
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-3.14.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 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.14.2.ebuild,v 1.1 2014/06/19 21:05:24 floppym Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV=v${PV}
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/mason/${PN}/${PN}-${MY_PV}.tar.xz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ inherit git-2
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+ https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE=""
+
+RDEPEND="
+ dev-libs/lzo
+ sys-libs/zlib
+ sys-apps/acl
+ sys-fs/e2fsprogs
+"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+"
+
+src_prepare() {
+ epatch_user
+}
+
+src_compile() {
+ emake \
+ AR="$(tc-getAR)" \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ BUILD_VERBOSE=1
+}
+
+src_install() {
+ emake install \
+ DESTDIR="${D}" \
+ prefix=/usr \
+ bindir=/sbin \
+ libdir=/usr/$(get_libdir) \
+ mandir=/usr/share/man
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index b93e7adc6d9a..d5d714a7864f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.33 2014/04/07 18:45:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.34 2014/06/19 21:05:24 floppym Exp $
EAPI=5
@@ -26,13 +26,17 @@ LICENSE="GPL-2"
SLOT="0/${libbtrfs_soname}"
IUSE=""
-DEPEND="
+RDEPEND="
dev-libs/lzo
sys-libs/zlib
sys-apps/acl
sys-fs/e2fsprogs
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+"
src_prepare() {
epatch_user