Revert previous change (EAPI + SLOT) and revbump the package instead.

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

4 files changed, 86 insertions, 7 deletions

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index e8e583b31cab..613942dfe42e 100644
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jflex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.19 2015/02/22 18:55:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.20 2015/02/23 10:37:47 monsieurp Exp $
+
+*jflex-1.4.3-r1 (23 Feb 2015)
+
+  23 Feb 2015; Patrice Clement <monsieurp@gentoo.org> +jflex-1.4.3-r1.ebuild,
+  jflex-1.4.3.ebuild:
+  Revert previous change (EAPI + SLOT) and revbump the package instead.
 
   22 Feb 2015; Patrice Clement <monsieurp@gentoo.org> jflex-1.4.3.ebuild,
   jflex-1.5.0.ebuild, jflex-1.5.1.ebuild, jflex-1.6.0.ebuild:
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 6839f8d2fbbd..33baf5cc8746 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -4,9 +4,10 @@ DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d
 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 1964 SHA256 d0cc6eb73e8efb471c5d2446c4790dbeb0051776cc4c7075ff27d45f60b5fc06 SHA512 3e118934066f76901fe73e3c27699500db4ec95be8e26f499cfac78273a30151ae8cfd4026865d38831963017c24e2f763860aa88f4497102ec4c7708a5f1b84 WHIRLPOOL 00d11c347cab279cb3d43282616ce98953f2cae46ef059c48a107dbf33de61c10df6c26e1a8a52e7e6d1d13ab3002005757baed5440671df3a557efd5b9d0690
+EBUILD jflex-1.4.3-r1.ebuild 1963 SHA256 a8805691be266fdeb675fff215f198cfe101ae26d21eb6724c7ebb64fb8e6ee1 SHA512 b2e35eb5b27467f8893546b4c016f0305d1599901fd12df216cd6f4b4aa55ad760e9462ef0adff384e73a0733a0a0339185b24e21726c6192d3ac4d68c18f3f0 WHIRLPOOL 782dfec7c73c3d981a36377c6dbdc51e14eac14d727f1899eebfb95758fd26564d6ca1cc377c0e379deff4ae14371edc6ad40dbe75c8e7683d12bf5ddbfdf59b
+EBUILD jflex-1.4.3.ebuild 1954 SHA256 9e8130ee0b50162f8a1da5d1adbd6d46080fbf38a0e073917e7c57cb6ab95b85 SHA512 af162f70e3c994e7743db61a2300d841606545e498afa7037bf259bc2daef961e3af9b372fccb45f837ead3615c6f5ad097da6a17fffb699f9c3b29c775222ec WHIRLPOOL 97981c4f4edfdcc538606005dc617018b31af72d9e309c8b25bd43716e71dd5de5d31a09ddb4094bf9483a6910392f0d2895567d637cb67bc828e5bcf90a78ae
 EBUILD jflex-1.5.0.ebuild 2042 SHA256 f1ac8601ce4ab4067c3dda12f71782a8a69212ee412de1b4b1d6dee8154b55b7 SHA512 771c1ae123a6eb5db823f5e58e1ff64a2b104276dca4935bf665dfa08ca16f0c8dd549349b0189283171287c9939066935be847024a45701a5487c49f755efb5 WHIRLPOOL 355ec6f6d418dbfb2c0fd1d4e07ed2b70b8260be0dd8a95e3f001ae0529bfe3338674de568d255415d608b6d2c46f6638ef5640dd23af9a2872c36a6e66f184f
 EBUILD jflex-1.5.1.ebuild 2500 SHA256 abd54d5f85d8ceb65b50511a0bdf1dff9557241bab9f36c7aa429c651a3731ee SHA512 3440ec0e81c278465749d7f4a2055b88dce6a44596771cab929ce3d4982615cbbbb21412a99c5a7f5dc0034a9529bf5871eb491de0c415234269cb61b07daf97 WHIRLPOOL af38ded767d4a9806b5c69214226a3c909ff30cc34f256bfae95376447c7d7b1a7f9f41a01f8f7353e21e66bc506f13f85dfc1197a6bf30ff4b8f73e4b9079ee
 EBUILD jflex-1.6.0.ebuild 2509 SHA256 98edc2bb5f133004f804bcf5f65825db1fca76679853e929516c9cedf10ceacd SHA512 f761e19021a50acfed0b4d93219c9fc7d3fd381273a581831a1425918c2c3e81b6b86ca23a2ea50382cfc8b87dd85add076e41abe1928a2a32a90e4ad743b319 WHIRLPOOL 5bd8483538ea3865ef24e9f0666c305895a2e48ec3e79aaae3551a6728ab8eefbae5e476ebbdf8242b0a317c81088e0836a7d17cb27a0d7adec55ea253d0e57f
