Fix package collisions and bug #504774.

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

diff --git a/dev-java/jflex/ChangeLog b/dev-java/jflex/ChangeLog
index 439e1e514445d96d45e3daf1705e7b2ec5dd18c4..e8e583b31cab3d9f64b67d2c5b8d330f0aabcc56 100644 (file)
--- a/dev-java/jflex/ChangeLog
+++ b/dev-java/jflex/ChangeLog
@@ -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 <monsieurp@gentoo.org> 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 <monsieurp@gentoo.org>
   files/jflex-1.5.0-build.xml, jflex-1.5.0.ebuild:

diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index e1db6c5fa02db064fe7c67917c563ade56f84d60..6839f8d2fbbde3235435d3e230a331d0e56112c9 100644 (file)
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -4,9 +4,9 @@ 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 1947 SHA256 d68b1cf96ee8204d62fed4d4421b4ea5006cd90d08b7941330b59cf6f0d138e8 SHA512 aab0b3cfe9e5dc967971b56bd516ac244db76eb5877724d47eebce6487535882dce51fa3c667674acfe0872d20f7d873a46b5a98cb9b8c18c3cbccbe1a3102ee WHIRLPOOL d9cee408c0dac6ebe4a80db112a518dfff9869c405b29a1eb6413ca932d0e9ead03b04b182080fc06d63d07b48146c6e6a6ec11dd580e12196d583421a24dd0b
-EBUILD jflex-1.5.0.ebuild 2043 SHA256 62fdbdd10aa91994f421b8d78b1ce61418e9b9977a47503435a3014c29eef74d SHA512 6bf257b243a7cd460890f9ff32300bf210ebf5e2e8b89e2ae5d8de8324678dc2d4b61b02d73394a493f951db68199eec9c837c1107bb77b39920c3b311a1442a WHIRLPOOL 4077ba8fa0ccb7fb69045aa6e827870862816b23473da5f545b2f99f994238f7f8d72fa8fafd86b3605c9bceaa6bff7bddf197399ac20f3c4ea07bc02c088c79
-EBUILD jflex-1.5.1.ebuild 2501 SHA256 2146d32fc50c22d88f421aaa682100e78a346b345054d31bc0ee2dc53e5c3a36 SHA512 519d1f14ac7a68f7a53cafdbb804ede4d6fabfa9cffaff9031343a0294a0f76b766a798c6abb45fd28634ad61d7646705237a4a6e2cfc06868a5562343f52c40 WHIRLPOOL e29ab8d34808dcd6e388bfcd359d116352de6710520eb09d08cac25a4b2670a777d552566463bf85d5f3b7af81db8382ab6104c582e2ab5106f5a2e8a48ab6d9
-EBUILD jflex-1.6.0.ebuild 2501 SHA256 d07b78586ef5182a90431f75aba6deec558a157072f6b30e6e832084ce7c5f98 SHA512 2cd74e26cf46324a7a1e669735bc91757a6b5fecd69591deb370328c5b5163221529eea9fd756fc9721bc699a48af1f82f5176ada9fe2549fc9dae9823743a12 WHIRLPOOL cb2aa6e432eaf4e281bd824aa4ac84e1ab4601e821ef9b5065d4627443565c09571525b6119b2e343c8aedf6c3f96e8230e21255df1e1387f808ee4a404d2d4e
-MISC ChangeLog 2827 SHA256 58f4a1382530c03093fab48223df9cd696a2a6a497e4e464265379a381f4ff2d SHA512 ecd00b1b4d1fa50d8f0f1a3c179f3ea4843e19c63a077278f30aff26340d878469c0dc2f116c80f5ea89d9182143cdc6c88813d648f65d298c9b82600d016225 WHIRLPOOL 693032c84e52cd6ca0e8bc32e062403b6b645edb7f0187311561e43951601d582163357bf0bf81086540eb521ec7a3e20f5823adc94ce58fb5e5bbbb06361b37
+EBUILD jflex-1.4.3.ebuild 1964 SHA256 d0cc6eb73e8efb471c5d2446c4790dbeb0051776cc4c7075ff27d45f60b5fc06 SHA512 3e118934066f76901fe73e3c27699500db4ec95be8e26f499cfac78273a30151ae8cfd4026865d38831963017c24e2f763860aa88f4497102ec4c7708a5f1b84 WHIRLPOOL 00d11c347cab279cb3d43282616ce98953f2cae46ef059c48a107dbf33de61c10df6c26e1a8a52e7e6d1d13ab3002005757baed5440671df3a557efd5b9d0690
+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 metadata.xml 290 SHA256 e365b92e59f17ebb03d11d7c77908f81b3dd4cf230ff5817bf783228f144ae92 SHA512 61e1cff591501b1ee65715620d124a955960ac98fcfea7e2bbc5e4abe7fbbb963035c39c337a6612cd4a51688403141c06218318b015804897a9cb99726da5cc WHIRLPOOL 3fb116713a39a45cbc80a10cdaf9fe252946d4ac769443c0ae2b0da54b9155a4b4c341981322d413851852a71f75ce00f31bd903d349a59bf78a46b76c30ee19

diff --git a/dev-java/jflex/jflex-1.4.3.ebuild b/dev-java/jflex/jflex-1.4.3.ebuild
index 49582a7299d88f5c4fa8d57e6ad83abacbab849e..70c82a7def87f43eae68c822c7b3c2852311c9bd 100644 (file)
--- a/dev-java/jflex/jflex-1.4.3.ebuild
+++ b/dev-java/jflex/jflex-1.4.3.ebuild
@@ -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 @@ 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="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_compile() {
 
 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

diff --git a/dev-java/jflex/jflex-1.5.0.ebuild b/dev-java/jflex/jflex-1.5.0.ebuild
index ba15541abc62f5efa1fd9896c87617294bd80093..c1f71e8f1a994f3cce5b50764a4ffadb4563f10a 100644 (file)
--- a/dev-java/jflex/jflex-1.5.0.ebuild
+++ b/dev-java/jflex/jflex-1.5.0.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/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_test() {
 
 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

diff --git a/dev-java/jflex/jflex-1.5.1.ebuild b/dev-java/jflex/jflex-1.5.1.ebuild
index c3be1846e38cb5e6ce3afccfde45b84e84ff11dd..57391566e009d56d9dc5a65ae63514f3ef836a5a 100644 (file)
--- a/dev-java/jflex/jflex-1.5.1.ebuild
+++ b/dev-java/jflex/jflex-1.5.1.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/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_test() {
 
 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

diff --git a/dev-java/jflex/jflex-1.6.0.ebuild b/dev-java/jflex/jflex-1.6.0.ebuild
index cd6240459ee77e5007d9be9bdeda9acac0851779..8ce0b3c895891830eb9a00ce0c8087004898a900 100644 (file)
--- a/dev-java/jflex/jflex-1.6.0.ebuild
+++ b/dev-java/jflex/jflex-1.6.0.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/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_test() {
 
 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