Bump to latest aufs3 release

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

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 5513c89e6a11481dffbf0c33487f33952e036b2e..e4f4f2491fe0170264bd6d6442517a0254f8b9a1 100644 (file)
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.120 2015/02/17 07:01:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.121 2015/02/23 08:12:03 jlec Exp $
+
+*aufs3-3_p20150223 (23 Feb 2015)
+
+  23 Feb 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150223.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20150216 (17 Feb 2015)
 

diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 8dc2474975d769a78823575d97de6e03c284be4a..bb77ea620cd8208077ef07aa96b33b876460d103 100644 (file)
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -20,6 +20,7 @@ DIST aufs3-standalone-3_p20150106.tar.xz 2630436 SHA256 47bcdb0b9eab31115ff30687
 DIST aufs3-standalone-3_p20150119.tar.xz 2664080 SHA256 8758d15b49487e5339c61c4c0b0babd06fc76f66b821f4998964f3d9d39a71c7 SHA512 d10c978aa013adaa9ad70da83cd6d3e3f11c85e2857ebbf74d647cdf031fedced0befc6870e669ccf9248734b11fbdd5da7c840f078c19ad431cec54382c6546 WHIRLPOOL d937909fd47fff0dab6c25b18e21ec8d22e199003853d21fcdfb7cefae6f6044e28880d408acfc05289b1657df2e93e1346f548ac072ec67649ff40242bc6f30
 DIST aufs3-standalone-3_p20150126.tar.xz 2726476 SHA256 8799abb92c27f7ba54f1119d16e50f4f6afd134e8e8510954f09ef96aaff3fb0 SHA512 238364ce5ad513a608d2aa9e22a1da69f6e9c7322e9450818366eebd48f998c2820dd30ab16c010da40de2ae992aef5d90d2883510b3798fcd0db882804751c2 WHIRLPOOL 113bc8316ab3eba8224450bc9b668b29b714104e115e67f286352658b4e998840889f0d99b396a43981d3d890bbeac97b100bf8a1878ddce4c83e9a5b7d6896e
 DIST aufs3-standalone-3_p20150216.tar.xz 2745548 SHA256 8687fde9e6670f7920767c2fb6450db44a8ef32fd3830d9c878b8695800ddd9e SHA512 116e1df3eed63f5d536f2b824975b9d3e0aa86b9b999789917bd71932b322bcbd5d98b19642793f6af84e5e81d65a3ae0d2c80376c386b8f1a6b349bdf607bb4 WHIRLPOOL bd57f126897b58d56e28e8a10a6bb8c932ff0fca2ac3fb8527fb685283fd14e876d372691ee8f2233aa3cba55b7c4cf14f996ccfb1e4b5c1623fa172ece7509b
+DIST aufs3-standalone-3_p20150223.tar.xz 2767600 SHA256 9bb4b5ff884a907876bc4236b2a4da9e8ec08b0395a24e0283dd5245a64e1068 SHA512 111bafeed3684168e4373c1655e14a91d76cfcfa6f5098788d3a12ec9a8b610709756d71928d5cfec43b3c93261aa28b2f34315809cf9ec4e3248e757b97ff09 WHIRLPOOL 356a1fdc98ace74c223c19c77b7acf13d1be12c0b46435878e2c3791891b89597660f64d0ad61c2e261bce90c1b641fd087ed079064ee13bf41b2c0c807a0f9b
 EBUILD aufs3-3_p20140811.ebuild 5289 SHA256 90423edfc0dc22d1142b3cf29cff610ed0a9a8101a200a9333195e6e75f41d38 SHA512 d2fd015adee71aeb5cc5937b2f3dbfd682525d5c127ae23aa7c3531276420f675f08460bc3ce36e5fc49acc1ce38bb97d5f9dd2a0833770376ff0383653d65e3 WHIRLPOOL b7d8a2c3df0549725ba2fe8bc4d3a009101b239de8a3ff7553bba36097d74487ee1c7737eabf8b593b419a1b284ffc1e5aaaa1e7d2391f5df9bc5254d51bdd49
 EBUILD aufs3-3_p20140818.ebuild 5289 SHA256 1ec07186d0b8c186fcfeec3af7ba6380a23c42ed9a9b92c2b83135f4b3e4e493 SHA512 8668411990b4e184ead86d4e2d670243a52885e9cbc4434b1129d6c6a172ccfdc93276277e320f366cb8fc41c461229e9c68d5598d94b6f756c51f70879efe1c WHIRLPOOL 1948e50544ebdf819120ca7480cf3f584fb3d98b4f0550de994682a4cccee47daa4d84b9589df06c396ada53f58d098cb132c3d4c14005f1f176c83492a3007a
 EBUILD aufs3-3_p20140908.ebuild 5289 SHA256 7f710603aa95a8fe1e5ee9927db6107b0212e292c10d7bbf3da2cdf2e6d60f87 SHA512 4e44d470bfcf4e04764ff640bcb5ca61196ae796e1ba41a8884cdd3a5d7484b1e79c5c93f56264bbf72f5099048d4bb7f35e787c4e185da57d7149575fc4372b WHIRLPOOL ffd516d99b7acffd6b308a3cea3ced65545780515e86a89f7b80991001a05ffd059b5320204b559ab4099e419a9ffcfd262b31b87d369e7b798e9716a45bb96a
