Version bump to 1.6 courtesy of Martin Walch. Fix bug 532006.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index 795d431db97dd0b2a9bac947b81a677156a1c3da..b3a071a94b8c673a98de3759b9f70ab50166e5dd 100644 (file)
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jflex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.15 2014/04/30 15:27:11 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.16 2015/01/18 21:16:24 monsieurp Exp $
+
+*jflex-1.6.0 (18 Jan 2015)
+
+  18 Jan 2015; Patrice Clement <monsieurp@gentoo.org> +jflex-1.6.0.ebuild:
+  Version bump to 1.6 courtesy of Martin Walch. Fix bug 532006.
 
   30 Apr 2014; Tom Wijsman <TomWij@gentoo.org> jflex-1.5.1.ebuild:
   Fix up dodoc line; reported in bug #498874 by James Cloos, patch provided by

diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 36209728af237cb98410c0d1e28dfaf1cbeca6e6..781fcf885765ba159b16d058b4ec63a390d151a0 100644 (file)
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX jflex-1.4.1-build.xml.patch 1216 SHA256 2b57811076497845bae61a0ea46026e2aaa92da14014a6ee57b2931202a3b9b9 SHA512 8071b70812556192d50766901f64258657c462ac66108ecfbb77afb136a5e189923e538f7dda61b23d7b76ed16bff3a4a3481635bdb3c85f9cf26786526a10c5 WHIRLPOOL 8c2526ed591e110834c8386fff2b50460d98c3e38f4c3f170588bf7b8f8b3eba89591cd4bf3014a73d3a5687f0bc32730d7b20f38ca992e1abcb4d553a1dbb03
 AUX jflex-1.5.0-build.xml 12957 SHA256 881595d2aa93f4fe83fda29686aa03b64979b2e5323619c767c04bcab01ad345 SHA512 9ef2510ddcaad7b00bb022ce6fe0c6944783ad30a6506cd7f6c97d604595f6428f4cc616d069ad9c92ad0e06f817be5aa09cc868e521e2311f8c88fe79cd070f WHIRLPOOL 6266778843bfbf1bebd8f7f99485a944267d7df7a92bd10564fca532e24c0218cc6283d500ab0256a87385ab9ac6d3310af34f0e6e8a922c2d5d6fb5d5fbf65e
 DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d247adc40071d1ae70ede2f2 SHA512 901106ea5a9108ba6016da55093801fbaee50f8f8fb45f290cae3bb989663838e83a4d8484bc633b9acf2c085c83304a47d9348255d106117dace3d5f44ea835 WHIRLPOOL 709c130037be6491ea1a9d6301dcc4acc643c9d1127d11a0dccb9d7339fda7fe06ba159100c3f4ad34d7b34c6b5336f2328f6bdf7ee8cdf87e752e371120ff8d
 DIST jflex-1.5.0.tar.gz 2827866 SHA256 76b11d00fe94f79331a74045c7aaea292a80cb311a6840d0dd53209e81d4cb64 SHA512 5d46d3339a8e435228e8dab55ac52bbb40b4b39ea9c28963c5d02298f0ed8a7e8a66573003f165badb4c3939d6bd88852343d886d3b6c2bd78d17320201c3137 WHIRLPOOL 22d44cc90bf09666f0139c83cde2f9330ed12e2dd3313573d948527d2a0d420b71512a764c5579a94d4d30f4a573180bec2c08c37c3e3c81f079a018bee1a3b1
 DIST jflex-1.5.1.tar.gz 2764584 SHA256 3b24ed6ace401e70d71f82a65179a4eb958756f43ed4c647ce75f340f644becd SHA512 e0bb95fd70add73b662c34ff5821f9822bf1e982bd669bc4497bf210555ccd455b1d216391864e9983a4f90d430e0f8b57667c0f0623a8dfb0ff1ef97b2f5572 WHIRLPOOL 123668156410891a9a4c755cd7fbb4464c88b57c00d01ed4d4679c6b5b66e3d355b7006356937c54cc7a14a4b9bd7619912bd0186fc5b8a19294406fa432008b
+DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
 EBUILD jflex-1.4.3.ebuild 1947 SHA256 d68b1cf96ee8204d62fed4d4421b4ea5006cd90d08b7941330b59cf6f0d138e8 SHA512 aab0b3cfe9e5dc967971b56bd516ac244db76eb5877724d47eebce6487535882dce51fa3c667674acfe0872d20f7d873a46b5a98cb9b8c18c3cbccbe1a3102ee WHIRLPOOL d9cee408c0dac6ebe4a80db112a518dfff9869c405b29a1eb6413ca932d0e9ead03b04b182080fc06d63d07b48146c6e6a6ec11dd580e12196d583421a24dd0b
 EBUILD jflex-1.5.0.ebuild 2056 SHA256 dc0b9045b22b26526fdf21c6fcda10ceac7497140fd0bf70b6402d38341371c6 SHA512 003fde27e32c5c013bdf094144eae3e80238566f50a08ebf1596c0127271e8b4483a1bb82c8005e05dddfa0965233bc8f2c73a6a5a8c987b498261b5c705343c WHIRLPOOL d1f564f47fc18c9020900c5ed8290a3146119810f6a4860033791d201d04578ef70c195ef9f84a89306cb5f944aa2ec9e2bd9e06ff4d06f0d3402c64f3e2ac69
 EBUILD jflex-1.5.1.ebuild 2058 SHA256 1820d2abdc7249bf2b039caf4d191cd92fcb3dfd3374c55ecd7b4c0525f7a3b9 SHA512 c8f5dfcfebaba47c1d8b6d6c55859c994ba80e26918b7aec497dbf9a401deb30c58105824e9c9a89ade5ccaa23ec93ad9abcfb15c0debdc49b0dcd1436ac0770 WHIRLPOOL 7680362272432e20d478cb733e13d17fb251a8ae0d7cccafd16c54d5279557f0f4358176ae5f144efc8783f886b796f595fcd91dee4724f341c6e02e3eb6c373
