monsieurp 15/08/01 19:10:45 Modified: annogen-0.1.0.ebuild ChangeLog Log: Remove two files causing compilation errors due to com.sun.mirror.* package import (removed from JDK 7 onwards). Signed-off-by: Patrice Clement <monsie...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.4 dev-java/annogen/annogen-0.1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?r1=1.3&r2=1.4 Index: annogen-0.1.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- annogen-0.1.0.ebuild 10 Aug 2014 20:06:45 -0000 1.3 +++ annogen-0.1.0.ebuild 1 Aug 2015 19:10:45 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 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/annogen/annogen-0.1.0.ebuild,v 1.3 2014/08/10 20:06:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v 1.4 2015/08/01 19:10:45 monsieurp Exp $ EAPI="5" @@ -17,22 +17,28 @@ KEYWORDS="~amd64" CDEPEND="java-virtuals/stax-api:0 - dev-java/ant-core:0 java-virtuals/jdk-with-com-sun:0 - >=dev-java/qdox-1.6:1.6" + dev-java/ant-core:0 + dev-java/qdox:1.6" -RDEPEND=">=virtual/jdk-1.5 +RDEPEND=">=virtual/jdk-1.6 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND}" S="${WORKDIR}" +# com.sun.mirror.declaration was removed from JDK 7 onwards. +# These two files are just interfaces anyway. +JAVA_RM_FILES=( + org/codehaus/annogen/view/MirrorAnnoViewer.java + org/codehaus/annogen/override/MirrorElementIdPool.java +) + src_unpack() { default - unzip -o -q "${S}/${PN}-src-${PV}.zip" || die } 1.4 dev-java/annogen/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?r1=1.3&r2=1.4 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 10 Aug 2014 20:06:46 -0000 1.3 +++ ChangeLog 1 Aug 2015 19:10:45 -0000 1.4 @@ -1,6 +1,10 @@ # ChangeLog for dev-java/annogen -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.3 2014/08/10 20:06:46 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.4 2015/08/01 19:10:45 monsieurp Exp $ + + 01 Aug 2015; Patrice Clement <monsie...@gentoo.org> annogen-0.1.0.ebuild: + Remove two files causing compilation errors due to com.sun.mirror.* package + import (removed from JDK 7 onwards). 10 Aug 2014; Sergei Trofimovich <sly...@gentoo.org> annogen-0.1.0.ebuild: QA: drop trailing '.' from DESCRIPTION
