Restructure patching, #398139

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 5cf56c9c9c59491ab972b2ba176de8e7877c5cd7..64603ee372fd0beb33827448718ad696108fc1fd 100644 (file)
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.4 2012/01/05 16:17:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.5 2012/01/08 13:31:17 jlec Exp $
+
+*aufs3-3_p20111205-r1 (08 Jan 2012)
+
+  08 Jan 2012; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20111205.ebuild,
+  +aufs3-3_p20111205-r1.ebuild:
+  Restructure patching, #398139
 
 *aufs3-3_p20111205 (05 Jan 2012)
 

diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 3c1f6b83f157e6dbf96165e583bc5adc4e94d2da..70d9dcc819c2664f1b4cdb4b83d407351461028a 100644 (file)
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -17,13 +17,13 @@ DIST aufs3-3_p20111205.tar.xz 478084 RMD160 33a545ec241a855b5e1d675334da6cc77417
 EBUILD aufs3-3_p20110815.ebuild 3924 RMD160 3b62654d7c66a13a9b3c2a8ed7b0ab57d9d6699d SHA1 d1293e727a590619a42706cf6d63975681f14116 SHA256 1b83d7bc7f5a2779ddb0de7bcd19c9daae64278af9106cb41949be4c5bab51c0
 EBUILD aufs3-3_p20111031.ebuild 4064 RMD160 ae385f7895de0b58d892e5a84669c8993a999417 SHA1 b871613ac5c22a410979edaef2d19c10ceed2941 SHA256 56405349d2dc3dad6eb4028d6048ff3e5b6b96c45fe7b7b5a68c2c474369b43f
 EBUILD aufs3-3_p20111114.ebuild 4023 RMD160 ce04630f37c94af8b8bcd0311e497f9d1725b722 SHA1 6a197abdb447826b471262ba0b66fd3a8ece3a4d SHA256 d74a55ddb45e996ef1c853487e925d5d1e350a8b1b9cc51c04ec36bd6b0fabae
-EBUILD aufs3-3_p20111205.ebuild 4099 RMD160 693e8612130c80ba51b13f8327d38110e8e5847a SHA1 009e0606ac132077bc7cc11c1e39250d73870515 SHA256 e2b1bf0f605b1f8a466d21af4ec5ed42c5af7c9a76dcebbdc8c540cd0113de01
-MISC ChangeLog 1998 RMD160 9ed678439da4d326102fd7868c9c4a9eac1b3351 SHA1 bfccfd1020d09b5e1b6c8c2469890e5df2165a6d SHA256 9533bc63ffbfef96ec2dc8e15d87c4e4f0dc051d259d1970fb577cbf4179d661
+EBUILD aufs3-3_p20111205-r1.ebuild 4613 RMD160 0cbca3ae3b89b66f57e97597ffb050e72d814db9 SHA1 396cd1841bd8b833ef078391469f5bb4836bac3c SHA256 350e90ce6438697d39c462c660694bff82891553885be3db8446fa5c88b57c20
+MISC ChangeLog 2174 RMD160 543d2dbdf12842bc0f9629d7c4831b5e63f79a0d SHA1 ee6b2c11fd226b6a4c5520e3ac7aaa73c3fbc998 SHA256 24a77595524e44a27134c95fd82f8006d84f37fff4893be6404551fd1cbcce4f
 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8FzRwACgkQgAnW8HDreRa0CgCgtU0GrFtjlbRUXlaOyrw1nKDG
-SQsAoKuPgXd/xWlwDjgvIWONM7Wty23X
-=fce7
+iEYEAREKAAYFAk8JmrIACgkQgAnW8HDreRaa4QCfaoOuQZFXIeRMWLlD9PkcDIry
+krsAn0B4mlrI9M2/smBiGOaVz4hHXs0p
+=aMMg
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/aufs3/aufs3-3_p20111205.ebuild b/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
similarity index 72%
rename from sys-fs/aufs3/aufs3-3_p20111205.ebuild
rename to sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
index 1776150a8ef0ca1a173b1fbad1cd12985b0af827..e39efccbacf578df98766c3b1edc5fab50d2be58 100644 (file)
--- a/sys-fs/aufs3/aufs3-3_p20111205.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111205.ebuild,v 1.1 2012/01/05 16:17:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild,v 1.1 2012/01/08 13:31:17 jlec Exp $
 
 EAPI=4
 
 inherit linux-mod multilib toolchain-funcs
 
 AUFS_VERSION="${PV%%_p*}"
-PATCH_VER=x-rcN
+PATCH_MAX_VER="1"
+UTIL_MAX_VER="0"
 
 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -43,24 +44,37 @@ pkg_setup() {
 
        linux-mod_pkg_setup
 
-       [[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR}
+       if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+               PATCH_BRANCH="x-rcN"
+       else
+               PATCH_BRANCH="${KV_MINOR}"
+       fi
+
+       if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
+               UTIL_BRANCH="x-rcN"
+       elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
+               UTIL_BRANCH="${UTIL_MAX_VER}"
+       else
+               UTIL_BRANCH="${KV_MINOR}"
+       fi
 
-       if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \
-               patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null ); then
+       if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
+               patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.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} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null
-                       patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null
-                       epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.patch
-                       epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.patch
+                       patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
+                       patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
+                       epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
+                       [[ ${KV_MINOR} -gt ${PATCH_MAX_VER} ]] && \
+                               epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.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 ${FILESDIR}/${PN}-base-${PATCH_VER}.patch and"
-                       eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.patch by hand"
+                       eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
+                       eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
                        die "missing kernel patch, please apply it first"
                fi
        fi
@@ -75,9 +89,11 @@ set_config() {
 }
 
 src_prepare() {
-       local branch=origin/${PN}.${PATCH_VER}
+       local module_branch=origin/${PN}.${PATCH_BRANCH}
+       local util_branch=origin/${PN}.${UTIL_BRANCH}
 
-       git checkout -q -b local-gentoo $branch || die
+       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
@@ -98,8 +114,9 @@ src_prepare() {
        sed -i "s:__user::g" include/linux/aufs_type.h || die
 
        cd "${WORKDIR}"/${PN/3}-util
-#      PATCH_VER=0
-       git checkout -b local-gentoo origin/${PN}.${PATCH_VER}
+
+       einfo "Using for utils building branch ${util_branch}"
+       git checkout -b local-gentoo ${util_branch} || die
        sed -i "/LDFLAGS += -static -s/d" Makefile || die
        sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
 }