@@ -35,24 +36,25 @@ EBUILD aufs3-3_p20150106.ebuild 5323 SHA256 069da636a0ef51a295bbd5e3da78ce24be3e
 EBUILD aufs3-3_p20150119.ebuild 5323 SHA256 5e5ac54da78108d65831b4065a93b14f66666a8caeced300a35716e66a89acf8 SHA512 2ae993985ce722ee5a885bc5222cb295eb177251d389983de36085ec3503703363e723c3f315a3d07a51e39d36a2afc717f27a046cda23fd8e160f6a8dedc955 WHIRLPOOL ecad072efb457fa02acc2e3eb7ffc4ed5c8e7f57c5188c5c55fef7572182eeb96d2d71ca8b377cda6420885799138c167e7a4aeb03be9cdb9cd536fd26775750
 EBUILD aufs3-3_p20150126.ebuild 5323 SHA256 b654d605967dbef9991fee2b74166fc56ff166b11bad3894d5d4e5d7163c3d4b SHA512 d4d9e3a2bbd077daec384a8d498098e028b903fb426eaba615e1b40ed94ef70676f0d1da2af09d47768fde3e77599f082f571ce9e6db54465dcf319a74eb2f20 WHIRLPOOL 73a77dd9f482bcbc90a0d53943958e12bbb740ad49ea8c9776b391ef7f0aa5770f12f44b3b5cff9cba6de7283e040ed7c56d9832237f5e82dec7d529676f8ce1
 EBUILD aufs3-3_p20150216.ebuild 5323 SHA256 7008442ad8f72f8735644925169e840398ce2c890c7a2a0059fa3c9727dfd6e9 SHA512 f247f2a5a80b733c9dec662d7569c6d34d3153d82e12861ca9f959312acad31376c65dc2730a14629ad8d436b9f62731f3c4ef5ab83341a22463561fbd17f760 WHIRLPOOL 5ac5a5b26fce48ea0fad1e59d1bc72c3513944cf4297680812cc51db703765b80842e3955900338eb647b808fa21409d26a707cd0ff72d331ecd6f698e27ad1d