-MISC ChangeLog 3006 SHA256 74bcb3d161be427a45b49d1edff6cd059984ef624eb88d692d966a910678251e SHA512 6330f9e177777b30a52fd58448f5a113844e88b88f9cfeb91ca9c5beeeb7fedb62a7148047798e05f9186cbc3df8b92d8b9492f80d9ff0dd85f19343fe38cb8f WHIRLPOOL d142969591c064f39054d3845fc7834e2caa0326bf6387d4fdfdaa90dc1299fbe1c2e2a88fd4dd3ac4bf522fc577e776af2007eef0155459153dc7cd4f073b76
+MISC ChangeLog 3210 SHA256 90cabd5f073738d11e6745e05f92f6edbdcd587b9bbe150dbe198c4da8c197dc SHA512 cb63048f89d3a59c2be9255fdc8bb7e25e22dbe2f051bd57f79abb4e935d25d8aab4cdbd83240d3e8172794843db65f2c807902db48c889946c7c6a8c2c0fb82 WHIRLPOOL 3d63f5af3135b26fbb90be2791ee5cc6175d0c65eb829d8b401e54d42afbdeb4931230d5ac513f96b9fe3100c8a7b515cc1af25116f2cd0d763569b71c1ec03c
 MISC metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19
diff --git a/dev-java/jflex/jflex-1.4.3-r1.ebuild b/dev-java/jflex/jflex-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..3534ee01cedf
--- /dev/null
+++ b/dev-java/jflex/jflex-1.4.3-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.4.3-r1.ebuild,v 1.1 2015/02/23 10:37:47 monsieurp Exp $
+
+# 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.
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.jflex.de/"
+LICENSE="GPL-2"
+SLOT="1.4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.4
+	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.4
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="doc source vim-syntax"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src"
+
+	mkdir "${S}/tools"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar"
+	rm -rf java_cup "${S}/lib/JFlex.jar"
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	ANT_TASKS="javacup"
+	jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
+	cd "${S}/src"
+	eant realclean
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+
+	rm "${S}/tools/JFlex.jar"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/"
+	rm "${S}/lib/JFlex.jar"
+
+	eant realclean
+	einfo "Recompiling using the newly generated JFlex library"
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+}
+
+src_install() {
+	java-pkg_dojar lib/JFlex.jar
+	java-pkg_dolauncher "${PF}" --main JFlex.Main
+	java-pkg_register-ant-task
+
+	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+	dohtml -r doc/*
+
+	use source && java-pkg_dosrc src/JFlex
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/jflex-1.4.3.ebuild b/dev-java/jflex/jflex-1.4.3.ebuild
index 70c82a7def87..7bc475504a38 100644
--- a/dev-java/jflex/jflex-1.4.3.ebuild
+++ b/dev-java/jflex/jflex-1.4.3.ebuild
@@ -1,11 +1,11 @@
 # 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.4.3.ebuild,v 1.9 2015/02/22 18:55:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild,v 1.10 2015/02/23 10:37:47 monsieurp Exp $
 
 # 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.
 
-EAPI="5"
+EAPI="3"
 
 JAVA_PKG_IUSE="source"
 
@@ -15,7 +15,7 @@ DESCRIPTION="JFlex is a lexical analyzer generator for Java"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.jflex.de/"
 LICENSE="GPL-2"
-SLOT="1.4"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 RDEPEND=">=virtual/jre-1.4
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
@@ -57,7 +57,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/JFlex.jar
-	java-pkg_dolauncher "${PN}-${SLOT}" --main JFlex.Main
+	java-pkg_dolauncher "${P}" --main JFlex.Main
 	java-pkg_register-ant-task
 
 	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog