From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E9AA13832E for ; Fri, 29 Jul 2016 15:32:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD41AE08BA; Fri, 29 Jul 2016 15:32:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3A64E0881 for ; Fri, 29 Jul 2016 15:32:04 +0000 (UTC) Received: from localhost (unknown [185.31.165.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bircoph) by smtp.gentoo.org (Postfix) with ESMTPSA id 99D89340C42 for ; Fri, 29 Jul 2016 15:32:02 +0000 (UTC) Date: Fri, 29 Jul 2016 18:31:58 +0300 From: Andrew Savchenko To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 Message-Id: <20160729183158.254fcaefbe2485ad8ad5e3d8@gentoo.org> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; i686-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA512"; boundary="Signature=_Fri__29_Jul_2016_18_31_58_+0300_Gn0cWO9cFPHXhayu" X-Archives-Salt: 8c928228-299c-4c69-8219-5787f2a5f97e X-Archives-Hash: 7dd9b2fa7a84a9b984fe1005d4fcd204 --Signature=_Fri__29_Jul_2016_18_31_58_+0300_Gn0cWO9cFPHXhayu Content-Type: multipart/mixed; boundary="Multipart=_Fri__29_Jul_2016_18_31_58_+0300_5YTfYHGzUV3Qs=to" --Multipart=_Fri__29_Jul_2016_18_31_58_+0300_5YTfYHGzUV3Qs=to Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, subversion eclass can't be used in EAPI 6 ebuilds, since it lacks eapply_user call in src_prepare(), otherwise it looks fine for EAPI 6 and works here fine. This patch adds eapply_user for EAPI 6 and later. Best regards, Andrew Savchenko --Multipart=_Fri__29_Jul_2016_18_31_58_+0300_5YTfYHGzUV3Qs=to Content-Type: text/x-diff; name="subversion.eclass.patch" Content-Disposition: attachment; filename="subversion.eclass.patch" Content-Transfer-Encoding: quoted-printable diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index c45c725..49040a4 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -434,6 +434,7 @@ subversion_src_unpack() { # Default src_prepare. Bootstrap. subversion_src_prepare() { subversion_bootstrap || die "${ESVN}: unknown problem occurred in subvers= ion_bootstrap." + [[ ${EAPI:-0} -ge 6 ]] && eapply_user } =20 # @FUNCTION: subversion_pkg_preinst --Multipart=_Fri__29_Jul_2016_18_31_58_+0300_5YTfYHGzUV3Qs=to-- --Signature=_Fri__29_Jul_2016_18_31_58_+0300_Gn0cWO9cFPHXhayu Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXm3buAAoJEPZTWjO6HuSN1L0QAJ22ZXppLYV/GCh3+T3AA4ts vu0rb0Z/fUURBE+r94h7U9xXkao8UZfqsGf2wOz50oXNTPDiTyeZ1lXbn4nkGyWE 0wTHXD/Jcsc6LWbA1W1MFFHEl3XRqnTlaU6Pkzki5Vr9tkak8rEWXKU2Nh2lE7Mv UD+lboOdEfnWm+N1t6TaAo/iVIdzadSo1QDP4dLSiekq/DH8GVDpG1tfgsIP+1Bz jQGUc4W1DjH04jROhxWgcHlSgrTIEr0tz7ydhjipWhAehEkAHDGfCTKYsBE0NuOj dZUusH+ExUyzY8cY5/3IiXPJyJvI3YSnFhfLwbzpLaCq9rMteQvckI/Jbys+kX6L yzwSVqDioH9PrLYzAoPMjn0E0215GQpQ1o3B/6ZZUeZ4KYstcFJyqTkhIx6htaLN exQqA0VpvK7NBY0w/JLb6xxpCVkAznkmHYkGTDkB17KgJi08Vgia+yBmjsQtL3BV zBupg8qpl7lP8H14piXv9NEKvrIFHUAZOIxkXveCXKkh18CxWhRjneszUuR1cbKP HAx9MDfYNzL6C6rCbJngdrZXSy961k1ARVnmfeAAGT0Ui140cKwGXFk15E6+Cwq7 SJu11tE4h3oY4dqzBvr9EL34Okzu0SGALkEVA6HoDtlW43BYDA44tqjg8QZyoMbz GmAI8DtbnUesiOaLbIDm =oEWS -----END PGP SIGNATURE----- --Signature=_Fri__29_Jul_2016_18_31_58_+0300_Gn0cWO9cFPHXhayu--