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 CFDEF138334 for ; Mon, 21 Jan 2019 08:51:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83AE5E0A60; Mon, 21 Jan 2019 08:51:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36392E0A52 for ; Mon, 21 Jan 2019 08:51:03 +0000 (UTC) Received: from [10.12.14.180] (wholesomeserver.media.mit.edu [18.85.22.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: fordfrog@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 765EF335CFE for ; Mon, 21 Jan 2019 08:51:01 +0000 (UTC) Subject: Re: [gentoo-dev] ant-tasks.eclass patch proposal From: =?UTF-8?Q?Miroslav_=c5=a0ulc?= To: gentoo-dev@lists.gentoo.org References: <327c068f-dfc5-7d7a-3a86-9d886ea076c6@gentoo.org> Message-ID: Date: Mon, 21 Jan 2019 09:50:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 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 X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=iso-8859-2; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Archives-Salt: 781ef458-4532-4757-b050-674cdb848e84 X-Archives-Hash: c4261ea18732ba9e63d7ac9a53cbc9ad hi, i just committed the changes to the eclass: commit f14e39de0e2eaa3d3011918e9febd89bfe98f7ee (HEAD -> master, origin/master, origin/HEAD) Author: Miroslav Šulc Date:   Mon Jan 21 09:45:29 2019 +0100     ant-tasks.eclass: cleanup and improvement     1) removed obsolete code     2) increased default jdk/jre version to the lowest available version 1.8     3) added support for patching build.xml along with the original build.xml replacement     Signed-off-by: Miroslav Šulc i did one minor change that was not in the patch. after chat with chewi i increased default jdk/jre to 1.8 instead of 1.6. this change does not affect any ebuild as all ebuilds have these values defined. regards miroslav Dne 18. 01. 19 v 18:25 Miroslav Šulc napsal(a): > thank you for the comments. i added eapi check at the beginning > supporting eapi 5|6|7 (5 is needed for current ebuilds). i also > changed epatch to eapply and disabled patching build.xml for eapi5 > just to make the code more robust, build.xml patching is not used in > current ebuilds and those will be soon gone. once they are gone, this > check and support for eapi5 can both be removed. attached is the > updated patch. > > miroslav > > Dne 18. 01. 19 v 17:23 Brian Evans napsal(a): >> On 1/18/2019 11:11 AM, Miroslav Šulc wrote: >>> @@ -130,7 +112,11 @@ ant-tasks_src_unpack() { >>>                   cd "${S}" >>>                     # replace build.xml with our modified for split >>> building >>> -                mv -f "${WORKDIR}"/build.xml . >>> +                if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then >>> +                    epatch "${WORKDIR}"/${PV}-build.patch >> Adding epatch without 'inherit epatch'?  Sounds like gambling on faith. >> Also limits to EAPI=6. >> >> Brian >> >>> +                else >>> +                    mv -f "${WORKDIR}"/build.xml . >>> +                fi >>>                     cd lib >>>                   # remove bundled xerces