1 |
commit: 9989ce97dabcf6ef399581493ea145409012ccdf |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 24 22:04:38 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 24 22:06:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9989ce97 |
7 |
|
8 |
dev-java/ant-core-1.{9.13,10.5}-r1: fixes |
9 |
|
10 |
1) fixed bug #675992 |
11 |
2) fixed 'package not found' error on systems wnere ant-core |
12 |
is not installed yet |
13 |
|
14 |
Closes: https://bugs.gentoo.org/675992 |
15 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
16 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
17 |
|
18 |
dev-java/ant-core/Manifest | 4 ++-- |
19 |
.../ant-core/{ant-core-1.10.5.ebuild => ant-core-1.10.5-r1.ebuild} | 4 +++- |
20 |
.../ant-core/{ant-core-1.9.13.ebuild => ant-core-1.9.13-r1.ebuild} | 4 +++- |
21 |
3 files changed, 8 insertions(+), 4 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest |
24 |
index 213bb1a3086..b5117327cb0 100644 |
25 |
--- a/dev-java/ant-core/Manifest |
26 |
+++ b/dev-java/ant-core/Manifest |
27 |
@@ -1,5 +1,5 @@ |
28 |
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d |
29 |
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898 |
30 |
+DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12 |
31 |
+DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54 |
32 |
DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f |
33 |
DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e |
34 |
DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810 |
35 |
|
36 |
diff --git a/dev-java/ant-core/ant-core-1.10.5.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild |
37 |
similarity index 95% |
38 |
rename from dev-java/ant-core/ant-core-1.10.5.ebuild |
39 |
rename to dev-java/ant-core/ant-core-1.10.5-r1.ebuild |
40 |
index 55b6cd4246f..7ddd5d55ba2 100644 |
41 |
--- a/dev-java/ant-core/ant-core-1.10.5.ebuild |
42 |
+++ b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild |
43 |
@@ -17,7 +17,7 @@ MY_P="apache-ant-${PV}" |
44 |
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" |
45 |
HOMEPAGE="https://ant.apache.org/" |
46 |
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 |
47 |
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2" |
48 |
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" |
49 |
|
50 |
LICENSE="Apache-2.0" |
51 |
SLOT="0" |
52 |
@@ -51,6 +51,8 @@ src_prepare() { |
53 |
|
54 |
src_compile() { |
55 |
export ANT_HOME="" |
56 |
+ # Avoid error message that package ant-core was not found |
57 |
+ export ANT_TASKS="none" |
58 |
|
59 |
local bsyscp |
60 |
|
61 |
|
62 |
diff --git a/dev-java/ant-core/ant-core-1.9.13.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild |
63 |
similarity index 95% |
64 |
rename from dev-java/ant-core/ant-core-1.9.13.ebuild |
65 |
rename to dev-java/ant-core/ant-core-1.9.13-r1.ebuild |
66 |
index 55b6cd4246f..7ddd5d55ba2 100644 |
67 |
--- a/dev-java/ant-core/ant-core-1.9.13.ebuild |
68 |
+++ b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild |
69 |
@@ -17,7 +17,7 @@ MY_P="apache-ant-${PV}" |
70 |
DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" |
71 |
HOMEPAGE="https://ant.apache.org/" |
72 |
SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 |
73 |
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2" |
74 |
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" |
75 |
|
76 |
LICENSE="Apache-2.0" |
77 |
SLOT="0" |
78 |
@@ -51,6 +51,8 @@ src_prepare() { |
79 |
|
80 |
src_compile() { |
81 |
export ANT_HOME="" |
82 |
+ # Avoid error message that package ant-core was not found |
83 |
+ export ANT_TASKS="none" |
84 |
|
85 |
local bsyscp |