-MISC ChangeLog 27833 SHA256 4846a1206a5f6589db0a75972814cbdaca8f059d080f89f46ad0535dcde4bf1f SHA512 b209972b3e6a930b86199f6e7f73f339322852831b95baae91e17fc62f609c407f1c269b0ae8796732b676867f1e488716227bb546833508b27856b26b8269c0 WHIRLPOOL ae9be3ba60c880c8dd62c11af01ce9e503fae576a7f3553d6f3ad19dcc29e1965cc205a7f48eb86d449609bc2be4b06ceefd2e88b4c1acdd7b086ec03e04aba8
+EBUILD aufs3-3_p20150223.ebuild 5323 SHA256 36405dc483520fb3534bc92f0763cee9c4f081fb0e2924adf8dc37e0ea228b4a SHA512 a083f23427cf8490ff8970d4339729bee9f13143e7de862b3ac007a4a61468c8991144d1fd615b5020c6c7ff98ee4c7b31b2487fe4d9fc6d1eff7757fa381c16 WHIRLPOOL a7e607638627134724a2874f4752e70efde0eb808956d6a05e52e958c76da6501549affd8c232db8598182aa6724433a04e21e6ce2c63d7d2266c48dd929f5c7
+MISC ChangeLog 27973 SHA256 e00fc67fcf07f14ca00f7e65e32389375db1950eab50195658522294e3d390e1 SHA512 f08f5f76568519dc250dafb67f8755535ad1edc36599794efeed4d7f64a54fea65995d34464e6577c296c50571c728cec2a22d0eebdd4ca9ea8318e2a0e60d1d WHIRLPOOL c8ced9faf8b6c6f8392a80e7832f84e7fea7ea40bced52cb903568f69c15672bab10f75895dce0efb8381ce6a613e4b3299b3849b8822fe4a17d9742d42eacfd
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU4uc1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU6uDRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9RwP/33sQDsWSWDpIbfZeYzb28XU
-MWPOUzeRTUCGiIevcUzxaO4tCae7rFya7/XtzzmGgM0oelCIHfMeaO+PMBq7kkJf
-jhb4NpnsGG2dAwDmSXTHpYoc8M3Gt8Sc0zCoXcQcvBhxJ83FL8vyZC25f7MqUtUK
-RwumHRpX8lVQ1fBdKzMOmFwKQvtoZOm/CDwW+9Y6e1zd67J/krBibeh73s+8ncKE
-/U9pLjnZFidNIZi7fwo9ep1JECJRVZouyqVs7/0528yy9u7Q/5XK2yIWTSR5LOl1
-nWvwmkFiB76JbEP+vz9lyBv7NWeNXnD4ihE5CvmdzPrPvusKws1atYbXQljpyEbw
-HSps4AAap7rmCQDchBAVxmFqUjpGfxmlbTqFXdjH0s71SqrTb9/9ECzPnx4AevRa
-GLPMwPp20ZdQLEKyYLrlvuBI/XLpaqTWo3TSsDGbKw9cl4tIWgCfoDB0iJoOSKZ2
-AZpNl1hq0tYAqkF7Q/zyxvwOq+loFcRSu7M166a6Fn6FFvXvxQuYyTWv0zh7t1a8
-X0v1ywGBGMQOcEKGZbzrWIO2Yvp32WZhldJpWCLVVpWOLnNYUio60YxXscxFhzXt
-9d8vUhaJBHPHWb+PhTUNzcV6bsdnd9avQTIA5Qtk81xyaVINuo/vREFNVVqToSiN
-IzcLTDxU4bmoJGNVEIlH
-=A2CM
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxAkQAJwntxNzfbc65EZGj/Sjd9lC
+DtRAprIReo/fZd28LDh83ANkg8DN2b4mA7zGI4cqQUfwqdNZgQfkysgMY/JAnU08
+GEBeKs80WqH5VPvDTfz1tqDnZWzzuh/9kSEOZDulL+IHcz4fK9igqneljlwuZQis
+po5FxaIaicFQXvoF2KXU3u75GlRL6o5/mo8VLPvljvJkIR+ywv5JfJeKmCAfqP5k
+GnoPUFfMIrS77dYuFBntM4VADV0DZUqGRYcDZKW+ue3q8oQ6y0vyynz+GyqJIUmD
+f2pLPuA/WjicrM49N/1wVcS0bU8OYCKgik72DYYQUa8f3je5QfA4mRjV2QoEG8xJ
+4FnM9OP5gqMbRPXHMhuHD6WTWh+WjG55Ulc8kVa7HsBBbbPmQpSaDVP21geo6alz
+KTE6KfpFBt2giV1tsLZ7y/k90vHHv6de37EITzwV8VzIX8iha8QxX2agP+/k8glo
+DjX3QahhCkJqStMr73UyLJ6bXqtP0b+fCu22llVhCF2mrfesGE2Zx1ppVXglQkNj
+eC8rdD8ewed6z1CmUy1lYaUfBWRkJzs6jNSfXKZvnlnlog0pAZGdNCf0oOcaq2vT
+kLoq+9OKeY2/yzt0bl6LW4PG2j00BAOiSwOVPJTYcULSJVdfoP1lIE9GQb//hAsm
+MP9vZlk+PzFAYTNV0wmF
+=tlWz
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/aufs3/aufs3-3_p20150223.ebuild b/sys-fs/aufs3/aufs3-3_p20150223.ebuild
new file mode 100644 (file)
index 0000000..b11752a
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150223.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20150223.ebuild,v 1.1 2015/02/23 08:12:03 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=18
+# highest supported version
+KERN_MAX_VER=19
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+       dev-util/patchutils
+       dev-vcs/git"
+RDEPEND="
+       sys-fs/aufs-util
+       !sys-fs/aufs
+       !sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+README_GENTOO_SUFFIX="-r1"
+
+pkg_setup() {
+       CONFIG_CHECK+=" !AUFS_FS"
+       use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+       use nfs && CONFIG_CHECK+=" EXPORTFS"
+       use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+       use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+       use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+       # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+       [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+       get_version
+       kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+       kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+       linux-mod_pkg_setup
+
+       if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+               PATCH_BRANCH="x-rcN"
+       elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+               PATCH_BRANCH="${KV_MINOR}".12+
+       elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+               PATCH_BRANCH="${KV_MINOR}".1+
+       else
+               PATCH_BRANCH="${KV_MINOR}"
+       fi
+
+       case ${KV_EXTRA} in
+                       "")
+                               elog "It seems you are using vanilla-sources with aufs3"
+                               elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+                               elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+                       ;;
+                       "-gentoo")
+                               elog "It seems you are using gentoo-sources with aufs3"
+                               elog "Please use sys-kernel/aufs-sources"
+                               elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+                       ;;
+       esac
+
+       pushd "${T}" &> /dev/null
+       unpack ${A}
+       cd ${PN}-standalone || die
+       local module_branch=origin/${PN}.${PATCH_BRANCH}
+       einfo "Using ${module_branch} as patch source"
+       git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+       combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+       combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+       if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+               if use kernel-patch; then
+                       cd ${KV_DIR}
+                       ewarn "Patching your kernel..."
+                       patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+                       epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+                       ewarn "You need to compile your kernel with the applied patch"
+                       ewarn "to be able to load and use the aufs kernel module"
+               else
+                       eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+                       eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+                       eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+                       die "missing kernel patch, please apply it first"
+               fi
+       fi
+       popd &> /dev/null
+       export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+       for option in $*; do
+               grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+               sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+       done
+}
+
+src_prepare() {
+       local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+       einfo "Using for module creation branch ${module_branch}"
+       git checkout -q -b local-gentoo ${module_branch} || die
+
+       # All config options to off
+       sed "s:= y:=:g" -i config.mk || die
+
+       set_config RDU BRANCH_MAX_127 SBILIST
+
+       use debug && set_config DEBUG
+       use fuse && set_config BR_FUSE POLL
+       use hfs && set_config BR_HFSPLUS
+       use inotify && set_config HNOTIFY HFSNOTIFY
+       use nfs && set_config EXPORT
+       use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+       use ramfs && set_config BR_RAMFS
+
+       if use pax_kernel; then
+               if kernel_is ge 3 11; then
+                       epatch "${FILESDIR}"/pax-3.11.patch
+               else
+                       epatch "${FILESDIR}"/pax-3.patch
+               fi
+       fi
+
+       sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+       local ARCH=x86
+
+       emake \
+               CC=$(tc-getCC) \
+               LD=$(tc-getLD) \
+               LDFLAGS="$(raw-ldflags)" \
+               ARCH=$(tc-arch-kernel) \
+               CONFIG_AUFS_FS=m \
+               KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+       linux-mod_src_install
+
+       insinto /usr/share/doc/${PF}
+
+       use doc && doins -r Documentation
+
+       use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+       dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+       readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+       readme.gentoo_pkg_postinst
+       linux-mod_pkg_postinst
+}