diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-08-08 13:07:26 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-08-08 13:07:26 +0000 |
| commit | 7f8434d64f7983eb3050831058c1e8a4b7c7bd6a (patch) | |
| tree | 2fbe6746b4b05ea58cc1e626b182bcc1e48aa5fb | |
| parent | dev-java/javacup: Resolve calling of svn (bug #556998) (diff) | |
| download | historical-7f8434d64f7983eb3050831058c1e8a4b7c7bd6a.tar.gz historical-7f8434d64f7983eb3050831058c1e8a4b7c7bd6a.tar.bz2 historical-7f8434d64f7983eb3050831058c1e8a4b7c7bd6a.zip | |
dev-java/javacup: Fix java-pkg_getjars approach (bug #556998 comment #5)
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600
| -rw-r--r-- | dev-java/javacup/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/javacup/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/javacup/javacup-0.11b_beta20150326.ebuild | 14 |
3 files changed, 17 insertions, 13 deletions
diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog index a7ecf9bdb126..f0350adbfa85 100644 --- a/dev-java/javacup/ChangeLog +++ b/dev-java/javacup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/javacup # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.38 2015/08/08 12:56:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.39 2015/08/08 13:07:19 sping Exp $ + + 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> + javacup-0.11b_beta20150326.ebuild: + Fix java-pkg_getjars approach (bug #556998 comment #5) 08 Aug 2015; Sebastian Pipping <sping@gentoo.org> javacup-0.11b_beta20150326.ebuild, diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index 83389d031a1a..178783ccb942 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -6,13 +6,13 @@ AUX javacup-0.11b_beta20150326-build-xml.patch 949 SHA256 9dd0eadd540a3bd202485f DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30 EBUILD javacup-0.11a_beta20060608.ebuild 1790 SHA256 9000d71da2734f3c8e864203dfca3ccc64633e36bd611464f091402f42f0f43d SHA512 e9c291c2201ceab9cdb752b51ef63bcd24d73720cbb7c430c733b7dfc4f24c005f98827237e6393eb28a17998ee1303b93f3d6544be489fb39ea1cf4ae2ad6cc WHIRLPOOL 5f9410130b549860576f43e5304644cddfd3eeaa40673696d03d38c29706219a3e6783e371e7e8c0380bbec8843b648b9f5ceaeaf2e3874d58398c4221ccca26 -EBUILD javacup-0.11b_beta20150326.ebuild 2137 SHA256 ca30eebaed35ad7ccd92661cb25af45aa13d433bf312188355fc724684b41625 SHA512 ae1acec9c9f4738a14dca4cbbe6cd74de806bcd1b2cb61af2b6ec14e07e918d384b23e9150b211e103dfcf7600a9ea6264d2095c9d7421ca53651f08e2ecb4c0 WHIRLPOOL c3137b8796f319d2c277c020e9a25dda969328e93646483284c131cbcb643b609d8de06cca103ec7bbf9626512c7c5808ccef913e0d1fe804d177c6a2db35a21 -MISC ChangeLog 5089 SHA256 a3b8cb30e3b0a4402206d84856cdab4b4358332ffebcb1f2e547c6631bd7ad73 SHA512 81e8c3d9dc050948d5a8f00ad66b6db117b1d0323de768116ecbf546cd148bd9fb9e33dd0cabf16043646057488261789b798ebcb597ee0df03722428435971a WHIRLPOOL 4d885dcd0e06f9134ec312a31b6ff0d7a9e195573cd7f9c3d8bade06715022f6c6288ce5fe9332b70f994062a316e5702354adc7d0ce16a9f7d7de2038dd7f2c +EBUILD javacup-0.11b_beta20150326.ebuild 2134 SHA256 2e52fecd3fc7cd6e2d74361d210ee3e4e7cbbd00559875cd51613e4c3db179c2 SHA512 e0ce8373ef8a9449b2cffed7932102a20b8674a40ea008e460eb192e2068163a7de7d8297d31387f475909b0ba219a537693b851e93d17c4d8228fa7dc43a234 WHIRLPOOL c880a1d255128259892e0b40cfbec7c21e3ad5fe439b15ebff096cc1e6931124c918c9a0553789eedb474df38aea2ad080ca9ea6c5bb1825399c44e0905a65d9 +MISC ChangeLog 5236 SHA256 9ba25801546b357dcac6ca1081939a2cef15db3105c529ae9aaf377aa3cac948 SHA512 a2421bf85cb31611dba1286ec0696fdf9061f167810eea07b77caad5de93cbb68cfefbc70d2a6bf7238f3cf7dde4183f346ec3671a201abdae85e3ce63c6759b WHIRLPOOL 4386dcc98e32bd50c1174912fda018f936394e9dabfc3f65afc92aa7f18048e3a5ef9e024885a6ea3481264a0c6c6076d2dd436f609fc0b3cf5a67d36610d6c2 MISC metadata.xml 370 SHA256 1b8730623493e18e34cdddf569793af693ade323d3c688916711a52c9cd61438 SHA512 251403631412484e52c902420e4c3b5e5f4014b5503587f851c9800963360688308bc4c21b8b4c47716c3f3d8dcf2e20054a4aee420fcde47a8bc83564cbcc85 WHIRLPOOL f251297ba390d5e508e68e714d3f61984d1cc0d04c7118c56311b8c5a0d7a1cf15c31e0151ad9a5f83a7074d5e10c8777d383869e65dacbfaa78d0c9b541876f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlXF/HcACgkQsAvGakAaFgDC5ACfUoOKzx9L5nuDuZPDnwoq0uY0 -GW0AoMAFVAqQkUolEjKml55O5MHm9Dal -=Gj24 +iEYEAREIAAYFAlXF/wgACgkQsAvGakAaFgAnZQCZASyXZDy1YYjNbrRGajzasv+Y +4AkAoJGj8WMX3V//JRZOM+c8EfBWh66H +=MCBx -----END PGP SIGNATURE----- diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild index 82dcbafb52dc..d7168e5729f1 100644 --- a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild +++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.3 2015/08/08 12:56:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11b_beta20150326.ebuild,v 1.4 2015/08/08 13:07:19 sping Exp $ EAPI="5" @@ -25,13 +25,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebs IUSE="userland_BSD system-jflex" # find for bug #214664 -CDEPEND=">=dev-java/ant-core-1.7.0:0" DEPEND=">=virtual/jdk-1.5 system-jflex? ( dev-java/jflex:0 ) !userland_BSD? ( >=sys-apps/findutils-4.4 ) - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" + >=dev-java/ant-core-1.7.0:0" +RDEPEND=">=virtual/jre-1.5" S="${WORKDIR}" @@ -50,13 +48,15 @@ src_prepare() { } src_compile() { - eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" + local classpath="$(java-pkg_getjars --build-only ant-core)" + + eant -Dgentoo.classpath="${classpath}" rm bin/java-cup-11.jar || die cp dist/java-cup-11b.jar bin/java-cup-11.jar || die eant clean einfo "Recompiling with newly generated javacup" - eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" + eant -Dgentoo.classpath="${classpath}" use doc && javadoc -sourcepath src/ java_cup -d javadoc } |