commit:     9e0d2d114414206d881db820e17d8839a20d0dd5
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 02:55:49 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 02:57:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0d2d11

dev-java/gwt: Patch (by me) to not run git

Thanks to toralf for reporting.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=705216
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-java/gwt/files/gwt-2.8.2-build-system.patch | 13 +++++++++++++
 dev-java/gwt/gwt-2.8.2.ebuild                   |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/dev-java/gwt/files/gwt-2.8.2-build-system.patch 
b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
new file mode 100644
index 00000000000..82340416e7a
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
@@ -0,0 +1,13 @@
+--- gwt-2.8.2-orig/common.ant.xml      2017-10-18 22:39:31.000000000 +1100
++++ gwt-2.8.2/common.ant.xml   2020-01-13 13:23:58.653719957 +1100
+@@ -277,9 +277,7 @@
+ 
+   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a 
workspace">
+     <sequential>
+-      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
+-        <arg line="rev-parse --short HEAD"/>
+-      </exec>
++      <property name="gwt.gitrev" 
value="faff18e7a1f065e3a4ac4ef32ab5cce394557070"/>
+       <!-- Generally, filtering requires a sentinel file so that changes to 
git rev will
+          be noticed as invalidating the previously-generated filter output.  
This property
+          names where such a sentinel lives; it is tested with <available/> 
and created

diff --git a/dev-java/gwt/gwt-2.8.2.ebuild b/dev-java/gwt/gwt-2.8.2.ebuild
index 3cc6b03863d..0a0f40fa707 100644
--- a/dev-java/gwt/gwt-2.8.2.ebuild
+++ b/dev-java/gwt/gwt-2.8.2.ebuild
@@ -51,6 +51,11 @@ EANT_GENTOO_CLASSPATH="
                validation-api-1.0
 "
 
+src_prepare() {
+       eapply "${FILESDIR}"/${P}-build-system.patch
+       java-pkg-2_src_prepare
+}
+
 src_compile() {
        GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
                GWT_VERSION="${PV}" \

Reply via email to