monsieurp 15/02/22 18:55:39
Modified: jflex-1.5.0.ebuild jflex-1.6.0.ebuild
jflex-1.4.3.ebuild jflex-1.5.1.ebuild ChangeLog
Log:
Fix package collisions and bug #504774.
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.3 dev-java/jflex/jflex-1.5.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild?r1=1.2&r2=1.3
Index: jflex-1.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jflex-1.5.0.ebuild 31 Jan 2015 19:42:17 -0000 1.2
+++ jflex-1.5.0.ebuild 22 Feb 2015 18:55:39 -0000 1.3
@@ -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/jflex/jflex-1.5.0.ebuild,v 1.2
2015/01/31 19:42:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.0.ebuild,v 1.3
2015/02/22 18:55:39 monsieurp Exp $
EAPI="5"
@@ -59,7 +59,7 @@
src_install() {
java-pkg_newjar build/${P}.jar ${PN}.jar
- java-pkg_dolauncher "${PN}" --main jflex.Main
+ java-pkg_dolauncher "${P}" --main jflex.Main
java-pkg_register-ant-task
if use doc ; then
1.2 dev-java/jflex/jflex-1.6.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild?r1=1.1&r2=1.2
Index: jflex-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jflex-1.6.0.ebuild 18 Jan 2015 21:16:24 -0000 1.1
+++ jflex-1.6.0.ebuild 22 Feb 2015 18:55:39 -0000 1.2
@@ -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/jflex/jflex-1.6.0.ebuild,v 1.1
2015/01/18 21:16:24 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild,v 1.2
2015/02/22 18:55:39 monsieurp Exp $
EAPI="5"
@@ -69,7 +69,7 @@
src_install() {
java-pkg_newjar build/${P}.jar ${PN}.jar
- java-pkg_dolauncher "${PN}" --main jflex.Main
+ java-pkg_dolauncher "${PN}-${SLOT}" --main jflex.Main
java-pkg_register-ant-task
if use doc ; then
1.9 dev-java/jflex/jflex-1.4.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild?r1=1.8&r2=1.9
Index: jflex-1.4.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jflex-1.4.3.ebuild 20 Oct 2013 16:32:51 -0000 1.8
+++ jflex-1.4.3.ebuild 22 Feb 2015 18:55:39 -0000 1.9
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.8
2013/10/20 16:32:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.4.3.ebuild,v 1.9
2015/02/22 18:55:39 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="3"
+EAPI="5"
+
JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2
@@ -14,7 +15,7 @@
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
HOMEPAGE="http://www.jflex.de/";
LICENSE="GPL-2"
-SLOT="0"
+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 ) )
@@ -56,7 +57,7 @@
src_install() {
java-pkg_dojar lib/JFlex.jar
- java-pkg_dolauncher "${PN}" --main JFlex.Main
+ java-pkg_dolauncher "${PN}-${SLOT}" --main JFlex.Main
java-pkg_register-ant-task
dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
1.4 dev-java/jflex/jflex-1.5.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild?r1=1.3&r2=1.4
Index: jflex-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jflex-1.5.1.ebuild 31 Jan 2015 19:34:36 -0000 1.3
+++ jflex-1.5.1.ebuild 22 Feb 2015 18:55:39 -0000 1.4
@@ -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/jflex/jflex-1.5.1.ebuild,v 1.3
2015/01/31 19:34:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.5.1.ebuild,v 1.4
2015/02/22 18:55:39 monsieurp Exp $
EAPI="5"
@@ -69,7 +69,7 @@
src_install() {
java-pkg_newjar build/${P}.jar ${PN}.jar
- java-pkg_dolauncher "${PN}" --main jflex.Main
+ java-pkg_dolauncher "${P}" --main jflex.Main
java-pkg_register-ant-task
if use doc ; then
1.19 dev-java/jflex/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jflex/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 31 Jan 2015 19:42:17 -0000 1.18
+++ ChangeLog 22 Feb 2015 18:55:39 -0000 1.19
@@ -1,6 +1,10 @@
# 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.18 2015/01/31
19:42:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/ChangeLog,v 1.19 2015/02/22
18:55:39 monsieurp Exp $
+
+ 22 Feb 2015; Patrice Clement <[email protected]> jflex-1.4.3.ebuild,
+ jflex-1.5.0.ebuild, jflex-1.5.1.ebuild, jflex-1.6.0.ebuild:
+ Fix package collisions and bug #504774.
31 Jan 2015; Patrice Clement <[email protected]>
files/jflex-1.5.0-build.xml, jflex-1.5.0.ebuild:
