Remove two files causing compilation errors due to com.sun.mirror.* package import (removed from JDK 7 onwards).

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-java/annogen/ChangeLog b/dev-java/annogen/ChangeLog
index 8b766e1e05c3..088faeda11b5 100644
--- a/dev-java/annogen/ChangeLog
+++ b/dev-java/annogen/ChangeLog
@@ -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 <monsieurp@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 <slyfox@gentoo.org> annogen-0.1.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest
index cec3b77cf737..a2427d177dbf 100644
--- a/dev-java/annogen/Manifest
+++ b/dev-java/annogen/Manifest
@@ -2,13 +2,17 @@
 Hash: SHA256
 
 DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802
-EBUILD annogen-0.1.0.ebuild 1431 SHA256 eff93e8d8e4d79e3002d7c92608117ce9bd448880d03fa0c6b540a5d445b9d6a SHA512 2ac9d4adcd6f4aa054c96237bde8ae7c14556b8785dad9f312b0a7d15d3e77eda45159bc9d54d01b615cafd8491e4350b1baf657f9ac33e2d5356de51ed5d04e WHIRLPOOL 3a05280ff03e9e2987ee1f8b1e23b7b6d01a3df087520ceac77f6669fe08f6de78061cb2137417126c8e96c81d8f257f00ab9c359e1e789c86e31bc87ec45022
-MISC ChangeLog 705 SHA256 dd26bfdba4b2782ffad4577f55c28f2eef92bf16910e0a313ea05cea24e0129d SHA512 8b55adb50dcaa7021d242ac44d15bfa587bd03f99ef60442e7888ede38fc2cb61576f2011e26b4fb2cdc05806d163513f4c9763e9544fda33bdf45554d8f956b WHIRLPOOL 54f5e2e7247725bdc11b95ab7b02c7d582569b715061df95a819ad3ab877f0f561b77eb9dbc5bdf82896bb998dbe599d84b46fc6481571a6ba5ecf13e11b155d
+EBUILD annogen-0.1.0.ebuild 1658 SHA256 61e9e263e314b627b5847d2671da7db1394b321a90120a2aa86373e37ff4bfb2 SHA512 aaf57a920fa4910211c3ae0b2dc45ed65cad977d6d661c8f31d0ce1535947420e224d30769f5f35a7177525d36ba0095f20c2b3ce01bd55cd73f0701c3125971 WHIRLPOOL d7f3217f0f6cd7981c3c3b5c0c98627d633cd313a44034cbad7ad865462e244377b1835238760a67ba3d22a57ce5e87bf17becb12ac0c619d353d9761748b726
+MISC ChangeLog 902 SHA256 8e003d9831770e8df57e779fccd7e445868cdfc57cce3ee890369e820ead294e SHA512 2db3dbdee74cdb7c120bb49c2ef56e880684c90c555f4f8d5ebf364e887b98e14b3c3ebf20f2356552f939850eb7131ce3e8b45c34f61d4026ea6d424600f650 WHIRLPOOL b64e6b0c2bb89b47d64cbbbc7143acf5aad8ed82a4b7803ffed4fe952179bdbc351c041ea52e5be73ae4a84a045ae239da07f79a1a5539ba695ffea5317ace1d
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0NYACgkQcaHudmEf86o0HACcC66eo86nFZsGdbfUuicaKPXl
-PGYAnjUBu4scy1nbQonQhMwKIQHXtZw+
-=UQxK
+iQEcBAEBCAAGBQJVvSfvAAoJEJGRpfGTSRu44toH/jT/atuWM3Kdhe/HwkO59xPI
+Kz/yKl8Z+MtGdSTR4v6BA7W1jMbgXQAAUMsvScrtncsuFtprT2Xu8D6NaHAmM0Kg
+A8dZYmGaLqFELGpb4/SxoQAdAMrbaB0x81vNIyUJiH+sgGUGnL0S3JYpTVtq3WWJ
++48YmFiPF8TG8k8OKKY5EkY7nzoipjQ3vs2pcFKY1UeE5ltiv+JpMyYqFSNlg4KE
+15shPJnbY9RubiyvvzeiZqgyNukx1k94N/kUiyL2T9eUIt4j44f4zQwCMjBhT0F8
+xSpmjbHHOh2q3usqqXVwzP2/IChfEVrgp1aYtGjCWwQIHzd57iIGVVAGAxM9YSA=
+=J6H+
 -----END PGP SIGNATURE-----
diff --git a/dev-java/annogen/annogen-0.1.0.ebuild b/dev-java/annogen/annogen-0.1.0.ebuild
index dafa3b9cf25d..c8af8b664ce1 100644
--- a/dev-java/annogen/annogen-0.1.0.ebuild
+++ b/dev-java/annogen/annogen-0.1.0.ebuild
@@ -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 @@ SLOT="0"
 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
 }