-MISC ChangeLog 2295 SHA256 36a546b4c69e2454511db2eaaf5c69d2431af0e594ae3f458be43550e64d8d14 SHA512 002a76e8a8bd434832409949acf6e4a21556987d0121e04231f30d5291f909afbe43096334a6899f912c2688e3320a7ba3776acbfa2ac401d6aa8e9fead58db4 WHIRLPOOL 6b2195a2e4ff9ae0f036a25e769984e7f05edd881f1353ff5a15632e865740713e5acc96bb5e16ad9e2219e7d66f855c44f4c1e80791c4363a5cc6025f522e8f
+EBUILD jflex-1.6.0.ebuild 2501 SHA256 d07b78586ef5182a90431f75aba6deec558a157072f6b30e6e832084ce7c5f98 SHA512 2cd74e26cf46324a7a1e669735bc91757a6b5fecd69591deb370328c5b5163221529eea9fd756fc9721bc699a48af1f82f5176ada9fe2549fc9dae9823743a12 WHIRLPOOL cb2aa6e432eaf4e281bd824aa4ac84e1ab4601e821ef9b5065d4627443565c09571525b6119b2e343c8aedf6c3f96e8230e21255df1e1387f808ee4a404d2d4e
+MISC ChangeLog 2466 SHA256 aa81ff830e6ecab6477e24e56854b24eef4c9d8c9ed343b267b18dce46f69c86 SHA512 141b2ee597620f575bfa08ca967ebedf7b5314363b6651ebfe407ec0e8d391c94b74a0b109c8917a2de7dbd01cb344aa3897f92dba44369e8806441227ac1813 WHIRLPOOL 69337ad2a1e50afd09370b317896f53724133010b984212615029ad190a14c071b7e8d352953625361d1718f599612a35acc576dc794e2acab37364edeff602a
 MISC metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTYRYIAAoJEJWyH81tNOV9eFQH/R1fpDmGLjgaCWVsTkF+hJZA
-ziYn3xUeu0O8aGVKRitaCYWo2ReDq/kkD623TAdpDUhFnQN822NeyVIuZ/+CCMko
-uSPvmrP3xgmGAD5xfZWyz8e7bvLXrAMVw2Wh4xfV7NC/BDNG/KkJpE9cI+TLEr7E
-+ita/XSxbHq1UwdZO6SoSRzz+J4wmiVn/VHOMLE0EPkbqZRq7lVtXwtQG33bi/Vf
-UsS4cS0Xb3RjlIX8Ahj78bd7AeNXstol/NblgbpmMqGggUPIRHtVQK0cLnamJt+A
-OdWu2qcE8tEZt9eisWO2xeYt//m4LBG6+DoTrzAWvrP7fNjWcNSHUbCLEomG2vY=
-=1OW2
------END PGP SIGNATURE-----

diff --git a/dev-java/jflex/jflex-1.6.0.ebuild b/dev-java/jflex/jflex-1.6.0.ebuild
new file mode 100644 (file)
index 0000000..cd62404
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild,v 1.1 2015/01/18 21:16:24 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.5
+       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+       >=dev-java/ant-core-1.7.0
+       >=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.5
+       dev-java/junit:0
+       >=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+       # use a more convenient version number
+       sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+       # fix bootstrapping
+       sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+               build.xml
+       # add javadoc capability to build.xml
+       sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+               build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+       java-pkg-2_src_compile
+
+       # Compile another time, using our generated jar; for sanity.
+       cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+       java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+       java-pkg-2_src_test
+}
+
+src_install() {
+       java-pkg_newjar build/${P}.jar ${PN}.jar
+       java-pkg_dolauncher "${PN}" --main jflex.Main
+       java-pkg_register-ant-task
+
+       if use doc ; then
+               dodoc doc/manual.pdf changelog.md
+               dohtml -r doc/*
+               java-pkg_dojavadoc javadoc
+       fi
+
+       use examples && java-pkg_doexamples examples
+       use source && java-pkg_dosrc src/main
+
+       if use vim-syntax; then
+               insinto /usr/share/vim/vimfiles/syntax
+               doins "${S}/lib/jflex.vim"
+       fi
+}