summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild1
-rw-r--r--dev-java/airline/airline-0.7-r1.ebuild1
-rw-r--r--dev-java/android-util/android-util-4.1.1.4.ebuild1
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild1
-rw-r--r--dev-java/annogen/annogen-0.1.0-r3.ebuild1
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild1
-rw-r--r--dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild1
-rw-r--r--dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild1
-rw-r--r--dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild1
-rw-r--r--dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild1
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild1
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild1
-rw-r--r--dev-java/ant-core/ant-core-1.9.2.ebuild1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild1
-rw-r--r--dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild1
-rw-r--r--dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild1
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.0.0.ebuild1
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild1
-rw-r--r--dev-java/ant-jai/ant-jai-1.9.2.ebuild1
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild1
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.9.2.ebuild1
-rw-r--r--dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild1
-rw-r--r--dev-java/ant-jmf/ant-jmf-1.9.2.ebuild1
-rw-r--r--dev-java/ant-jsch/ant-jsch-1.9.2.ebuild1
-rw-r--r--dev-java/ant-junit/ant-junit-1.9.2.ebuild1
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.9.2.ebuild1
-rw-r--r--dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild1
-rw-r--r--dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild1
-rw-r--r--dev-java/ant-swing/ant-swing-1.9.2.ebuild1
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.9.2.ebuild1
-rw-r--r--dev-java/ant-trax/ant-trax-1.9.2.ebuild1
-rw-r--r--dev-java/ant/ant-1.9.2.ebuild1
-rw-r--r--dev-java/antlr/antlr-2.7.7-r7.ebuild1
-rw-r--r--dev-java/antlr/antlr-3.2.ebuild1
-rw-r--r--dev-java/antlr/antlr-3.5.2.ebuild1
-rw-r--r--dev-java/antlr/antlr-4.5.1.ebuild1
-rw-r--r--dev-java/antlr/antlr-4.5.3.ebuild1
-rw-r--r--dev-java/aopalliance/aopalliance-1.0-r2.ebuild1
-rw-r--r--dev-java/appframework/appframework-1.03-r4.ebuild1
-rw-r--r--dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild1
-rw-r--r--dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild1
-rw-r--r--dev-java/args4j/args4j-2.32.ebuild1
-rw-r--r--dev-java/asm/asm-3.3.1-r1.ebuild1
-rw-r--r--dev-java/asm/asm-5.0.3.ebuild1
-rw-r--r--dev-java/asm/asm-5.1.ebuild1
-rw-r--r--dev-java/aspectj/aspectj-1.7.3-r1.ebuild1
-rw-r--r--dev-java/aspectj/aspectj-1.7.4.ebuild1
-rw-r--r--dev-java/assertj-core/assertj-core-2.3.0.ebuild1
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild1
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild1
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild1
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild1
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild1
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild1
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild1
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild1
-rw-r--r--dev-java/balloontip/balloontip-1.2.1.ebuild1
-rw-r--r--dev-java/batik/batik-1.8-r3.ebuild1
-rw-r--r--dev-java/bcel/bcel-6.0_rc3.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.38-r4.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.38-r5.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.45-r3.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.45-r4.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.50-r2.ebuild1
-rw-r--r--dev-java/bcmail/bcmail-1.52-r2.ebuild1
-rw-r--r--dev-java/bcpg/bcpg-1.50-r1.ebuild1
-rw-r--r--dev-java/bcpg/bcpg-1.52-r1.ebuild1
-rw-r--r--dev-java/bcpkix/bcpkix-1.50-r2.ebuild1
-rw-r--r--dev-java/bcpkix/bcpkix-1.52-r1.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.38-r4.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.40-r2.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.45-r2.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.48-r2.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.49-r4.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.50-r2.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.50-r3.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.50-r4.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.52-r1.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.52-r2.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.52-r3.ebuild1
-rw-r--r--dev-java/bcprov/bcprov-1.54.ebuild1
-rw-r--r--dev-java/bctsp/bctsp-1.45-r1.ebuild1
-rw-r--r--dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild1
-rw-r--r--dev-java/blowfishj/blowfishj-2.14-r3.ebuild1
-rw-r--r--dev-java/bnd-junit/bnd-junit-2.1.0.ebuild1
-rw-r--r--dev-java/bndlib/bndlib-2.1.0.ebuild1
-rw-r--r--dev-java/boilerpipe/boilerpipe-1.2.0.ebuild1
-rw-r--r--dev-java/boot-bin/boot-bin-2.6.0.ebuild1
-rw-r--r--dev-java/boot-bin/boot-bin-2.7.0.ebuild1
-rw-r--r--dev-java/boot-bin/boot-bin-2.7.1.ebuild1
-rw-r--r--dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild1
-rw-r--r--dev-java/bsf/bsf-2.4.0-r2.ebuild1
-rw-r--r--dev-java/bsh/bsh-2.0_beta6.ebuild1
-rw-r--r--dev-java/btf/btf-1.2.ebuild1
-rw-r--r--dev-java/byaccj/byaccj-1.15-r1.ebuild1
-rw-r--r--dev-java/bytelist/bytelist-1.0.10.ebuild1
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.1.ebuild1
-rw-r--r--dev-java/cal10n/cal10n-0.8.1.ebuild1
-rw-r--r--dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild1
-rw-r--r--dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild1
-rw-r--r--dev-java/cdi-api/cdi-api-1.2-r1.ebuild1
-rw-r--r--dev-java/cdi-api/cdi-api-1.2.ebuild1
-rw-r--r--dev-java/cglib/cglib-3.1.ebuild1
-rw-r--r--dev-java/classmate/classmate-0.9.0-r1.ebuild1
-rw-r--r--dev-java/classmate/classmate-1.0.0.ebuild1
-rw-r--r--dev-java/cldc-api/cldc-api-1.1-r1.ebuild1
-rw-r--r--dev-java/codemodel/codemodel-2.6.ebuild1
-rw-r--r--dev-java/cofoja/cofoja-1.2.ebuild1
-rw-r--r--dev-java/colt/colt-1.2.0-r3.ebuild1
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild1
-rw-r--r--dev-java/commons-betwixt/commons-betwixt-0.8.ebuild1
-rw-r--r--dev-java/commons-chain/commons-chain-1.2.ebuild1
-rw-r--r--dev-java/commons-cli/commons-cli-1.2.ebuild1
-rw-r--r--dev-java/commons-cli/commons-cli-1.3.1.ebuild1
-rw-r--r--dev-java/commons-codec/commons-codec-1.7.ebuild1
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild1
-rw-r--r--dev-java/commons-collections/commons-collections-4.1.ebuild1
-rw-r--r--dev-java/commons-compress/commons-compress-1.10.ebuild1
-rw-r--r--dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild1
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.0.15.ebuild1
-rw-r--r--dev-java/commons-dbcp/commons-dbcp-2.1.ebuild1
-rw-r--r--dev-java/commons-dbutils/commons-dbutils-1.6.ebuild1
-rw-r--r--dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild1
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r1.ebuild1
-rw-r--r--dev-java/commons-digester/commons-digester-3.2-r2.ebuild1
-rw-r--r--dev-java/commons-discovery/commons-discovery-0.5.ebuild1
-rw-r--r--dev-java/commons-el/commons-el-1.0-r3.ebuild1
-rw-r--r--dev-java/commons-email/commons-email-1.4.ebuild1
-rw-r--r--dev-java/commons-fileupload/commons-fileupload-1.3.ebuild1
-rw-r--r--dev-java/commons-graph/commons-graph-0.1.ebuild1
-rw-r--r--dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild1
-rw-r--r--dev-java/commons-imaging/commons-imaging-0.97.ebuild1
-rw-r--r--dev-java/commons-io/commons-io-2.4.ebuild1
-rw-r--r--dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild1
-rw-r--r--dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild1
-rw-r--r--dev-java/commons-jexl/commons-jexl-2.1.1.ebuild1
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild1
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild1
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-2.0-r2.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-2.0-r3.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-2.6-r1.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-3.1.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-3.3.2.ebuild1
-rw-r--r--dev-java/commons-lang/commons-lang-3.4.ebuild1
-rw-r--r--dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild1
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r1.ebuild1
-rw-r--r--dev-java/commons-logging/commons-logging-1.2.ebuild1
-rw-r--r--dev-java/commons-math/commons-math-2.1-r1.ebuild1
-rw-r--r--dev-java/commons-math/commons-math-3.2.ebuild1
-rw-r--r--dev-java/commons-net/commons-net-3.2.ebuild1
-rw-r--r--dev-java/commons-pool/commons-pool-1.6.ebuild1
-rw-r--r--dev-java/commons-pool/commons-pool-2.2.ebuild1
-rw-r--r--dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild1
-rw-r--r--dev-java/commons-validator/commons-validator-1.4.0.ebuild1
-rw-r--r--dev-java/commons-validator/commons-validator-1.4.1.ebuild1
-rw-r--r--dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild1
-rw-r--r--dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild1
-rw-r--r--dev-java/constantine/constantine-0.7-r1.ebuild1
-rw-r--r--dev-java/cortado/cortado-0.6.0-r1.ebuild1
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5.ebuild1
-rw-r--r--dev-java/cssparser/cssparser-0.9.20.ebuild1
-rw-r--r--dev-java/cssparser/cssparser-0.9.21.ebuild1
-rw-r--r--dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild1
-rw-r--r--dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild1
-rw-r--r--dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild1
-rw-r--r--dev-java/dbus-java/dbus-java-2.7-r1.ebuild1
-rw-r--r--dev-java/dict4j/dict4j-1.1.ebuild1
-rw-r--r--dev-java/disruptor/disruptor-3.2.0.ebuild1
-rw-r--r--dev-java/dnsjava/dnsjava-2.1.6.ebuild1
-rw-r--r--dev-java/dnsjava/dnsjava-2.1.7.ebuild1
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r5.ebuild1
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r6.ebuild1
-rw-r--r--dev-java/dtdparser/dtdparser-1.21-r2.ebuild1
-rw-r--r--dev-java/dynalang/dynalang-0.4-r1.ebuild1
-rw-r--r--dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild1
-rw-r--r--dev-java/easymock/easymock-3.3.1.ebuild1
-rw-r--r--dev-java/easyneurons/easyneurons-2.3.ebuild1
-rw-r--r--dev-java/echo2/echo2-2.1.1.ebuild1
-rw-r--r--dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild1
-rw-r--r--dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild1
-rw-r--r--dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild1
-rw-r--r--dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild1
-rw-r--r--dev-java/eclipsito/eclipsito-0_pre20130713.ebuild1
-rw-r--r--dev-java/ecs/ecs-1.4.2-r2.ebuild1
-rw-r--r--dev-java/edtftpj/edtftpj-2.4.0.ebuild1
-rw-r--r--dev-java/ehcache/ehcache-1.2.4-r3.ebuild1
-rw-r--r--dev-java/ehcache/ehcache-1.2.4-r4.ebuild1
-rw-r--r--dev-java/emma/emma-2.0.5312-r3.ebuild1
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild1
-rw-r--r--dev-java/ezmorph/ezmorph-1.0.6.ebuild1
-rw-r--r--dev-java/fastinfoset/fastinfoset-1.2.11.ebuild1
-rw-r--r--dev-java/fastutil/fastutil-7.0.10.ebuild1
-rw-r--r--dev-java/fec/fec-1.0.4-r2.ebuild1
-rw-r--r--dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild1
-rw-r--r--dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild1
-rw-r--r--dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild1
-rw-r--r--dev-java/felix-shell/felix-shell-1.4.3.ebuild1
-rw-r--r--dev-java/felix-utils/felix-utils-1.2.0.ebuild1
-rw-r--r--dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild1
-rw-r--r--dev-java/fontbox/fontbox-1.7.1.ebuild1
-rw-r--r--dev-java/fontbox/fontbox-1.8.11.ebuild1
-rw-r--r--dev-java/fop/fop-2.0-r2.ebuild1
-rw-r--r--dev-java/forehead/forehead-1.0_beta5-r2.ebuild1
-rw-r--r--dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild1
-rw-r--r--dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild1
-rw-r--r--dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild1
-rw-r--r--dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild1
-rw-r--r--dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild1
-rw-r--r--dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild1
-rw-r--r--dev-java/freehep-io/freehep-io-2.2.2.ebuild1
-rw-r--r--dev-java/freemarker/freemarker-2.3.13-r2.ebuild1
-rw-r--r--dev-java/freemarker/freemarker-2.3.25.ebuild1
-rw-r--r--dev-java/fscript/fscript-1.17-r1.ebuild1
-rw-r--r--dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild1
-rw-r--r--dev-java/geoip-java/geoip-java-1.3.0.ebuild1
-rw-r--r--dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild1
-rw-r--r--dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild1
-rw-r--r--dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild1
-rw-r--r--dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild1
-rw-r--r--dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild1
-rw-r--r--dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild1
-rw-r--r--dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild1
-rw-r--r--dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild1
-rw-r--r--dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild1
-rw-r--r--dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild1
-rw-r--r--dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild1
-rw-r--r--dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild1
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild1
-rw-r--r--dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild1
-rw-r--r--dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild1
-rw-r--r--dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild1
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild1
-rw-r--r--dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild1
-rw-r--r--dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild1
-rw-r--r--dev-java/gradle-bin/gradle-bin-3.3.ebuild1
-rw-r--r--dev-java/groovy/groovy-2.4.5.ebuild1
-rw-r--r--dev-java/gson/gson-2.3.1.ebuild1
-rw-r--r--dev-java/gson/gson-2.6.2.ebuild1
-rw-r--r--dev-java/gson/gson-2.7.ebuild1
-rw-r--r--dev-java/guava/guava-13.0.1-r3.ebuild1
-rw-r--r--dev-java/guava/guava-13.0.1.ebuild1
-rw-r--r--dev-java/guava/guava-14.0.1.ebuild1
-rw-r--r--dev-java/guava/guava-18.0.ebuild1
-rw-r--r--dev-java/guava/guava-20.0.ebuild1
-rw-r--r--dev-java/guice/guice-4.0.ebuild1
-rw-r--r--dev-java/guice/guice-4.1.ebuild1
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild1
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.3.ebuild1
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild1
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild1
-rw-r--r--dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild1
-rw-r--r--dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild1
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild1
-rw-r--r--dev-java/headius-options/headius-options-1.1.ebuild1
-rw-r--r--dev-java/helpgui/helpgui-1.1-r2.ebuild1
-rw-r--r--dev-java/hessian/hessian-4.0.37.ebuild1
-rw-r--r--dev-java/higlayout/higlayout-1.0-r2.ebuild1
-rw-r--r--dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild1
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.13.ebuild1
-rw-r--r--dev-java/htmlparser-org/htmlparser-org-1.6.ebuild1
-rw-r--r--dev-java/htmlparser/htmlparser-1.4-r1.ebuild1
-rw-r--r--dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild1
-rw-r--r--dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild1
-rw-r--r--dev-java/ical4j/ical4j-1.0.5.ebuild1
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-3.3.0.ebuild1
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild1
-rw-r--r--dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild1
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild1
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.6.2.ebuild1
-rw-r--r--dev-java/icedtea/icedtea-3.3.0.ebuild1
-rw-r--r--dev-java/icedtea/icedtea-7.2.6.8.ebuild1
-rw-r--r--dev-java/icu4j/icu4j-54.1.1.ebuild1
-rw-r--r--dev-java/icu4j/icu4j-55.1.ebuild1
-rw-r--r--dev-java/icu4j/icu4j-56.1.ebuild1
-rw-r--r--dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild1
-rw-r--r--dev-java/ini4j/ini4j-0.5.1.ebuild1
-rw-r--r--dev-java/invokebinder/invokebinder-1.6.ebuild1
-rw-r--r--dev-java/iso-relax/iso-relax-20050331-r4.ebuild1
-rw-r--r--dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild1
-rw-r--r--dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild1
-rw-r--r--dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild1
-rw-r--r--dev-java/itext/itext-2.1.5-r2.ebuild1
-rw-r--r--dev-java/itext/itext-5.5.4-r2.ebuild1
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild1
-rw-r--r--dev-java/j2ssh/j2ssh-0.2.9.ebuild1
-rw-r--r--dev-java/jackcess/jackcess-1.2.14.3.ebuild1
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild1
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild1
-rw-r--r--dev-java/jackson-databind/jackson-databind-2.8.5.ebuild1
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild1
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild1
-rw-r--r--dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild1
-rw-r--r--dev-java/jackson/jackson-2.8.5.ebuild1
-rw-r--r--dev-java/jacl/jacl-1.4.1-r1.ebuild1
-rw-r--r--dev-java/jacoco/jacoco-0.7.5.ebuild1
-rw-r--r--dev-java/jacoco/jacoco-0.7.9.ebuild1
-rw-r--r--dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild1
-rw-r--r--dev-java/jade/jade-3.3-r3.ebuild1
-rw-r--r--dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild1
-rw-r--r--dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild1
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild1
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild1
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild1
-rw-r--r--dev-java/jal/jal-20031117-r3.ebuild1
-rw-r--r--dev-java/jal/jal-20031117-r4.ebuild1
-rw-r--r--dev-java/jama/jama-1.0.3-r1.ebuild1
-rw-r--r--dev-java/jamon/jamon-2.81.ebuild1
-rw-r--r--dev-java/jamvm/jamvm-2.0.0-r1.ebuild1
-rw-r--r--dev-java/janino/janino-2.7.0.ebuild1
-rw-r--r--dev-java/jansi-native/jansi-native-1.5.ebuild1
-rw-r--r--dev-java/jansi/jansi-1.11-r1.ebuild1
-rw-r--r--dev-java/jansi/jansi-1.5-r1.ebuild1
-rw-r--r--dev-java/jansi/jansi-1.5.ebuild1
-rw-r--r--dev-java/japitools/japitools-0.9.7-r4.ebuild1
-rw-r--r--dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild1
-rw-r--r--dev-java/jarbundler/jarbundler-2.3.1.ebuild1
-rw-r--r--dev-java/jargs/jargs-1.0.ebuild1
-rw-r--r--dev-java/jarjar/jarjar-1.4.ebuild1
-rw-r--r--dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild1
-rw-r--r--dev-java/java-config/java-config-2.2.0-r3.ebuild1
-rw-r--r--dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild1
-rw-r--r--dev-java/java-dep-check/java-dep-check-0.4.ebuild1
-rw-r--r--dev-java/java-getopt/java-getopt-1.0.14.ebuild1
-rw-r--r--dev-java/java-gnome/java-gnome-4.0.19.ebuild1
-rw-r--r--dev-java/java-gnome/java-gnome-4.0.20.ebuild1
-rw-r--r--dev-java/java-gnome/java-gnome-4.1.3.ebuild1
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild1
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-1.8.0.121.ebuild1
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild1
-rw-r--r--dev-java/javacc/javacc-5.0-r2.ebuild1
-rw-r--r--dev-java/javacsv/javacsv-2.1.ebuild1
-rw-r--r--dev-java/javacup/javacup-0.11b_p20151001.ebuild1
-rw-r--r--dev-java/javahelp/javahelp-2.0.05_p63.ebuild1
-rw-r--r--dev-java/javassist/javassist-2.6-r2.ebuild1
-rw-r--r--dev-java/javassist/javassist-3.18.2.ebuild1
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild1
-rw-r--r--dev-java/javax-inject/javax-inject-1-r2.ebuild1
-rw-r--r--dev-java/javax-mail/javax-mail-1.4.ebuild1
-rw-r--r--dev-java/javolution/javolution-4.0.2-r1.ebuild1
-rw-r--r--dev-java/javolution/javolution-6.0.0.ebuild1
-rw-r--r--dev-java/jaxen/jaxen-1.1.4-r1.ebuild1
-rw-r--r--dev-java/jaxen/jaxen-1.1.6.ebuild1
-rw-r--r--dev-java/jaxme/jaxme-0.5.2-r2.ebuild1
-rw-r--r--dev-java/jazzy/jazzy-0.5.2-r1.ebuild1
-rw-r--r--dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild1
-rw-r--r--dev-java/jboss-logging/jboss-logging-3.1.4.ebuild1
-rw-r--r--dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild1
-rw-r--r--dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild1
-rw-r--r--dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild1
-rw-r--r--dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild1
-rw-r--r--dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild1
-rw-r--r--dev-java/jboss-modules/jboss-modules-1.3.0.ebuild1
-rw-r--r--dev-java/jboss-modules/jboss-modules-1.3.3.ebuild1
-rw-r--r--dev-java/jcalendar/jcalendar-1.4.ebuild1
-rw-r--r--dev-java/jchardet/jchardet-1.1-r1.ebuild1
-rw-r--r--dev-java/jchart2d/jchart2d-3.2.2.ebuild1
-rw-r--r--dev-java/jcifs/jcifs-1.3.17-r1.ebuild1
-rw-r--r--dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild1
-rw-r--r--dev-java/jclasslib/jclasslib-3.0-r1.ebuild1
-rw-r--r--dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild1
-rw-r--r--dev-java/jcmdline/jcmdline-2.0.0.ebuild1
-rw-r--r--dev-java/jcodings/jcodings-1.0.11.ebuild1
-rw-r--r--dev-java/jcodings/jcodings-1.0.4.ebuild1
-rw-r--r--dev-java/jcodings/jcodings-1.0.5.ebuild1
-rw-r--r--dev-java/jcommander/jcommander-1.48.ebuild1
-rw-r--r--dev-java/jcommon/jcommon-1.0.23.ebuild1
-rw-r--r--dev-java/jcs/jcs-2.0.ebuild1
-rw-r--r--dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild1
-rw-r--r--dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild1
-rw-r--r--dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild1
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild1
-rw-r--r--dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild1
-rw-r--r--dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild1
-rw-r--r--dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild1
-rw-r--r--dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild1
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild1
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild1
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild1
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild1
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild1
-rw-r--r--dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild1
-rw-r--r--dev-java/jdbm/jdbm-0.12-r2.ebuild1
-rw-r--r--dev-java/jdepend/jdepend-2.9-r5.ebuild1
-rw-r--r--dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild1
-rw-r--r--dev-java/jdom/jdom-1.0-r2.ebuild1
-rw-r--r--dev-java/jdom/jdom-1.0-r4.ebuild1
-rw-r--r--dev-java/jdom/jdom-1.1.3.ebuild1
-rw-r--r--dev-java/jdom/jdom-2.0.6-r4.ebuild1
-rw-r--r--dev-java/jdynamite/jdynamite-1.2-r1.ebuild1
-rw-r--r--dev-java/jebl/jebl-2013.02.18.ebuild1
-rw-r--r--dev-java/jempbox/jempbox-1.7.1.ebuild1
-rw-r--r--dev-java/jempbox/jempbox-1.8.11.ebuild1
-rw-r--r--dev-java/jettison/jettison-1.3.7.ebuild1
-rw-r--r--dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild1
-rw-r--r--dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild1
-rw-r--r--dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild1
-rw-r--r--dev-java/jffi/jffi-1.2.9.ebuild1
-rw-r--r--dev-java/jflex/jflex-1.6.1.ebuild1
-rw-r--r--dev-java/jformatstring/jformatstring-2.0.3.ebuild1
-rw-r--r--dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild1
-rw-r--r--dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild1
-rw-r--r--dev-java/jfreesvg/jfreesvg-3.0.ebuild1
-rw-r--r--dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild1
-rw-r--r--dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild1
-rw-r--r--dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild1
-rw-r--r--dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild1
-rw-r--r--dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild1
-rw-r--r--dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild1
-rw-r--r--dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild1
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild1
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild1
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild1
-rw-r--r--dev-java/jgraph/jgraph-5.12.0.4.ebuild1
-rw-r--r--dev-java/jgrapht/jgrapht-0.8.3.ebuild1
-rw-r--r--dev-java/jgroups/jgroups-2.9.0.ebuild1
-rw-r--r--dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild1
-rw-r--r--dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild1
-rw-r--r--dev-java/jibx/jibx-1.1.5-r1.ebuild1
-rw-r--r--dev-java/jibx/jibx-1.1.5-r2.ebuild1
-rw-r--r--dev-java/jibx/jibx-1.2.6.ebuild1
-rw-r--r--dev-java/jicmp/jicmp-1.0.2.ebuild1
-rw-r--r--dev-java/jid3/jid3-0.46-r2.ebuild1
-rw-r--r--dev-java/jide-oss/jide-oss-3.6.12.ebuild1
-rw-r--r--dev-java/jikes/jikes-1.22-r13.ebuild1
-rw-r--r--dev-java/jinklevel/jinklevel-0.1.ebuild1
-rw-r--r--dev-java/jinput/jinput-2.0.6-r1.ebuild1
-rw-r--r--dev-java/jisp/jisp-2.5.1-r3.ebuild1
-rw-r--r--dev-java/jlayer/jlayer-1.0.1.ebuild1
-rw-r--r--dev-java/jlex/jlex-1.2.6-r2.ebuild1
-rw-r--r--dev-java/jlfgr/jlfgr-1.0-r2.ebuild1
-rw-r--r--dev-java/jlibeps/jlibeps-0.1-r1.ebuild1
-rw-r--r--dev-java/jline/jline-1.0.ebuild1
-rw-r--r--dev-java/jline/jline-2.12.1-r1.ebuild1
-rw-r--r--dev-java/jmdns/jmdns-3.4.1-r1.ebuild1
-rw-r--r--dev-java/jmh-core/jmh-core-1.4.1.ebuild1
-rw-r--r--dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild1
-rw-r--r--dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild1
-rw-r--r--dev-java/jmock/jmock-1.2.0-r1.ebuild1
-rw-r--r--dev-java/jmock/jmock-2.6.1.ebuild1
-rw-r--r--dev-java/jna/jna-3.4.1.ebuild1
-rw-r--r--dev-java/jna/jna-4.2.2-r1.ebuild1
-rw-r--r--dev-java/jnlp-api/jnlp-api-6.0.18.ebuild1
-rw-r--r--dev-java/jnr-constants/jnr-constants-0.8.6.ebuild1
-rw-r--r--dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild1
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild1
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild1
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.0.10.ebuild1
-rw-r--r--dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild1
-rw-r--r--dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild1
-rw-r--r--dev-java/joda-convert/joda-convert-1.3.1.ebuild1
-rw-r--r--dev-java/joda-time/joda-time-2.7.ebuild1
-rw-r--r--dev-java/joni/joni-2.1.0.ebuild1
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.6.ebuild1
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.8.ebuild1
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.9.ebuild1
-rw-r--r--dev-java/jortho/jortho-1.0.ebuild1
-rw-r--r--dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild1
-rw-r--r--dev-java/jrexx/jrexx-1.1.1-r2.ebuild1
-rw-r--r--dev-java/jrobin/jrobin-1.6.0-r1.ebuild1
-rw-r--r--dev-java/jrrd/jrrd-1.0.1-r1.ebuild1
-rw-r--r--dev-java/jruby/jruby-1.7.12.ebuild1
-rw-r--r--dev-java/jsap/jsap-2.1-r2.ebuild1
-rw-r--r--dev-java/jsch/jsch-0.1.52.ebuild1
-rw-r--r--dev-java/json-simple/json-simple-1.1.ebuild1
-rw-r--r--dev-java/json/json-20150729.ebuild1
-rw-r--r--dev-java/json/json-20160212.ebuild1
-rw-r--r--dev-java/jsoup/jsoup-1.8.3.ebuild1
-rw-r--r--dev-java/jspeex/jspeex-0.9.7-r1.ebuild1
-rw-r--r--dev-java/jsr101/jsr101-1.4-r3.ebuild1
-rw-r--r--dev-java/jsr173/jsr173-1.0-r1.ebuild1
-rw-r--r--dev-java/jsr173/jsr173-1.0-r2.ebuild1
-rw-r--r--dev-java/jsr173/jsr173-1.0-r3.ebuild1
-rw-r--r--dev-java/jsr181/jsr181-1.0-r2.ebuild1
-rw-r--r--dev-java/jsr223/jsr223-1.0-r2.ebuild1
-rw-r--r--dev-java/jsr225/jsr225-1.0.ebuild1
-rw-r--r--dev-java/jsr250/jsr250-1.2.ebuild1
-rw-r--r--dev-java/jsr305/jsr305-3.0.1.ebuild1
-rw-r--r--dev-java/jsr311-api/jsr311-api-1.1.1.ebuild1
-rw-r--r--dev-java/jsr322/jsr322-1.5.ebuild1
-rw-r--r--dev-java/jsr67/jsr67-1.3-r1.ebuild1
-rw-r--r--dev-java/jss/jss-4.3.2.ebuild1
-rw-r--r--dev-java/jssc/jssc-2.8.0-r1.ebuild1
-rw-r--r--dev-java/jstun/jstun-0.7.3.ebuild1
-rw-r--r--dev-java/jta/jta-1.0.1-r1.ebuild1
-rw-r--r--dev-java/jta/jta-1.1.ebuild1
-rw-r--r--dev-java/jtds/jtds-1.3.1.ebuild1
-rw-r--r--dev-java/jtidy/jtidy-1.0.ebuild1
-rw-r--r--dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild1
-rw-r--r--dev-java/jts-core/jts-core-1.14.ebuild1
-rw-r--r--dev-java/juel/juel-2.1.0-r2.ebuild1
-rw-r--r--dev-java/jump/jump-0.5-r1.ebuild1
-rw-r--r--dev-java/jung/jung-1.7.6-r1.ebuild1
-rw-r--r--dev-java/jung/jung-1.7.6.ebuild1
-rw-r--r--dev-java/junit-addons/junit-addons-1.4-r1.ebuild1
-rw-r--r--dev-java/junit/junit-3.8.2-r1.ebuild1
-rw-r--r--dev-java/junit/junit-4.12-r1.ebuild1
-rw-r--r--dev-java/junitperf/junitperf-1.9.1-r2.ebuild1
-rw-r--r--dev-java/junrar/junrar-0.6.ebuild1
-rw-r--r--dev-java/jupidator/jupidator-0.6.0-r1.ebuild1
-rw-r--r--dev-java/jupidator/jupidator-0.6.0.ebuild1
-rw-r--r--dev-java/jusb/jusb-0.4.4-r1.ebuild1
-rw-r--r--dev-java/jutils/jutils-1.0.0-r1.ebuild1
-rw-r--r--dev-java/jvmstat/jvmstat-3.0.ebuild1
-rw-r--r--dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild1
-rw-r--r--dev-java/jvyamlb/jvyamlb-0.2.5.ebuild1
-rw-r--r--dev-java/jython/jython-2.7.0-r1.ebuild1
-rw-r--r--dev-java/jython/jython-2.7.0.ebuild1
-rw-r--r--dev-java/jzlib/jzlib-1.0.7-r2.ebuild1
-rw-r--r--dev-java/jzlib/jzlib-1.1.1.ebuild1
-rw-r--r--dev-java/jzlib/jzlib-1.1.3.ebuild1
-rw-r--r--dev-java/kryo/kryo-2.24.0.ebuild1
-rw-r--r--dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild1
-rw-r--r--dev-java/kxml/kxml-2.3.0.ebuild1
-rw-r--r--dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild1
-rw-r--r--dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild1
-rw-r--r--dev-java/laf-plugin/laf-plugin-1.1.ebuild1
-rw-r--r--dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild1
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild1
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild1
-rw-r--r--dev-java/libg/libg-2.1.0-r1.ebuild1
-rw-r--r--dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild1
-rw-r--r--dev-java/libmso/libmso-0.1.ebuild1
-rw-r--r--dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild1
-rw-r--r--dev-java/log4j/log4j-1.2.17-r3.ebuild1
-rw-r--r--dev-java/logback/logback-1.0.13-r1.ebuild1
-rw-r--r--dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild1
-rw-r--r--dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild1
-rw-r--r--dev-java/lucene/lucene-1.4.3-r3.ebuild1
-rw-r--r--dev-java/lucene/lucene-2.4.1-r1.ebuild1
-rw-r--r--dev-java/lucene/lucene-3.5.0.ebuild1
-rw-r--r--dev-java/lucene/lucene-3.6.2.ebuild1
-rw-r--r--dev-java/lzma/lzma-9.18.ebuild1
-rw-r--r--dev-java/lzmajio/lzmajio-0.95-r1.ebuild1
-rw-r--r--dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-1.1-r3.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-3.1.1.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-3.2.5.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild1
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.9.ebuild1
-rw-r--r--dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild1
-rw-r--r--dev-java/mchange-commons/mchange-commons-0.2.10.ebuild1
-rw-r--r--dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild1
-rw-r--r--dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild1
-rw-r--r--dev-java/metainf-services/metainf-services-1.6.ebuild1
-rw-r--r--dev-java/metainf-services/metainf-services-1.7.ebuild1
-rw-r--r--dev-java/microba/microba-0.4.4.3.ebuild1
-rw-r--r--dev-java/miglayout/miglayout-4.0.ebuild1
-rw-r--r--dev-java/milton-api/milton-api-2.7.1.3.ebuild1
-rw-r--r--dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild1
-rw-r--r--dev-java/mimepull/mimepull-1.8.ebuild1
-rw-r--r--dev-java/mimepull/mimepull-1.9.6-r1.ebuild1
-rw-r--r--dev-java/mina-core/mina-core-1.1.7.ebuild1
-rw-r--r--dev-java/mina-core/mina-core-2.0.7.ebuild1
-rw-r--r--dev-java/minlog/minlog-1.2.ebuild1
-rw-r--r--dev-java/mockito/mockito-1.9.5-r1.ebuild1
-rw-r--r--dev-java/mojarra/mojarra-2.2.12-r1.ebuild1
-rw-r--r--dev-java/moshi/moshi-1.1.0.ebuild1
-rw-r--r--dev-java/msv/msv-20130601.ebuild1
-rw-r--r--dev-java/myfaces-api/myfaces-api-2.2.8.ebuild1
-rw-r--r--dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild1
-rw-r--r--dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild1
-rw-r--r--dev-java/nailgun/nailgun-0.7.1-r1.ebuild1
-rw-r--r--dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild1
-rw-r--r--dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild1
-rw-r--r--dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild1
-rw-r--r--dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild1
-rw-r--r--dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild1
-rw-r--r--dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild1
-rw-r--r--dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild1
-rw-r--r--dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild1
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild1
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild1
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild1
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild1
-rw-r--r--dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild1
-rw-r--r--dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild1
-rw-r--r--dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-extide/netbeans-extide-8.1.ebuild1
-rw-r--r--dev-java/netbeans-extide/netbeans-extide-8.2.ebuild1
-rw-r--r--dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild1
-rw-r--r--dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild1
-rw-r--r--dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-harness/netbeans-harness-8.1.ebuild1
-rw-r--r--dev-java/netbeans-harness/netbeans-harness-8.2.ebuild1
-rw-r--r--dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild1
-rw-r--r--dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild1
-rw-r--r--dev-java/netbeans-ide/netbeans-ide-8.2.ebuild1
-rw-r--r--dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild1
-rw-r--r--dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild1
-rw-r--r--dev-java/netbeans-java/netbeans-java-8.2.ebuild1
-rw-r--r--dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild1
-rw-r--r--dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild1
-rw-r--r--dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild1
-rw-r--r--dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild1
-rw-r--r--dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild1
-rw-r--r--dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild1
-rw-r--r--dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild1
-rw-r--r--dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild1
-rw-r--r--dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-nb/netbeans-nb-8.1.ebuild1
-rw-r--r--dev-java/netbeans-nb/netbeans-nb-8.2.ebuild1
-rw-r--r--dev-java/netbeans-php/netbeans-php-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-php/netbeans-php-8.1.ebuild1
-rw-r--r--dev-java/netbeans-php/netbeans-php-8.2.ebuild1
-rw-r--r--dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-platform/netbeans-platform-8.1.ebuild1
-rw-r--r--dev-java/netbeans-platform/netbeans-platform-8.2.ebuild1
-rw-r--r--dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild1
-rw-r--r--dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild1
-rw-r--r--dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild1
-rw-r--r--dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild1
-rw-r--r--dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild1
-rw-r--r--dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild1
-rw-r--r--dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild1
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.21.ebuild1
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.36.ebuild1
-rw-r--r--dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild1
-rw-r--r--dev-java/netty-codec/netty-codec-4.0.36.ebuild1
-rw-r--r--dev-java/netty-common/netty-common-4.0.21.ebuild1
-rw-r--r--dev-java/netty-common/netty-common-4.0.36.ebuild1
-rw-r--r--dev-java/netty-handler/netty-handler-4.0.36.ebuild1
-rw-r--r--dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild1
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild1
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.36.ebuild1
-rw-r--r--dev-java/neuroph/neuroph-2.3.1.ebuild1
-rw-r--r--dev-java/neuroph/neuroph-2.3.ebuild1
-rw-r--r--dev-java/neuroph/neuroph-2.4.ebuild1
-rw-r--r--dev-java/objenesis/objenesis-1.3.ebuild1
-rw-r--r--dev-java/odfdom/odfdom-0.8.6-r1.ebuild1
-rw-r--r--dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild1
-rw-r--r--dev-java/ognl/ognl-3.0.8.ebuild1
-rw-r--r--dev-java/okio/okio-1.11.0.ebuild1
-rw-r--r--dev-java/opencsv/opencsv-2.3.ebuild1
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild1
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild1
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild1
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild1
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild1
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild1
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild1
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild1
-rw-r--r--dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild1
-rw-r--r--dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild1
-rw-r--r--dev-java/osgi-obr/osgi-obr-1.0.2.ebuild1
-rw-r--r--dev-java/pat/pat-1.5.3-r1.ebuild1
-rw-r--r--dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild1
-rw-r--r--dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild1
-rw-r--r--dev-java/pdfbox/pdfbox-1.8.11.ebuild1
-rw-r--r--dev-java/piccolo/piccolo-1.04.ebuild1
-rw-r--r--dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild1
-rw-r--r--dev-java/picocontainer/picocontainer-1.1-r1.ebuild1
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild1
-rw-r--r--dev-java/portletapi/portletapi-1.0-r1.ebuild1
-rw-r--r--dev-java/portletapi/portletapi-2.0-r1.ebuild1
-rw-r--r--dev-java/prefuse/prefuse-20071021_beta.ebuild1
-rw-r--r--dev-java/proguard/proguard-4.5.ebuild1
-rw-r--r--dev-java/proguard/proguard-4.7.ebuild1
-rw-r--r--dev-java/proguard/proguard-4.8.ebuild1
-rw-r--r--dev-java/proguard/proguard-5.2.1.ebuild1
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild1
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.0.2.ebuild1
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.1.0.ebuild1
-rw-r--r--dev-java/qdox/qdox-1.12.1-r1.ebuild1
-rw-r--r--dev-java/qdox/qdox-1.6.3.ebuild1
-rw-r--r--dev-java/radeox/radeox-1.0_beta2-r1.ebuild1
-rw-r--r--dev-java/rat/rat-0.11.ebuild1
-rw-r--r--dev-java/reflectasm/reflectasm-1.11.0.ebuild1
-rw-r--r--dev-java/reflectasm/reflectasm-1.11.1.ebuild1
-rw-r--r--dev-java/reflections/reflections-0.9.10-r1.ebuild1
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild1
-rw-r--r--dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild1
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild1
-rw-r--r--dev-java/rhino/rhino-1.7.7-r1.ebuild1
-rw-r--r--dev-java/rngom/rngom-20100718-r1.ebuild1
-rw-r--r--dev-java/rome/rome-0.9-r2.ebuild1
-rw-r--r--dev-java/rome/rome-0.9-r3.ebuild1
-rw-r--r--dev-java/rundoc/rundoc-0.11-r1.ebuild1
-rw-r--r--dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild1
-rw-r--r--dev-java/rxtx/rxtx-2.2_pre2.ebuild1
-rw-r--r--dev-java/saaj/saaj-1.3.19-r1.ebuild1
-rw-r--r--dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild1
-rw-r--r--dev-java/sablecc/sablecc-3.7-r1.ebuild1
-rw-r--r--dev-java/sac/sac-1.3-r2.ebuild1
-rw-r--r--dev-java/sat4j-core/sat4j-core-2.2.0.ebuild1
-rw-r--r--dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild1
-rw-r--r--dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild1
-rw-r--r--dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild1
-rw-r--r--dev-java/sax/sax-2.2.1-r2.ebuild1
-rw-r--r--dev-java/sax/sax-2.2.1-r3.ebuild1
-rw-r--r--dev-java/saxon/saxon-6.5.5-r1.ebuild1
-rw-r--r--dev-java/saxon/saxon-6.5.5.ebuild1
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r1.ebuild1
-rw-r--r--dev-java/saxon/saxon-9.2.0.6.ebuild1
-rw-r--r--dev-java/saxpath/saxpath-1.0-r2.ebuild1
-rw-r--r--dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild1
-rw-r--r--dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild1
-rw-r--r--dev-java/sbt-bin/sbt-bin-0.12.4.ebuild1
-rw-r--r--dev-java/sbt-bin/sbt-bin-0.13.6.ebuild1
-rw-r--r--dev-java/sbt-bin/sbt-bin-0.13.7.ebuild1
-rw-r--r--dev-java/sbt-bin/sbt-bin-0.13.8.ebuild1
-rw-r--r--dev-java/sbt-bin/sbt-bin-0.13.9.ebuild1
-rw-r--r--dev-java/sbt/sbt-0.13.10_rc2.ebuild1
-rw-r--r--dev-java/sbt/sbt-0.13.11.ebuild1
-rw-r--r--dev-java/sbt/sbt-0.13.13.ebuild1
-rw-r--r--dev-java/sbt/sbt-0.13.8-r1.ebuild1
-rw-r--r--dev-java/servletapi/servletapi-2.2-r3.ebuild1
-rw-r--r--dev-java/servletapi/servletapi-2.3-r3.ebuild1
-rw-r--r--dev-java/servletapi/servletapi-2.4-r5.ebuild1
-rw-r--r--dev-java/shared-objects/shared-objects-1.4-r4.ebuild1
-rw-r--r--dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild1
-rw-r--r--dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild1
-rw-r--r--dev-java/skinlf/skinlf-6.7-r1.ebuild1
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.7.ebuild1
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild1
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild1
-rw-r--r--dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild1
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild1
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild1
-rw-r--r--dev-java/smack/smack-2.2.1.ebuild1
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.16.ebuild1
-rw-r--r--dev-java/snappy/snappy-1.0.3_rc3.ebuild1
-rw-r--r--dev-java/snappy/snappy-1.1.0.1.ebuild1
-rw-r--r--dev-java/snip/snip-0.11-r1.ebuild1
-rw-r--r--dev-java/spice-jndikit/spice-jndikit-1.2.ebuild1
-rw-r--r--dev-java/spice-jndikit/spice-jndikit-1.4.ebuild1
-rw-r--r--dev-java/spin/spin-1.5-r1.ebuild1
-rw-r--r--dev-java/spring-aop/spring-aop-3.2.4.ebuild1
-rw-r--r--dev-java/spring-beans/spring-beans-3.2.4.ebuild1
-rw-r--r--dev-java/spring-core/spring-core-3.2.4.ebuild1
-rw-r--r--dev-java/spring-expression/spring-expression-3.2.4.ebuild1
-rw-r--r--dev-java/spring-instrument/spring-instrument-3.2.4.ebuild1
-rw-r--r--dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild1
-rw-r--r--dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild1
-rw-r--r--dev-java/stax-ex/stax-ex-1.0-r4.ebuild1
-rw-r--r--dev-java/stax-ex/stax-ex-1.7.6.ebuild1
-rw-r--r--dev-java/stax/stax-1.2.0.ebuild1
-rw-r--r--dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild1
-rw-r--r--dev-java/stax2-api/stax2-api-4.0.0.ebuild1
-rw-r--r--dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild1
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.0.8.ebuild1
-rw-r--r--dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild1
-rw-r--r--dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild1
-rw-r--r--dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild1
-rw-r--r--dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild1
-rw-r--r--dev-java/sun-jaf/sun-jaf-1.1.1.ebuild1
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild1
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild1
-rw-r--r--dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild1
-rw-r--r--dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild1
-rw-r--r--dev-java/sun-javamail/sun-javamail-1.4.3.ebuild1
-rw-r--r--dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild1
-rw-r--r--dev-java/sun-jms/sun-jms-1.1-r2.ebuild1
-rw-r--r--dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild1
-rw-r--r--dev-java/super-csv/super-csv-2.3.1.ebuild1
-rw-r--r--dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild1
-rw-r--r--dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild1
-rw-r--r--dev-java/swidgets/swidgets-0.1.1-r1.ebuild1
-rw-r--r--dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild1
-rw-r--r--dev-java/swing-layout/swing-layout-1.0.4.ebuild1
-rw-r--r--dev-java/swing-worker/swing-worker-1.1.ebuild1
-rw-r--r--dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild1
-rw-r--r--dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild1
-rw-r--r--dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild1
-rw-r--r--dev-java/swingx/swingx-1.6.4.ebuild1
-rw-r--r--dev-java/swt/swt-3.5.2.ebuild1
-rw-r--r--dev-java/swt/swt-3.7.2-r1.ebuild1
-rw-r--r--dev-java/swt/swt-3.8.2-r1.ebuild1
-rw-r--r--dev-java/swt/swt-4.2-r2.ebuild1
-rw-r--r--dev-java/tablelayout/tablelayout-1.0.ebuild1
-rw-r--r--dev-java/tagsoup/tagsoup-1.2.1.ebuild1
-rw-r--r--dev-java/tapestry/tapestry-3.0.4-r2.ebuild1
-rw-r--r--dev-java/telnetd/telnetd-2.0-r1.ebuild1
-rw-r--r--dev-java/testng/testng-6.9.10.ebuild1
-rw-r--r--dev-java/texhyphj/texhyphj-1.1.ebuild1
-rw-r--r--dev-java/tijmp/tijmp-0.8.ebuild1
-rw-r--r--dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild1
-rw-r--r--dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild1
-rw-r--r--dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild1
-rw-r--r--dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.10.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.12.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.4.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.7.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.8.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.73.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.75.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.39.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.41.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.9.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild1
-rw-r--r--dev-java/toolbar/toolbar-1.1.0-r2.ebuild1
-rw-r--r--dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild1
-rw-r--r--dev-java/treelayout/treelayout-1.0.2.ebuild1
-rw-r--r--dev-java/trident/trident-1.3.ebuild1
-rw-r--r--dev-java/trove/trove-2.1.0.ebuild1
-rw-r--r--dev-java/trove/trove-3.0.2-r1.ebuild1
-rw-r--r--dev-java/trove/trove-3.0.2-r2.ebuild1
-rw-r--r--dev-java/trove/trove-3.0.2.ebuild1
-rw-r--r--dev-java/txw2-runtime/txw2-runtime-20110809.ebuild1
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.2.1.ebuild1
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild1
-rw-r--r--dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild1
-rw-r--r--dev-java/upnplib/upnplib-1.0.7.ebuild1
-rw-r--r--dev-java/validation-api/validation-api-1.1.0.ebuild1
-rw-r--r--dev-java/vecmath/vecmath-1.6.0_pre12.ebuild1
-rw-r--r--dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild1
-rw-r--r--dev-java/velocity/velocity-1.7-r2.ebuild1
-rw-r--r--dev-java/vldocking/vldocking-3.0.5.ebuild1
-rw-r--r--dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild1
-rw-r--r--dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild1
-rw-r--r--dev-java/wsdl4j/wsdl4j-1.6.2.ebuild1
-rw-r--r--dev-java/wstx/wstx-3.2.9-r1.ebuild1
-rw-r--r--dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild1
-rw-r--r--dev-java/xalan/xalan-2.7.2.ebuild1
-rw-r--r--dev-java/xerces/xerces-2.11.0-r1.ebuild1
-rw-r--r--dev-java/xerces/xerces-2.11.0.ebuild1
-rw-r--r--dev-java/xerial-core/xerial-core-2.0.1.ebuild1
-rw-r--r--dev-java/xjavac/xjavac-20110814.ebuild1
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild1
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild1
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild1
-rw-r--r--dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild1
-rw-r--r--dev-java/xml-commons/xml-commons-1.4.01.ebuild1
-rw-r--r--dev-java/xml-security/xml-security-1.5.7-r1.ebuild1
-rw-r--r--dev-java/xml-writer/xml-writer-0.2-r1.ebuild1
-rw-r--r--dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild1
-rw-r--r--dev-java/xmldb/xmldb-20011111-r1.ebuild1
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild1
-rw-r--r--dev-java/xmlrpc/xmlrpc-3.1.3.ebuild1
-rw-r--r--dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild1
-rw-r--r--dev-java/xmlunit/xmlunit-1.6.ebuild1
-rw-r--r--dev-java/xmpcore/xmpcore-5.1.2.ebuild1
-rw-r--r--dev-java/xom/xom-1.2.10.ebuild1
-rw-r--r--dev-java/xp/xp-0.5-r3.ebuild1
-rw-r--r--dev-java/xpp2/xpp2-2.1.10-r2.ebuild1
-rw-r--r--dev-java/xpp3/xpp3-1.1.4c-r3.ebuild1
-rw-r--r--dev-java/xsdlib/xsdlib-20090415.ebuild1
-rw-r--r--dev-java/xsom/xsom-20140925.ebuild1
-rw-r--r--dev-java/xstream/xstream-1.4.8-r1.ebuild1
-rw-r--r--dev-java/xstream/xstream-1.4.8-r2.ebuild1
-rw-r--r--dev-java/xz-java/xz-java-1.5.ebuild1
-rw-r--r--dev-java/xz-java/xz-java-1.6.ebuild1
-rw-r--r--dev-java/yanfs/yanfs-1.0.ebuild1
-rw-r--r--dev-java/zemberek/zemberek-2.1.1.ebuild1
-rw-r--r--dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild1
882 files changed, 0 insertions, 882 deletions
diff --git a/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
index 5882af37c8b0..cdcf73e5abab 100644
--- a/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
+++ b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/airline/airline-0.7-r1.ebuild b/dev-java/airline/airline-0.7-r1.ebuild
index 867fd7e3d057..acbb765ec82f 100644
--- a/dev-java/airline/airline-0.7-r1.ebuild
+++ b/dev-java/airline/airline-0.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/android-util/android-util-4.1.1.4.ebuild b/dev-java/android-util/android-util-4.1.1.4.ebuild
index cc180cada2ab..eac7470ca94c 100644
--- a/dev-java/android-util/android-util-4.1.1.4.ebuild
+++ b/dev-java/android-util/android-util-4.1.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
index ec63e0335ec7..b93151838334 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
index 96d70fd8e2e3..46ffd305b870 100644
--- a/dev-java/annogen/annogen-0.1.0-r3.ebuild
+++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
index 1ae1dd149ec0..6c8721c75252 100644
--- a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
index 2b34254bb91c..b39e39879154 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
index 2ce9270b4094..ddf3c4154b14 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
index 23bfe344e9f1..cf479cda65cb 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
index cc6227a86d6a..593cd1953176 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
index 77306047cae1..4465d09e18d1 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
index f19a2a6eb98f..8c6678ff70e1 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
index b1e9e08624c9..db78e8f433a2 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
index 93bb5b9d2647..2ca3455abc4a 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
index 74ee93b4f624..b9e768e4fc32 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
index fb7d132a09b4..bfdbdfafdfa6 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
index 70b3f09e1d44..e4d590a7e845 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 98a86f23a940..571c56636156 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
index e82ab821b68c..1f176373088e 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index 67a85ed47c44..a18201abd582 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
index e6a4b246939c..82815eb9ed9f 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
index 880abd2a8560..02604ee8fdd5 100644
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index 5c049d50e81d..e480764befa7 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
index bde6e7d36fac..aa8ea1ea251c 100644
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index 51548c1c556e..02b41428352b 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-jai/ant-jai-1.9.2.ebuild b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
index df2a93d1eeaf..f0535e9d7c1d 100644
--- a/dev-java/ant-jai/ant-jai-1.9.2.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
index 1718eb1f134c..d5c3729c5148 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
index 81c176ec1e68..be9d489b1ce9 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
index 76df87e47bc4..f808cbe1d6d8 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
index 5934fdb757ca..ab8386e7cffa 100644
--- a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
index a1eb050687b5..2c3a6d228113 100644
--- a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
index 0ddb68c40993..9846d7e903aa 100644
--- a/dev-java/ant-junit/ant-junit-1.9.2.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
index ad1d674d728b..c9eafe457a6d 100644
--- a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
index 8d8fc7ab5ce6..4e74b362cd6e 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
index 77bd38cb29b2..160cf111ab41 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ant-swing/ant-swing-1.9.2.ebuild b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
index 4ffbf6970251..4885f92ae62c 100644
--- a/dev-java/ant-swing/ant-swing-1.9.2.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
index 7cecb662a9f2..b3690e3f151e 100644
--- a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
index 1fdc22af9dfe..ea41617835ec 100644
--- a/dev-java/ant-trax/ant-trax-1.9.2.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
index 26157cba8dd6..ab04f04399ef 100644
--- a/dev-java/ant/ant-1.9.2.ebuild
+++ b/dev-java/ant/ant-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 9499bd4010f1..3eae09ac430b 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 176dbdec3e86..42cde6897ec5 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index a8b238157f22..46c6402f4b20 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 193cef0db20d..a7c4c1ffbb73 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index f5a598bf03af..3b48b132714c 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index bc08a5c630f4..be64f368d971 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/appframework/appframework-1.03-r4.ebuild b/dev-java/appframework/appframework-1.03-r4.ebuild
index f45f34a5fe8c..c5c0fbd729f7 100644
--- a/dev-java/appframework/appframework-1.03-r4.ebuild
+++ b/dev-java/appframework/appframework-1.03-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
index 20bd1fd8bbc1..2a587c9f0fe5 100644
--- a/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
index eec5f753555b..67d7bdd5497b 100644
--- a/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
+++ b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/args4j/args4j-2.32.ebuild b/dev-java/args4j/args4j-2.32.ebuild
index d9404a002ac1..be60edae23d1 100644
--- a/dev-java/args4j/args4j-2.32.ebuild
+++ b/dev-java/args4j/args4j-2.32.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
index 67cfca5f59c6..06754913be5a 100644
--- a/dev-java/asm/asm-3.3.1-r1.ebuild
+++ b/dev-java/asm/asm-3.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
index e9b62a808956..377be8c880fd 100644
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
OLD_P="${PN}-4.0"
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
index 414109a8832c..43675d631d19 100644
--- a/dev-java/asm/asm-5.1.ebuild
+++ b/dev-java/asm/asm-5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
OLD_P="${PN}-4.0"
diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
index 629db6c1cee7..316152059dfc 100644
--- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/aspectj/aspectj-1.7.4.ebuild b/dev-java/aspectj/aspectj-1.7.4.ebuild
index 4c24f5610839..4a9e2ff58cd1 100644
--- a/dev-java/aspectj/aspectj-1.7.4.ebuild
+++ b/dev-java/aspectj/aspectj-1.7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
index f7b3cf42aefe..065a36adbeed 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index 9ab977bf2f97..91a7684c2add 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
index 939c5218ae5a..bbd4ad97dcc0 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
index 64a26f441eb8..5363933b783d 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index 6873098544af..6a57669a88ac 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
index ed209747cf88..7aa5be49916a 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
index 974faa5f4bff..35b170e91a74 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 503d7a264c40..2b1c7be0144c 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
index a00be17803c2..3e86ce6f6466 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/balloontip/balloontip-1.2.1.ebuild b/dev-java/balloontip/balloontip-1.2.1.ebuild
index 1af9e2cbf5a6..8f12b47cfdd6 100644
--- a/dev-java/balloontip/balloontip-1.2.1.ebuild
+++ b/dev-java/balloontip/balloontip-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild
index b7869cc8bbc3..68d9e0c96d64 100644
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ b/dev-java/batik/batik-1.8-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc"
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 9f4e1abd2653..2a4ec01001ce 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.38-r4.ebuild b/dev-java/bcmail/bcmail-1.38-r4.ebuild
index c0470f9cd659..d7599c614658 100644
--- a/dev-java/bcmail/bcmail-1.38-r4.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.38-r5.ebuild b/dev-java/bcmail/bcmail-1.38-r5.ebuild
index cbbf2449b0e1..f1200b3e4cd3 100644
--- a/dev-java/bcmail/bcmail-1.38-r5.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.45-r3.ebuild b/dev-java/bcmail/bcmail-1.45-r3.ebuild
index 6f17478a1303..0efa8ca680eb 100644
--- a/dev-java/bcmail/bcmail-1.45-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.45-r4.ebuild b/dev-java/bcmail/bcmail-1.45-r4.ebuild
index f308e75eeeb4..7126d195d2aa 100644
--- a/dev-java/bcmail/bcmail-1.45-r4.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.50-r2.ebuild
index fa5eb41312e5..dbbcabe543b9 100644
--- a/dev-java/bcmail/bcmail-1.50-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcmail/bcmail-1.52-r2.ebuild b/dev-java/bcmail/bcmail-1.52-r2.ebuild
index b8a2681c0223..93f69809bc24 100644
--- a/dev-java/bcmail/bcmail-1.52-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
index 9593f965aa13..07ea7c547e7b 100644
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.50-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
index 0aece40a7b78..b6d307d74531 100644
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
index 9729af25e093..3f226f1ff42e 100644
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
index 76ce7b19ea7e..d5c1e6bffc5e 100644
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
index f6cb22f679d0..91ee42e0e7f9 100644
--- a/dev-java/bcprov/bcprov-1.38-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
index e17ee8b63204..530e6fb9daf1 100644
--- a/dev-java/bcprov/bcprov-1.40-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
index f90afd231481..a4bdbab2c814 100644
--- a/dev-java/bcprov/bcprov-1.45-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
index 0bcfbad39985..f8982a92a2ed 100644
--- a/dev-java/bcprov/bcprov-1.48-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.48-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
index 3eb4dd1c6ed5..1524fdfa90a3 100644
--- a/dev-java/bcprov/bcprov-1.49-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.49-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
index 6ae7dd36c38a..2b5749707691 100644
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
index a60928ae62bd..ccabfc96056f 100644
--- a/dev-java/bcprov/bcprov-1.50-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index 75f7db823a0e..19461145ea01 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
index 65cbbcbba6e6..46de42c22e14 100644
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
index 160c8dc762f4..1569b79f728f 100644
--- a/dev-java/bcprov/bcprov-1.52-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
index 9563c7b649c2..41830e429220 100644
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
index b75768b35199..81485c298715 100644
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ b/dev-java/bcprov/bcprov-1.54.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bctsp/bctsp-1.45-r1.ebuild b/dev-java/bctsp/bctsp-1.45-r1.ebuild
index 29652e02e741..8bfc4e6882a5 100644
--- a/dev-java/bctsp/bctsp-1.45-r1.ebuild
+++ b/dev-java/bctsp/bctsp-1.45-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild b/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
index 94338ff57f23..0a938cee3c55 100644
--- a/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
+++ b/dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
index e54b2b53a2ba..61fa2f641db2 100644
--- a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
index 69a61b78a010..e4de5405feee 100644
--- a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
+++ b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/bndlib/bndlib-2.1.0.ebuild b/dev-java/bndlib/bndlib-2.1.0.ebuild
index 9ed0303cb76e..c9a398337963 100644
--- a/dev-java/bndlib/bndlib-2.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
index e1009b80eed5..3ec2b0f9e9a7 100644
--- a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
+++ b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/boot-bin/boot-bin-2.6.0.ebuild b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
index 8bf39a4268e2..15ca39c55373 100644
--- a/dev-java/boot-bin/boot-bin-2.6.0.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/boot-bin/boot-bin-2.7.0.ebuild b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
index d514c9d87fe1..8809cdf42e6b 100644
--- a/dev-java/boot-bin/boot-bin-2.7.0.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
index d514c9d87fe1..8809cdf42e6b 100644
--- a/dev-java/boot-bin/boot-bin-2.7.1.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index 901a3433de16..bcf9169c2a40 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 5c1fbd69dd25..d079cbe696f2 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index 0448ab8b3a1f..e0de82482628 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/btf/btf-1.2.ebuild b/dev-java/btf/btf-1.2.ebuild
index 21f7209b79b5..4cb97a387cb2 100644
--- a/dev-java/btf/btf-1.2.ebuild
+++ b/dev-java/btf/btf-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
index 2306bc1a1500..93a04a5adb8e 100644
--- a/dev-java/byaccj/byaccj-1.15-r1.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/bytelist/bytelist-1.0.10.ebuild b/dev-java/bytelist/bytelist-1.0.10.ebuild
index a90d199c6000..437ee575b7ee 100644
--- a/dev-java/bytelist/bytelist-1.0.10.ebuild
+++ b/dev-java/bytelist/bytelist-1.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
index a0788ecb5bfa..70cde9d852e1 100644
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source examples test"
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 21c0b695a163..83bba579bad0 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
index cd92c9ebb049..6be999d8cd5f 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
index 70ac2ae4c91e..4df2e8c05870 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
index de825b1ad47d..bdf05ea4ffb4 100644
--- a/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
+++ b/dev-java/cdi-api/cdi-api-1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/cdi-api/cdi-api-1.2.ebuild b/dev-java/cdi-api/cdi-api-1.2.ebuild
index abbaf2a21112..9396af5ff0b5 100644
--- a/dev-java/cdi-api/cdi-api-1.2.ebuild
+++ b/dev-java/cdi-api/cdi-api-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
index e692eb100fbd..77b6da0046d3 100644
--- a/dev-java/cglib/cglib-3.1.ebuild
+++ b/dev-java/cglib/cglib-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/classmate/classmate-0.9.0-r1.ebuild b/dev-java/classmate/classmate-0.9.0-r1.ebuild
index b5bf3740d007..69414a46c387 100644
--- a/dev-java/classmate/classmate-0.9.0-r1.ebuild
+++ b/dev-java/classmate/classmate-0.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/classmate/classmate-1.0.0.ebuild b/dev-java/classmate/classmate-1.0.0.ebuild
index c67ee19d1b2a..14bf78fc27ec 100644
--- a/dev-java/classmate/classmate-1.0.0.ebuild
+++ b/dev-java/classmate/classmate-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
index 04388ddcd811..d502d5ee9bc9 100644
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
index 31860abf083f..87e008a138f6 100644
--- a/dev-java/codemodel/codemodel-2.6.ebuild
+++ b/dev-java/codemodel/codemodel-2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/cofoja/cofoja-1.2.ebuild b/dev-java/cofoja/cofoja-1.2.ebuild
index 1ea4304dcc6d..9848bd6a3251 100644
--- a/dev-java/cofoja/cofoja-1.2.ebuild
+++ b/dev-java/cofoja/cofoja-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index d9b814a4e415..118e1c232f82 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index b49fb15afa59..25e6206fbe83 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
index 9fdfd0f0fec9..e854dc31be19 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="doc test source"
diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild
index 3a14fa572652..18ee9cf7307a 100644
--- a/dev-java/commons-chain/commons-chain-1.2.ebuild
+++ b/dev-java/commons-chain/commons-chain-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/commons-cli/commons-cli-1.2.ebuild b/dev-java/commons-cli/commons-cli-1.2.ebuild
index 8f43efcf3525..f5d70a42d390 100644
--- a/dev-java/commons-cli/commons-cli-1.2.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Upstream switched to Maven as a build system. Current build.xml file was generated by running mvn ant:ant
# A bit of tweaking was required unfortunately
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index 9e6b03478cd5..e047a4e68228 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index e6960e7dc258..a4da5c3a9be3 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index d6c76120b96c..626699b69f79 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 7af72932698e..3f442ecfe0e9 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
index a6326c38ccd2..16bb6d93d8e1 100644
--- a/dev-java/commons-compress/commons-compress-1.10.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index bbf7ebc81bcd..811493b46bd9 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
index 97b129d23061..8061d6a33f17 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
index 011fa9ee4cd0..ea6fe6814c80 100644
--- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
index b76f51a783e2..f58f08c36763 100644
--- a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
+++ b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index 68b28d86b3bd..edc57c6fcb2e 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index e89ed137d4fd..f50f842a84f7 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index 85f9630087b8..ebdfc5a580c5 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-discovery/commons-discovery-0.5.ebuild b/dev-java/commons-discovery/commons-discovery-0.5.ebuild
index 35941a1b5ca4..207d11d62daf 100644
--- a/dev-java/commons-discovery/commons-discovery-0.5.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
index 9f8233583c5d..f71ae892d58e 100644
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
index c7d4aeff5a61..ebcea82ec21e 100644
--- a/dev-java/commons-email/commons-email-1.4.ebuild
+++ b/dev-java/commons-email/commons-email-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="source doc test"
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index 572aeb21bb6f..039cb8b41afa 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-graph/commons-graph-0.1.ebuild b/dev-java/commons-graph/commons-graph-0.1.ebuild
index 643324b00799..e69c8cb2f871 100644
--- a/dev-java/commons-graph/commons-graph-0.1.ebuild
+++ b/dev-java/commons-graph/commons-graph-0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
index d91986bde731..d72a6b096347 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
index f3b7486b5a8f..f8c2ba3f2ef3 100644
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 54b9c5fb4be6..59a9f47dbd65 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
index b55dbf897f99..00885443116b 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 0410ea326ee8..236a5c1dcd70 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
index 22b774f20d92..56f6b9d70a55 100644
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
index 6c28a864a38c..cfce6725e13d 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild
index 660c02a16134..c54cb7ffb629 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
index 864398cc58d8..a488095444e0 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
index f3a2d03f0baa..56f3b88e3f97 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index 7f26489045b6..10a1b6a7e15d 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index c62a8016c18b..7d5d118f82c1 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
index da5371765fd0..265797d8aade 100644
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index e45068646e0a..1a5ef8b518fe 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
index cd3718c5dc77..ccf3f9c9f688 100644
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
index eb9a23616a55..3d86cdb82e40 100644
--- a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index 81ac713b6278..d3522a12fd78 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index 2d88309a23e5..09827babecab 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/commons-math/commons-math-2.1-r1.ebuild b/dev-java/commons-math/commons-math-2.1-r1.ebuild
index a4500068dc28..09d67fb2b5dd 100644
--- a/dev-java/commons-math/commons-math-2.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-java/commons-math/commons-math-3.2.ebuild b/dev-java/commons-math/commons-math-3.2.ebuild
index d4780c89924d..746cb389e319 100644
--- a/dev-java/commons-math/commons-math-3.2.ebuild
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
index 3a4355478f7e..31c7dfd4180f 100644
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
index d0083ee2681c..fe1f0cc2b5c2 100644
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
index 8b4cd3da85c7..f494ecaeddc9 100644
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
index 4e6ee679662b..35cda4986a67 100644
--- a/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
index f36de6bbe1ca..524cbdb63396 100644
--- a/dev-java/commons-validator/commons-validator-1.4.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
index dc68b2b2c8eb..2158383df9e2 100644
--- a/dev-java/commons-validator/commons-validator-1.4.1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
index 1c29728acc1c..cd41c2e7792a 100644
--- a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
index ebef964920ed..c0b4d9f74835 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild b/dev-java/constantine/constantine-0.7-r1.ebuild
index 2f8036f0a32f..695a644d81af 100644
--- a/dev-java/constantine/constantine-0.7-r1.ebuild
+++ b/dev-java/constantine/constantine-0.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
index 9a8ab3fa2b98..9ef3634a4411 100644
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index 8575d20c7fa4..f15e3481432b 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/cssparser/cssparser-0.9.20.ebuild b/dev-java/cssparser/cssparser-0.9.20.ebuild
index ad7b0b9aa493..14f5c4dd9e7f 100644
--- a/dev-java/cssparser/cssparser-0.9.20.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/cssparser/cssparser-0.9.21.ebuild b/dev-java/cssparser/cssparser-0.9.21.ebuild
index 8c552d748313..f824bbbc2d7e 100644
--- a/dev-java/cssparser/cssparser-0.9.21.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild b/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
index 161da65f9a36..e73a191ddb72 100644
--- a/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
+++ b/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild b/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
index a1b0d7b0441e..81fbd569879c 100644
--- a/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
+++ b/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild b/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
index 8a1420bd5358..348a0cab603d 100644
--- a/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
+++ b/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
index 3bbe2b1129d5..655984b4b0ae 100644
--- a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
+++ b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/dict4j/dict4j-1.1.ebuild b/dev-java/dict4j/dict4j-1.1.ebuild
index 968ae9263480..70e12c0b2ae4 100644
--- a/dev-java/dict4j/dict4j-1.1.ebuild
+++ b/dev-java/dict4j/dict4j-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/disruptor/disruptor-3.2.0.ebuild b/dev-java/disruptor/disruptor-3.2.0.ebuild
index 4c965225f3e9..48b4516d9e18 100644
--- a/dev-java/disruptor/disruptor-3.2.0.ebuild
+++ b/dev-java/disruptor/disruptor-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
index f97620d69440..b40db04e30e0 100644
--- a/dev-java/dnsjava/dnsjava-2.1.6.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
index de43db76bc45..b2e98f812f19 100644
--- a/dev-java/dnsjava/dnsjava-2.1.7.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
index 1dc5c0d8f16c..47c6f4891978 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
index 02fe5622cdaa..de9cd73a50de 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
index 95f3c8c63d5f..1c4ef846e1b7 100644
--- a/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
+++ b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/dynalang/dynalang-0.4-r1.ebuild b/dev-java/dynalang/dynalang-0.4-r1.ebuild
index 8c21637b2d67..f54476109572 100644
--- a/dev-java/dynalang/dynalang-0.4-r1.ebuild
+++ b/dev-java/dynalang/dynalang-0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
index 6f33f2032313..66c2c3b98b5a 100644
--- a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
+++ b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
index a356bc78b72b..21ada349be80 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/easyneurons/easyneurons-2.3.ebuild b/dev-java/easyneurons/easyneurons-2.3.ebuild
index 4720d8d51494..5914dd899827 100644
--- a/dev-java/easyneurons/easyneurons-2.3.ebuild
+++ b/dev-java/easyneurons/easyneurons-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/echo2/echo2-2.1.1.ebuild b/dev-java/echo2/echo2-2.1.1.ebuild
index 26e55743f4ba..02b9fb84f2da 100644
--- a/dev-java/echo2/echo2-2.1.1.ebuild
+++ b/dev-java/echo2/echo2-2.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
index ea32b92ca509..6022a5f62575 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
index 5b341dfe7064..55c7dbb07f31 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
index aad4902843c8..81443014da8f 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index 4d5bf863f09b..06713c71050b 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
index 4086bfcfe01e..9e9f541213dd 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index af4251fecee2..67acbe1e99d8 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 24f420064469..1301f382b5e3 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
index cbcb4eee619d..6625ce2e9267 100644
--- a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
+++ b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ecs/ecs-1.4.2-r2.ebuild b/dev-java/ecs/ecs-1.4.2-r2.ebuild
index 24eb7858f0d1..baa18cc2e5cb 100644
--- a/dev-java/ecs/ecs-1.4.2-r2.ebuild
+++ b/dev-java/ecs/ecs-1.4.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/edtftpj/edtftpj-2.4.0.ebuild b/dev-java/edtftpj/edtftpj-2.4.0.ebuild
index 42edbb1d8d76..098918ea822c 100644
--- a/dev-java/edtftpj/edtftpj-2.4.0.ebuild
+++ b/dev-java/edtftpj/edtftpj-2.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
index 2a2cfde97c6d..ca21347361af 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
index 679a03610b6a..561749bb3911 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/emma/emma-2.0.5312-r3.ebuild b/dev-java/emma/emma-2.0.5312-r3.ebuild
index 15c21da020cd..118e4255dded 100644
--- a/dev-java/emma/emma-2.0.5312-r3.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
index 68defc2056ec..8da81b5af62d 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/ezmorph/ezmorph-1.0.6.ebuild b/dev-java/ezmorph/ezmorph-1.0.6.ebuild
index 4c6abb0b9e7a..688dca1ce89a 100644
--- a/dev-java/ezmorph/ezmorph-1.0.6.ebuild
+++ b/dev-java/ezmorph/ezmorph-1.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
index 2ad3fb127b75..fa7d969540b4 100644
--- a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/fastutil/fastutil-7.0.10.ebuild b/dev-java/fastutil/fastutil-7.0.10.ebuild
index e5d6235dfefe..0ca7d1ce8a0c 100644
--- a/dev-java/fastutil/fastutil-7.0.10.ebuild
+++ b/dev-java/fastutil/fastutil-7.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
index 71521a4f7a4a..0c351f459114 100644
--- a/dev-java/fec/fec-1.0.4-r2.ebuild
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
index e9a3c7a5ed94..52bc02a0e8d1 100644
--- a/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
+++ b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
index 6f0d2e4dafe2..b2f275c09e15 100644
--- a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
+++ b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
index 629d650b34ce..f6a9d2f071d3 100644
--- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/felix-shell/felix-shell-1.4.3.ebuild b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
index 9d4def5161b9..2b1ce8e60499 100644
--- a/dev-java/felix-shell/felix-shell-1.4.3.ebuild
+++ b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/felix-utils/felix-utils-1.2.0.ebuild b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
index 7902027a3c3d..67872db2be2c 100644
--- a/dev-java/felix-utils/felix-utils-1.2.0.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
index 8efab36abe3d..f12bb7a33986 100644
--- a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/fontbox/fontbox-1.7.1.ebuild b/dev-java/fontbox/fontbox-1.7.1.ebuild
index 59c837243658..6937cc0f9a7d 100644
--- a/dev-java/fontbox/fontbox-1.7.1.ebuild
+++ b/dev-java/fontbox/fontbox-1.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
index 5f1a6b903441..2a4069cfa73e 100644
--- a/dev-java/fontbox/fontbox-1.8.11.ebuild
+++ b/dev-java/fontbox/fontbox-1.8.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
index 1e5f9fb34f35..b24807e14b2a 100644
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ b/dev-java/fop/fop-2.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
# be built as it needs forrest which we do not have
diff --git a/dev-java/forehead/forehead-1.0_beta5-r2.ebuild b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
index a029003163f9..1aeac443e5f4 100644
--- a/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
+++ b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
index a25956a48d3f..97a88563854a 100644
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
index ca30a27cbc17..75736b878100 100644
--- a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
+++ b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
index 9df8c8288cd9..597c3c26fadd 100644
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
index 4bab18ceed11..3524b4c57c9e 100644
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
index 9e35fd424d2a..6a523d03f9ac 100644
--- a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
index b59766e69731..15b5b40186ca 100644
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
index ab28fb3da851..1343d8707ff8 100644
--- a/dev-java/freehep-io/freehep-io-2.2.2.ebuild
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/freemarker/freemarker-2.3.13-r2.ebuild b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
index b012abf10496..857f5d7c8520 100644
--- a/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild
index 103c772452bc..cb9e781667ba 100644
--- a/dev-java/freemarker/freemarker-2.3.25.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.25.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/fscript/fscript-1.17-r1.ebuild b/dev-java/fscript/fscript-1.17-r1.ebuild
index c93c5fe9ca63..ec3c1c39692d 100644
--- a/dev-java/fscript/fscript-1.17-r1.ebuild
+++ b/dev-java/fscript/fscript-1.17-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
index 4573771b7efb..3ba35bd4001a 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/geoip-java/geoip-java-1.3.0.ebuild b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
index 768b4ca38f0c..c127dfa89716 100644
--- a/dev-java/geoip-java/geoip-java-1.3.0.ebuild
+++ b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
index 0b081faa2463..3ad3ed6feacd 100644
--- a/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
index ac1857166ef6..0dcfdd9801fe 100644
--- a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index ce2254034950..b02a9bfeab6f 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
index 7ee3ff2d1388..eda5efcfbe4b 100644
--- a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
index bafaff368145..6d4dcfe7cb04 100644
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
index 958d4759b77a..bf1de0a51a36 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
index 8e128bbaf30c..6c68b0fc5c67 100644
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
index 13d03503db45..ea2026b8d59c 100644
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
index 49a68ca5c1e4..555477389da7 100644
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
index c9bce0ef8e17..d2517cd89f51 100644
--- a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
index b8a98f6c0932..9406f606ba30 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
index 446635f90145..3110cb5125f8 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
index f48e7901e2fb..a8d1cb55b48f 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
index a1d8f1ebae5e..7c3c742aeda4 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
index 1ce6ae4f6d41..9d7cea0ce72e 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
index ebfbb6697d6f..31cf502872d3 100644
--- a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
index 86c913d62296..95dacd78c581 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
index 00b42e647f03..f456c17836b1 100644
--- a/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
index 8f1eb92b4fa6..2cddbc54dfff 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gradle-bin/gradle-bin-3.3.ebuild b/dev-java/gradle-bin/gradle-bin-3.3.ebuild
index f4ea90fd066d..31bf0e3ac6a9 100644
--- a/dev-java/gradle-bin/gradle-bin-3.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild
index 012a2cdaba4c..1f2ee906e067 100644
--- a/dev-java/groovy/groovy-2.4.5.ebuild
+++ b/dev-java/groovy/groovy-2.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gson/gson-2.3.1.ebuild b/dev-java/gson/gson-2.3.1.ebuild
index 1dedfbc7de93..7f9566410bf6 100644
--- a/dev-java/gson/gson-2.3.1.ebuild
+++ b/dev-java/gson/gson-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gson/gson-2.6.2.ebuild b/dev-java/gson/gson-2.6.2.ebuild
index d20579bf2778..27e3552bd430 100644
--- a/dev-java/gson/gson-2.6.2.ebuild
+++ b/dev-java/gson/gson-2.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/gson/gson-2.7.ebuild b/dev-java/gson/gson-2.7.ebuild
index 72512ba448b1..fc8a91b02a0f 100644
--- a/dev-java/gson/gson-2.7.ebuild
+++ b/dev-java/gson/gson-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/guava/guava-13.0.1-r3.ebuild b/dev-java/guava/guava-13.0.1-r3.ebuild
index c8d68f36fa0a..66e57d8d1273 100644
--- a/dev-java/guava/guava-13.0.1-r3.ebuild
+++ b/dev-java/guava/guava-13.0.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/guava/guava-13.0.1.ebuild b/dev-java/guava/guava-13.0.1.ebuild
index 6e0efa2cd109..d032b30d4330 100644
--- a/dev-java/guava/guava-13.0.1.ebuild
+++ b/dev-java/guava/guava-13.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/guava/guava-14.0.1.ebuild b/dev-java/guava/guava-14.0.1.ebuild
index 0a7d17f1a020..d7145907baa9 100644
--- a/dev-java/guava/guava-14.0.1.ebuild
+++ b/dev-java/guava/guava-14.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 669a3f91cdb6..7fe1f860d83d 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
index e93c74e7ac1a..0da5cc82b60d 100644
--- a/dev-java/guava/guava-20.0.ebuild
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
index 2190ef9b18dc..432869d3327e 100644
--- a/dev-java/guice/guice-4.0.ebuild
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index b1ec6fe7e6bd..a916e2f0cdde 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
index 68ef48cc2d2d..415b2063e003 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
index 7e45df81b529..6d2cf68c7407 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
index 07107a473e18..e84582193d26 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
index 2f906d07e8af..d99d3ab7249c 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
index b63853155d34..bb0548279c9a 100644
--- a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 0d9fc5d2b0fa..51e879375510 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
index 1cd24a7e7dc3..e96c274fbd16 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/headius-options/headius-options-1.1.ebuild b/dev-java/headius-options/headius-options-1.1.ebuild
index 313c6526e8f8..afd567018a47 100644
--- a/dev-java/headius-options/headius-options-1.1.ebuild
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/helpgui/helpgui-1.1-r2.ebuild b/dev-java/helpgui/helpgui-1.1-r2.ebuild
index 80a103009407..114379b2a443 100644
--- a/dev-java/helpgui/helpgui-1.1-r2.ebuild
+++ b/dev-java/helpgui/helpgui-1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/hessian/hessian-4.0.37.ebuild b/dev-java/hessian/hessian-4.0.37.ebuild
index 3f1b79549d65..9b56e9f6f31f 100644
--- a/dev-java/hessian/hessian-4.0.37.ebuild
+++ b/dev-java/hessian/hessian-4.0.37.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/higlayout/higlayout-1.0-r2.ebuild b/dev-java/higlayout/higlayout-1.0-r2.ebuild
index b75d00f76774..e42e005e2433 100644
--- a/dev-java/higlayout/higlayout-1.0-r2.ebuild
+++ b/dev-java/higlayout/higlayout-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
index bcefb201b731..be485169ede2 100644
--- a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
+++ b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index 0cf9f87085cc..b3b24a805173 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild b/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
index 44766e7d5550..b4c682b1f8c3 100644
--- a/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
+++ b/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
index 7615a41cc74c..f1d565a5e400 100644
--- a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
index 48dc17d07cf4..5dfe16232601 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
index 5d322936b694..3e1a5255b294 100644
--- a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
+++ b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
index 02e22f68b813..395a5bdddfa7 100644
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.3.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.3.0.ebuild
index 334dea9e68bb..cbeffa3d2f91 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.3.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
index aeb5dca4e857..4a45fba03e24 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index e533bfca4506..50b1e88fed0f 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
EAPI="5"
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
index d20483f484ff..ce19e653d3c5 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
index 627a07f1d3b9..39097f756844 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild
index 2fb02499ce77..1bde5048e78a 100644
--- a/dev-java/icedtea/icedtea-3.3.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
EAPI="6"
diff --git a/dev-java/icedtea/icedtea-7.2.6.8.ebuild b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
index 9c4886e47ce3..50c8d71ff119 100644
--- a/dev-java/icedtea/icedtea-7.2.6.8.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
EAPI="5"
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
index 8a60faf726b7..46c3a98bc1d6 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild
index 05d47fd92082..33f0af7002eb 100644
--- a/dev-java/icu4j/icu4j-55.1.ebuild
+++ b/dev-java/icu4j/icu4j-55.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
index ad800cf8a7d3..44bf2b8ba967 100644
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ b/dev-java/icu4j/icu4j-56.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
index f15a695ad1e3..582a023c2b50 100644
--- a/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
+++ b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/ini4j/ini4j-0.5.1.ebuild b/dev-java/ini4j/ini4j-0.5.1.ebuild
index 5d86e753500b..515f27e97129 100644
--- a/dev-java/ini4j/ini4j-0.5.1.ebuild
+++ b/dev-java/ini4j/ini4j-0.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
index c393fe2b5b00..6eafa55d1d55 100644
--- a/dev-java/invokebinder/invokebinder-1.6.ebuild
+++ b/dev-java/invokebinder/invokebinder-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
index 4fafd06e6a9a..cc473d9721ed 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
index 05e62d5c9c7d..30069ea5a073 100644
--- a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
+++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
index 2e4893296e99..9a08bbb3c4ec 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild b/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
index 5e2078f81cae..827c427ff740 100644
--- a/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
+++ b/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/itext/itext-2.1.5-r2.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
index 8e77d4cc7d91..aaff82001bab 100644
--- a/dev-java/itext/itext-2.1.5-r2.ebuild
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/itext/itext-5.5.4-r2.ebuild b/dev-java/itext/itext-5.5.4-r2.ebuild
index 19272f691859..7066e9a8dcd2 100644
--- a/dev-java/itext/itext-5.5.4-r2.ebuild
+++ b/dev-java/itext/itext-5.5.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
index 27951a738248..ceafc38f70fe 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/j2ssh/j2ssh-0.2.9.ebuild b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
index c8e7cd51bac9..7d4dd4ea6d5a 100644
--- a/dev-java/j2ssh/j2ssh-0.2.9.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
index 2db7e6ddbac3..0d12ebdc9a79 100644
--- a/dev-java/jackcess/jackcess-1.2.14.3.ebuild
+++ b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index b132b4634872..369a18bb374a 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
index 6103e9e71024..983a3502db4a 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild b/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
index b70828ba7aa9..b999673fd45c 100644
--- a/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
index d9ccfa9f3192..45eb3940f5c7 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
index 1816ed581eeb..d46ab71234e9 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
index 5fc73a4910af..8064874cb093 100644
--- a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
+++ b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jackson/jackson-2.8.5.ebuild b/dev-java/jackson/jackson-2.8.5.ebuild
index bd497c3bb69b..c28af8794347 100644
--- a/dev-java/jackson/jackson-2.8.5.ebuild
+++ b/dev-java/jackson/jackson-2.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index c99a3a2609dd..2a090c5d697a 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
index bc66630329ea..33b49625ab19 100644
--- a/dev-java/jacoco/jacoco-0.7.5.ebuild
+++ b/dev-java/jacoco/jacoco-0.7.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jacoco/jacoco-0.7.9.ebuild b/dev-java/jacoco/jacoco-0.7.9.ebuild
index 436e4d83d4a5..77bcd043e345 100644
--- a/dev-java/jacoco/jacoco-0.7.9.ebuild
+++ b/dev-java/jacoco/jacoco-0.7.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
index f548e278248c..9ea62a8c3be6 100644
--- a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
+++ b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jade/jade-3.3-r3.ebuild b/dev-java/jade/jade-3.3-r3.ebuild
index 5a04d5a754aa..6c7939efd089 100644
--- a/dev-java/jade/jade-3.3-r3.ebuild
+++ b/dev-java/jade/jade-3.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
index 23c9c7a29eb3..eb90915d7d22 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
index 43797ae6c490..e20990f9e00c 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index 866cbb1665d3..f3397f38ca62 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index 866cbb1665d3..f3397f38ca62 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index 866cbb1665d3..f3397f38ca62 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jal/jal-20031117-r3.ebuild b/dev-java/jal/jal-20031117-r3.ebuild
index 2f57c3147bee..02239b2a9f7b 100644
--- a/dev-java/jal/jal-20031117-r3.ebuild
+++ b/dev-java/jal/jal-20031117-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/jal/jal-20031117-r4.ebuild b/dev-java/jal/jal-20031117-r4.ebuild
index da0915a5c12e..c75178f227e9 100644
--- a/dev-java/jal/jal-20031117-r4.ebuild
+++ b/dev-java/jal/jal-20031117-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
index abaa7092341f..63c15fd22f7a 100644
--- a/dev-java/jama/jama-1.0.3-r1.ebuild
+++ b/dev-java/jama/jama-1.0.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jamon/jamon-2.81.ebuild b/dev-java/jamon/jamon-2.81.ebuild
index eaf1b5cb480d..e506a3e9809c 100644
--- a/dev-java/jamon/jamon-2.81.ebuild
+++ b/dev-java/jamon/jamon-2.81.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 6b6544a3d92b..b418c899262f 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
index 5ab54f42bc79..c4ef9b3b80de 100644
--- a/dev-java/janino/janino-2.7.0.ebuild
+++ b/dev-java/janino/janino-2.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
index de308b6f7e5a..ce243f131ad1 100644
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
index b40130b52e1f..a8a394864ae8 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jansi/jansi-1.5-r1.ebuild b/dev-java/jansi/jansi-1.5-r1.ebuild
index 60b266013cf6..699a458fdfbe 100644
--- a/dev-java/jansi/jansi-1.5-r1.ebuild
+++ b/dev-java/jansi/jansi-1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jansi/jansi-1.5.ebuild b/dev-java/jansi/jansi-1.5.ebuild
index b5a9d335e900..1303c0cd1458 100644
--- a/dev-java/jansi/jansi-1.5.ebuild
+++ b/dev-java/jansi/jansi-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source test doc"
diff --git a/dev-java/japitools/japitools-0.9.7-r4.ebuild b/dev-java/japitools/japitools-0.9.7-r4.ebuild
index dfcead47e614..a8dd8eb2d0b6 100644
--- a/dev-java/japitools/japitools-0.9.7-r4.ebuild
+++ b/dev-java/japitools/japitools-0.9.7-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
index b1341521b3ae..209a6407a5ca 100644
--- a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jarbundler/jarbundler-2.3.1.ebuild b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
index eb1f71af1ec3..2cfb7f543659 100644
--- a/dev-java/jarbundler/jarbundler-2.3.1.ebuild
+++ b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jargs/jargs-1.0.ebuild b/dev-java/jargs/jargs-1.0.ebuild
index 1837186bf013..41dfa42c8715 100644
--- a/dev-java/jargs/jargs-1.0.ebuild
+++ b/dev-java/jargs/jargs-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index e3355cde8916..e0a86576e94b 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
index ad6b8473cb34..2e81654149b2 100644
--- a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 184ff95df50c..26e42c7326cb 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
index ff565199dc3f..54d806570f99 100644
--- a/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/java-dep-check/java-dep-check-0.4.ebuild b/dev-java/java-dep-check/java-dep-check-0.4.ebuild
index c79e89639d53..b9acd52392e4 100644
--- a/dev-java/java-dep-check/java-dep-check-0.4.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index 3bc3b0cedad0..2eb37b454ff4 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/java-gnome/java-gnome-4.0.19.ebuild b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
index 67893be29a0a..3f3f684c51f3 100644
--- a/dev-java/java-gnome/java-gnome-4.0.19.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/java-gnome/java-gnome-4.0.20.ebuild b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
index 59e2566a40e3..cf8d906ecfdc 100644
--- a/dev-java/java-gnome/java-gnome-4.0.20.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/java-gnome/java-gnome-4.1.3.ebuild b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
index 62ceec68ea0d..051f591fef85 100644
--- a/dev-java/java-gnome/java-gnome-4.1.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
index d9fd8bf2ccda..42915862de63 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.121.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.121.ebuild
index c2e088e00ab4..5c8882f486c9 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.121.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.121.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index 9017dc4a3b9a..bb42be142af4 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/javacc/javacc-5.0-r2.ebuild b/dev-java/javacc/javacc-5.0-r2.ebuild
index 249b8ead907d..265212b1115d 100644
--- a/dev-java/javacc/javacc-5.0-r2.ebuild
+++ b/dev-java/javacc/javacc-5.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild
index e4dbc11ad399..ce9a8aeea631 100644
--- a/dev-java/javacsv/javacsv-2.1.ebuild
+++ b/dev-java/javacsv/javacsv-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
index b3bb46a1a4ee..02a0a62377e8 100644
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
index 0da015268cb4..4164301afa2c 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-java/javassist/javassist-2.6-r2.ebuild b/dev-java/javassist/javassist-2.6-r2.ebuild
index 466881a22bc1..01083b6a1505 100644
--- a/dev-java/javassist/javassist-2.6-r2.ebuild
+++ b/dev-java/javassist/javassist-2.6-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index 2bb72fefe2a7..e0a6a7bdcaa5 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 072f9a50e8ba..9cb5a022448d 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
index 3aeaaa08b3fd..146f331c8330 100644
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/javax-mail/javax-mail-1.4.ebuild b/dev-java/javax-mail/javax-mail-1.4.ebuild
index 869df993b0b3..8af492da6127 100644
--- a/dev-java/javax-mail/javax-mail-1.4.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
index 3452280a566f..80255b4d8561 100644
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/javolution/javolution-6.0.0.ebuild b/dev-java/javolution/javolution-6.0.0.ebuild
index fcba0e2877ca..c289d27fec73 100644
--- a/dev-java/javolution/javolution-6.0.0.ebuild
+++ b/dev-java/javolution/javolution-6.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index d274f69dac98..a864a4673434 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
index 4041f1773cb8..3c85fd37d6e5 100644
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index 31e63888873a..966fa6e5a316 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jazzy/jazzy-0.5.2-r1.ebuild b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
index fb0d2e31ffab..6b6f0aaa786d 100644
--- a/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
+++ b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
index 7b2d0929168c..5ac725f32594 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
index d4c3725843e7..9beb6d61f3e8 100644
--- a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
+++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
index e136b8a6002b..8954daf2f2b1 100644
--- a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
+++ b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
index aa43b9794caa..75313bf84754 100644
--- a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
index 0d9e1c1808f5..0117913853ea 100644
--- a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
index a05530d38dec..8aec3b3085ba 100644
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
index 872da1461185..81a073ef7b56 100644
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
index 4e601b3375dc..9e346706f5cd 100644
--- a/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
+++ b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
index b655dfc7ae6a..5038df77e9c1 100644
--- a/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
index a5e1c65f3a66..1833038cc4a9 100644
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jchardet/jchardet-1.1-r1.ebuild b/dev-java/jchardet/jchardet-1.1-r1.ebuild
index a84f62e3d78e..d566bb21eb07 100644
--- a/dev-java/jchardet/jchardet-1.1-r1.ebuild
+++ b/dev-java/jchardet/jchardet-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jchart2d/jchart2d-3.2.2.ebuild b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
index f564541c1a65..4e3f1e632d16 100644
--- a/dev-java/jchart2d/jchart2d-3.2.2.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
index 7fadb0395f2f..b4f799d13ee7 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild b/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
index c16c3964a786..4eca0bce1671 100644
--- a/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
+++ b/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jclasslib/jclasslib-3.0-r1.ebuild b/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
index 9cd7cd710d97..7334028b247e 100644
--- a/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
+++ b/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
index dc5527a62b5a..02429bede5f1 100644
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jcmdline/jcmdline-2.0.0.ebuild b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
index 5da999420ee8..d31750c15e5e 100644
--- a/dev-java/jcmdline/jcmdline-2.0.0.ebuild
+++ b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
index a196ed8e95d9..9fea9e91e1ff 100644
--- a/dev-java/jcodings/jcodings-1.0.11.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jcodings/jcodings-1.0.4.ebuild b/dev-java/jcodings/jcodings-1.0.4.ebuild
index 4d91c54f0a96..86442e747b5e 100644
--- a/dev-java/jcodings/jcodings-1.0.4.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5.ebuild
index 2ed2f2461ef7..beabb483bb15 100644
--- a/dev-java/jcodings/jcodings-1.0.5.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
index 96a5bab5fea1..1c8d4e5af4a8 100644
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
index 4dbe6a304147..ab28455c5212 100644
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
index 7f215a2525b0..0e10f7e1003b 100644
--- a/dev-java/jcs/jcs-2.0.ebuild
+++ b/dev-java/jcs/jcs-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="test doc source"
diff --git a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
index 5202bbde73de..0c6cab80492d 100644
--- a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples"
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
index c3764612d71e..8d0f26b16d9f 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source examples test"
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
index a8a15964ee81..cd682cee9f58 100644
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index 303afdc7fea1..701289ec176e 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
index 020c1676aff4..23b56b81a270 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
index 2b74326c5d7f..496854435ae5 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
index aadfaab2efd9..527f37af8d61 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
index 11943639e800..6030f59e61a0 100644
--- a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
index 906827979212..c69374a06794 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
index 26051851762c..a0f2da4263f0 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
index 26051851762c..a0f2da4263f0 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
index 6e16330940ba..8da80597d544 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1205.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
index 0a4a1090773e..6db452316d8c 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
index f7926bff22f9..f49f640216bc 100644
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jdbm/jdbm-0.12-r2.ebuild b/dev-java/jdbm/jdbm-0.12-r2.ebuild
index 4a86a7ec4f34..2482de8527f3 100644
--- a/dev-java/jdbm/jdbm-0.12-r2.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index ad9fdaa9da1e..e51381a57480 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
index 9e12871b02f3..2edf9483f6cc 100644
--- a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE=""
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
index f97c1f035006..1f2e691c89e9 100644
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
index f6ea95eb8ebc..8351544e8888 100644
--- a/dev-java/jdom/jdom-1.0-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 9451d94da378..163a31b9884c 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index b01ce772a70a..d93a466620b3 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
index a32337dcf142..484edc88acf1 100644
--- a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
+++ b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jebl/jebl-2013.02.18.ebuild b/dev-java/jebl/jebl-2013.02.18.ebuild
index 862383ee30c2..63fb36ae0fed 100644
--- a/dev-java/jebl/jebl-2013.02.18.ebuild
+++ b/dev-java/jebl/jebl-2013.02.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc"
diff --git a/dev-java/jempbox/jempbox-1.7.1.ebuild b/dev-java/jempbox/jempbox-1.7.1.ebuild
index 379a80710079..d5f8087253ab 100644
--- a/dev-java/jempbox/jempbox-1.7.1.ebuild
+++ b/dev-java/jempbox/jempbox-1.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/jempbox/jempbox-1.8.11.ebuild b/dev-java/jempbox/jempbox-1.8.11.ebuild
index 903c190b2d13..01b0eb25b92e 100644
--- a/dev-java/jempbox/jempbox-1.8.11.ebuild
+++ b/dev-java/jempbox/jempbox-1.8.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index 1a30cc862b18..c02d303d2230 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild b/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild
index fe5a1584867e..0bcb4940d608 100644
--- a/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild
+++ b/dev-java/jetty-alpn-api/jetty-alpn-api-1.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild b/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild
index 56ece4d9a05e..73640e0131bc 100644
--- a/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild
+++ b/dev-java/jetty-npn-api/jetty-npn-api-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
index 68e684d45745..2fefc655acf5 100644
--- a/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 3263879b9de1..a0c68d324f6f 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 9b3cda61b7ef..611e40ed328f 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jformatstring/jformatstring-2.0.3.ebuild b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
index 91489b14e5c4..2aaf83dfdd53 100644
--- a/dev-java/jformatstring/jformatstring-2.0.3.ebuild
+++ b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
index 4a21313d4022..57aacc5d752a 100644
--- a/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index 9ee3ff57c0c5..948b007cad2d 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
index 234ba21e3b77..2b3e2fef8407 100644
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
index 2f02cea25e30..3a8392129d3e 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
index a5fdec78a3ca..da08207d8668 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
index 14b04879fa6b..eb59c57ac80c 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
index 3d4b20164f64..9ed5912b6c50 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
index 7d46a567b7c9..da63d80e25a4 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
index 1519e710c908..7a564f2d4aab 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
index e014cf0f0adf..fc01183201ac 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
index 5fa20a3ba568..f95a5a17998c 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index 58d544b4d1df..f73bb7366c22 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
index 0c08204f6ec6..bc04265b83bd 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jgraph/jgraph-5.12.0.4.ebuild b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
index abf8444c4d27..aec07697aa2f 100644
--- a/dev-java/jgraph/jgraph-5.12.0.4.ebuild
+++ b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
index d475f6890f29..d35de3c1861e 100644
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jgroups/jgroups-2.9.0.ebuild b/dev-java/jgroups/jgroups-2.9.0.ebuild
index df474b758d3d..e341d59ef449 100644
--- a/dev-java/jgroups/jgroups-2.9.0.ebuild
+++ b/dev-java/jgroups/jgroups-2.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
index 516f122c65da..dd75ab9faf44 100644
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
index 9f1b0273d02c..c60763f4676e 100644
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/jibx/jibx-1.1.5-r1.ebuild b/dev-java/jibx/jibx-1.1.5-r1.ebuild
index c6eae7d757c5..faeb12fef534 100644
--- a/dev-java/jibx/jibx-1.1.5-r1.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jibx/jibx-1.1.5-r2.ebuild b/dev-java/jibx/jibx-1.1.5-r2.ebuild
index 8b65a164a717..4e1af2b59d2c 100644
--- a/dev-java/jibx/jibx-1.1.5-r2.ebuild
+++ b/dev-java/jibx/jibx-1.1.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jibx/jibx-1.2.6.ebuild b/dev-java/jibx/jibx-1.2.6.ebuild
index 97a03657b5c2..a0296dda7522 100644
--- a/dev-java/jibx/jibx-1.2.6.ebuild
+++ b/dev-java/jibx/jibx-1.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jicmp/jicmp-1.0.2.ebuild b/dev-java/jicmp/jicmp-1.0.2.ebuild
index 3484acf856bd..b7c8839350fb 100644
--- a/dev-java/jicmp/jicmp-1.0.2.ebuild
+++ b/dev-java/jicmp/jicmp-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/jid3/jid3-0.46-r2.ebuild b/dev-java/jid3/jid3-0.46-r2.ebuild
index e0124316e0c1..f50f2e94610f 100644
--- a/dev-java/jid3/jid3-0.46-r2.ebuild
+++ b/dev-java/jid3/jid3-0.46-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jide-oss/jide-oss-3.6.12.ebuild b/dev-java/jide-oss/jide-oss-3.6.12.ebuild
index e9dfcf345719..5b2346e79eef 100644
--- a/dev-java/jide-oss/jide-oss-3.6.12.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.6.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jikes/jikes-1.22-r13.ebuild b/dev-java/jikes/jikes-1.22-r13.ebuild
index a50e125fe62c..e6f424f95dde 100644
--- a/dev-java/jikes/jikes-1.22-r13.ebuild
+++ b/dev-java/jikes/jikes-1.22-r13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit flag-o-matic eutils
diff --git a/dev-java/jinklevel/jinklevel-0.1.ebuild b/dev-java/jinklevel/jinklevel-0.1.ebuild
index efc9894a16de..e0fcecceb160 100644
--- a/dev-java/jinklevel/jinklevel-0.1.ebuild
+++ b/dev-java/jinklevel/jinklevel-0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/jinput/jinput-2.0.6-r1.ebuild b/dev-java/jinput/jinput-2.0.6-r1.ebuild
index 63af1e2c156e..c4d0b5e00785 100644
--- a/dev-java/jinput/jinput-2.0.6-r1.ebuild
+++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
index f3b317401a0a..c7d1c35ca3cf 100644
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jlayer/jlayer-1.0.1.ebuild b/dev-java/jlayer/jlayer-1.0.1.ebuild
index eafa8fe026f3..a7607de7fe23 100644
--- a/dev-java/jlayer/jlayer-1.0.1.ebuild
+++ b/dev-java/jlayer/jlayer-1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/jlex/jlex-1.2.6-r2.ebuild b/dev-java/jlex/jlex-1.2.6-r2.ebuild
index 3babb82152c0..0a9728167410 100644
--- a/dev-java/jlex/jlex-1.2.6-r2.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jlfgr/jlfgr-1.0-r2.ebuild b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
index 7b6f825f706f..df38eda7e2e9 100644
--- a/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
+++ b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jlibeps/jlibeps-0.1-r1.ebuild b/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
index 9d7fbdd13b45..2f75afc4bff6 100644
--- a/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
+++ b/dev-java/jlibeps/jlibeps-0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0.ebuild
index f96d10afe5ad..5d846154e3f4 100644
--- a/dev-java/jline/jline-1.0.ebuild
+++ b/dev-java/jline/jline-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="source test"
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index c0e04de85435..bcba6c328625 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
index 662f440245a3..d33a9ab1c9b7 100644
--- a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
+++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/jmh-core/jmh-core-1.4.1.ebuild b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
index cb8ef33e3150..ea497f214475 100644
--- a/dev-java/jmh-core/jmh-core-1.4.1.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
index f19c21cba3ad..ba743a3b22a2 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
index 088818c297d3..81de02f32965 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 9375230237c2..06c638fe1f53 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
index 56b0a25fb94a..2213fe41255e 100644
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index 294b80d8e5d0..a3210becfbbc 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="test doc source"
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
index 50e363655ded..4e55ccbbcd70 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
index b9ebd0457dcf..394507a13802 100644
--- a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
+++ b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
index 07c6da4d0464..ac7387eb9c67 100644
--- a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
index e198a6a71f81..a5257b885a5e 100644
--- a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
+++ b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
index 42e47e0bff1a..76d3dddb4aeb 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
index 2ba128d59cf6..667c90622e64 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
index b3d20b9eb194..238c884de4d3 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
index f5936f9bbe6f..4b92a5c3baaa 100644
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
index ecdab18befdc..d4e618dfd2a3 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
index 54e0d809bfd7..5ea26cf25cdc 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7.ebuild
index 346e9d12adab..fbf0a92b476f 100644
--- a/dev-java/joda-time/joda-time-2.7.ebuild
+++ b/dev-java/joda-time/joda-time-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild
index 45296ef96ad1..a2e39e2d7e57 100644
--- a/dev-java/joni/joni-2.1.0.ebuild
+++ b/dev-java/joni/joni-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jopt-simple/jopt-simple-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index bf49832e58f2..d0cb07818b33 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jopt-simple/jopt-simple-4.8.ebuild b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
index 353d70d2a9e9..688255a6465c 100644
--- a/dev-java/jopt-simple/jopt-simple-4.8.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jopt-simple/jopt-simple-4.9.ebuild b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
index 5edf621065a7..e8d3065f34ce 100644
--- a/dev-java/jopt-simple/jopt-simple-4.9.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jortho/jortho-1.0.ebuild b/dev-java/jortho/jortho-1.0.ebuild
index d62318561323..f8d16101d570 100644
--- a/dev-java/jortho/jortho-1.0.ebuild
+++ b/dev-java/jortho/jortho-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
index 17b1ba2531e9..fa4541f84f2d 100644
--- a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
+++ b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
index aa8dc977b05b..67ff2e86899d 100644
--- a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
index 6ea32d685e36..2eee39fbc808 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jrrd/jrrd-1.0.1-r1.ebuild b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
index 6a287212081c..c454c5dbb3d4 100644
--- a/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
+++ b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
WANT_AUTOMAKE="1.9"
diff --git a/dev-java/jruby/jruby-1.7.12.ebuild b/dev-java/jruby/jruby-1.7.12.ebuild
index e2dda652b0f2..e50e888c95f6 100644
--- a/dev-java/jruby/jruby-1.7.12.ebuild
+++ b/dev-java/jruby/jruby-1.7.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jsap/jsap-2.1-r2.ebuild b/dev-java/jsap/jsap-2.1-r2.ebuild
index d50330e94201..c354393345de 100644
--- a/dev-java/jsap/jsap-2.1-r2.ebuild
+++ b/dev-java/jsap/jsap-2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
index fb0319c52c5e..6646a58dff68 100644
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source examples"
diff --git a/dev-java/json-simple/json-simple-1.1.ebuild b/dev-java/json-simple/json-simple-1.1.ebuild
index 2ebe6f13a363..039d5734474f 100644
--- a/dev-java/json-simple/json-simple-1.1.ebuild
+++ b/dev-java/json-simple/json-simple-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="source test"
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 1324c46043d8..61ec8715621c 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index f3193e58b38d..c2ab4e318ae1 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
index 878940e96667..dd2cf1cba978 100644
--- a/dev-java/jsoup/jsoup-1.8.3.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
index 5d783e7f947e..89f27c78cd74 100644
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
index cc9fb34ea9c6..8292ca79d0ac 100644
--- a/dev-java/jsr101/jsr101-1.4-r3.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
index 029318cf41ce..28de6da6e59e 100644
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jsr173/jsr173-1.0-r2.ebuild b/dev-java/jsr173/jsr173-1.0-r2.ebuild
index a9c972f89224..61a550ed9fa0 100644
--- a/dev-java/jsr173/jsr173-1.0-r2.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/jsr173/jsr173-1.0-r3.ebuild b/dev-java/jsr173/jsr173-1.0-r3.ebuild
index 2adec94d8560..977c5839f876 100644
--- a/dev-java/jsr173/jsr173-1.0-r3.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jsr181/jsr181-1.0-r2.ebuild b/dev-java/jsr181/jsr181-1.0-r2.ebuild
index 357fadb032fd..82b06439c8e3 100644
--- a/dev-java/jsr181/jsr181-1.0-r2.ebuild
+++ b/dev-java/jsr181/jsr181-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr223/jsr223-1.0-r2.ebuild b/dev-java/jsr223/jsr223-1.0-r2.ebuild
index e5574a5c33be..758dd0285b50 100644
--- a/dev-java/jsr223/jsr223-1.0-r2.ebuild
+++ b/dev-java/jsr223/jsr223-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
index bb0a79f374cc..bef070caa856 100644
--- a/dev-java/jsr225/jsr225-1.0.ebuild
+++ b/dev-java/jsr225/jsr225-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr250/jsr250-1.2.ebuild b/dev-java/jsr250/jsr250-1.2.ebuild
index e0922e82ca87..66f82077acf3 100644
--- a/dev-java/jsr250/jsr250-1.2.ebuild
+++ b/dev-java/jsr250/jsr250-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.1.ebuild
index 698f85e2d1d6..02401bb30056 100644
--- a/dev-java/jsr305/jsr305-3.0.1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
index a33d1a2282bf..0a55c763d1c7 100644
--- a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
+++ b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
index b8025d3d02b0..a6017011f867 100644
--- a/dev-java/jsr322/jsr322-1.5.ebuild
+++ b/dev-java/jsr322/jsr322-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/jsr67/jsr67-1.3-r1.ebuild b/dev-java/jsr67/jsr67-1.3-r1.ebuild
index f46ff2e8bc52..e9e87397f717 100644
--- a/dev-java/jsr67/jsr67-1.3-r1.ebuild
+++ b/dev-java/jsr67/jsr67-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
index a3b8b18429f9..077c3bf848fb 100644
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jssc/jssc-2.8.0-r1.ebuild b/dev-java/jssc/jssc-2.8.0-r1.ebuild
index db8f278c716a..e36b1c84a10c 100644
--- a/dev-java/jssc/jssc-2.8.0-r1.ebuild
+++ b/dev-java/jssc/jssc-2.8.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jstun/jstun-0.7.3.ebuild b/dev-java/jstun/jstun-0.7.3.ebuild
index f01dba92bb70..a740c831f918 100644
--- a/dev-java/jstun/jstun-0.7.3.ebuild
+++ b/dev-java/jstun/jstun-0.7.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jta/jta-1.0.1-r1.ebuild b/dev-java/jta/jta-1.0.1-r1.ebuild
index ff2b118164b3..169a16950658 100644
--- a/dev-java/jta/jta-1.0.1-r1.ebuild
+++ b/dev-java/jta/jta-1.0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
index 55c30a538dd0..ac42eef6c1f0 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit java-pkg-2
diff --git a/dev-java/jtds/jtds-1.3.1.ebuild b/dev-java/jtds/jtds-1.3.1.ebuild
index 510d183a8b58..de480e667577 100644
--- a/dev-java/jtds/jtds-1.3.1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jtidy/jtidy-1.0.ebuild b/dev-java/jtidy/jtidy-1.0.ebuild
index e035996dba18..f91781cedec6 100644
--- a/dev-java/jtidy/jtidy-1.0.ebuild
+++ b/dev-java/jtidy/jtidy-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
index 4f740bac1fd7..6e31859b2e15 100644
--- a/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
+++ b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jts-core/jts-core-1.14.ebuild b/dev-java/jts-core/jts-core-1.14.ebuild
index 15df7fa5a2cb..f22113445268 100644
--- a/dev-java/jts-core/jts-core-1.14.ebuild
+++ b/dev-java/jts-core/jts-core-1.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/juel/juel-2.1.0-r2.ebuild b/dev-java/juel/juel-2.1.0-r2.ebuild
index 2a089e824d39..8f986aff5a30 100644
--- a/dev-java/juel/juel-2.1.0-r2.ebuild
+++ b/dev-java/juel/juel-2.1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jump/jump-0.5-r1.ebuild b/dev-java/jump/jump-0.5-r1.ebuild
index 9e222f78ffed..460016fbe6f5 100644
--- a/dev-java/jump/jump-0.5-r1.ebuild
+++ b/dev-java/jump/jump-0.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
index f946ec2dc901..7d0f9b47d836 100644
--- a/dev-java/jung/jung-1.7.6-r1.ebuild
+++ b/dev-java/jung/jung-1.7.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jung/jung-1.7.6.ebuild b/dev-java/jung/jung-1.7.6.ebuild
index ec7cf854723f..bbe81f6a7456 100644
--- a/dev-java/jung/jung-1.7.6.ebuild
+++ b/dev-java/jung/jung-1.7.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index 4df5fa14ad18..3e5a375987af 100644
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
index 5e7d2ff30c30..3a9ff4344dd8 100644
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 2916265af5b7..dc8f7416fc24 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
index 030917520f75..9c166f1e716b 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/junrar/junrar-0.6.ebuild b/dev-java/junrar/junrar-0.6.ebuild
index a416381f1a71..b5c290d608f4 100644
--- a/dev-java/junrar/junrar-0.6.ebuild
+++ b/dev-java/junrar/junrar-0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
index 650ed9bc9303..c5c0a870776a 100644
--- a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
+++ b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jupidator/jupidator-0.6.0.ebuild b/dev-java/jupidator/jupidator-0.6.0.ebuild
index 733ce3257c51..690f152de270 100644
--- a/dev-java/jupidator/jupidator-0.6.0.ebuild
+++ b/dev-java/jupidator/jupidator-0.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jusb/jusb-0.4.4-r1.ebuild b/dev-java/jusb/jusb-0.4.4-r1.ebuild
index 129ff2bcbae2..08e426ae6661 100644
--- a/dev-java/jusb/jusb-0.4.4-r1.ebuild
+++ b/dev-java/jusb/jusb-0.4.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils java-pkg-2 linux-info flag-o-matic multilib
diff --git a/dev-java/jutils/jutils-1.0.0-r1.ebuild b/dev-java/jutils/jutils-1.0.0-r1.ebuild
index 9116fcefb3ef..87b28ba5fd1b 100644
--- a/dev-java/jutils/jutils-1.0.0-r1.ebuild
+++ b/dev-java/jutils/jutils-1.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
index 15b16dc670d6..9ca317db9bdc 100644
--- a/dev-java/jvmstat/jvmstat-3.0.ebuild
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 versionator
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild
index 0e25bd7bff77..01c3133f0780 100644
--- a/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
index c9f041685df1..89d7ee44b2de 100644
--- a/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="source test"
diff --git a/dev-java/jython/jython-2.7.0-r1.ebuild b/dev-java/jython/jython-2.7.0-r1.ebuild
index a2b25fa87391..d0870d8b4ac0 100644
--- a/dev-java/jython/jython-2.7.0-r1.ebuild
+++ b/dev-java/jython/jython-2.7.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index 52dcb4d9f42a..18b533ce3672 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index 4cad351ece42..bcbd7be61bed 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
index 29807d208f7b..344542899aa8 100644
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3.ebuild
index 011aaea2ddb5..3fcc2b5767d5 100644
--- a/dev-java/jzlib/jzlib-1.1.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
JAVA_PKG_IUSE="examples source test"
diff --git a/dev-java/kryo/kryo-2.24.0.ebuild b/dev-java/kryo/kryo-2.24.0.ebuild
index 97c54be588ed..e2179fff8899 100644
--- a/dev-java/kryo/kryo-2.24.0.ebuild
+++ b/dev-java/kryo/kryo-2.24.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
index 92d248c12edc..07173fbe134f 100644
--- a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
index 5b0ff08bbb8f..434bf19f6533 100644
--- a/dev-java/kxml/kxml-2.3.0.ebuild
+++ b/dev-java/kxml/kxml-2.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index c400db20dbc6..01d54e8e31ba 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild b/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
index 7cad2c21179b..f376e853e94f 100644
--- a/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
+++ b/dev-java/laf-plugin/laf-plugin-0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/laf-plugin/laf-plugin-1.1.ebuild b/dev-java/laf-plugin/laf-plugin-1.1.ebuild
index dacfc84bad39..ff181497b33c 100644
--- a/dev-java/laf-plugin/laf-plugin-1.1.ebuild
+++ b/dev-java/laf-plugin/laf-plugin-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
index f559cbb2cab7..9d6a64e8db56 100644
--- a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
index dfaafd54bde1..807741b31949 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild
index dfaafd54bde1..807741b31949 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r1.ebuild
index 38f2b0a1a317..0595fc1a9fc6 100644
--- a/dev-java/libg/libg-2.1.0-r1.ebuild
+++ b/dev-java/libg/libg-2.1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
index 14b7f98ade51..b18fec24f39c 100644
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
diff --git a/dev-java/libmso/libmso-0.1.ebuild b/dev-java/libmso/libmso-0.1.ebuild
index 7f72eec8a166..73fc4922ec4c 100644
--- a/dev-java/libmso/libmso-0.1.ebuild
+++ b/dev-java/libmso/libmso-0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
index b01c22829ede..edf28fb9076e 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index e2f7cc7dc7ef..8ad08cbf8d11 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild
index 2855e3ebbd35..dd05a98cec6f 100644
--- a/dev-java/logback/logback-1.0.13-r1.ebuild
+++ b/dev-java/logback/logback-1.0.13-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
index 47478bbc3339..22bd9404eb83 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2 java-osgi
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
index d549f1fe1d16..b520e4342ea0 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2 java-osgi
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r3.ebuild
index 99f7e88d1141..3d238b008570 100644
--- a/dev-java/lucene/lucene-1.4.3-r3.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/lucene/lucene-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
index ca869282edf6..ae751585ba3d 100644
--- a/dev-java/lucene/lucene-2.4.1-r1.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
index 824a1ea259d6..85cc9362c52a 100644
--- a/dev-java/lucene/lucene-3.5.0.ebuild
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
JAVA_PKG_IUSE="doc source test contrib"
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
index 74a379f7e727..ecdf10a6fac8 100644
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
JAVA_PKG_IUSE="doc source test contrib"
diff --git a/dev-java/lzma/lzma-9.18.ebuild b/dev-java/lzma/lzma-9.18.ebuild
index 296a33593935..b78809bc5e67 100644
--- a/dev-java/lzma/lzma-9.18.ebuild
+++ b/dev-java/lzma/lzma-9.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
index 5072a7decd84..29d94eb20569 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
index 39f11894543b..1638f937a9fb 100644
--- a/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
+++ b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
index 19ff180b0984..dc990e66e4cb 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
index b54e5a95e347..849b313ae57d 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 821d9e4ca160..43b208161178 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index c8fe40d4c39a..2a1fd224356b 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
index 1c74a2c4c000..0063d4ff7c7b 100644
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
index cb45379825de..a92297f4dfb0 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
index d3d590036a31..d0a6200c052b 100644
--- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
index 817aa3298caf..a40b338ff43f 100644
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild b/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild
index f614eaff7fc5..29f28f1b6d3a 100644
--- a/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild
+++ b/dev-java/maven-hawtjni-plugin/maven-hawtjni-plugin-1.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
index 2b2f4a8ea482..da085079a41a 100644
--- a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild
index 0c1a68931599..d6c0247fd153 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
index 039db5ee1faf..d92aacdc6272 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/metainf-services/metainf-services-1.6.ebuild b/dev-java/metainf-services/metainf-services-1.6.ebuild
index 102fd4ade07f..28fb9e4748ea 100644
--- a/dev-java/metainf-services/metainf-services-1.6.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/metainf-services/metainf-services-1.7.ebuild b/dev-java/metainf-services/metainf-services-1.7.ebuild
index a494dce1e6b8..976442a825fb 100644
--- a/dev-java/metainf-services/metainf-services-1.7.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/microba/microba-0.4.4.3.ebuild b/dev-java/microba/microba-0.4.4.3.ebuild
index 68f4172fab2e..467aa1eb5668 100644
--- a/dev-java/microba/microba-0.4.4.3.ebuild
+++ b/dev-java/microba/microba-0.4.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild
index 15cb91034811..95862c4d8e1f 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/milton-api/milton-api-2.7.1.3.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
index bc54c3b25fe7..72136a1b758f 100644
--- a/dev-java/milton-api/milton-api-2.7.1.3.ebuild
+++ b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
index 477761825a70..13bf1e501a5a 100644
--- a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
+++ b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/mimepull/mimepull-1.8.ebuild b/dev-java/mimepull/mimepull-1.8.ebuild
index f723050717c1..1e80184557d2 100644
--- a/dev-java/mimepull/mimepull-1.8.ebuild
+++ b/dev-java/mimepull/mimepull-1.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild b/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
index c1d240e3b0d8..301cfe14b421 100644
--- a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
+++ b/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/mina-core/mina-core-1.1.7.ebuild b/dev-java/mina-core/mina-core-1.1.7.ebuild
index d823515a9ff9..6c5a40da3891 100644
--- a/dev-java/mina-core/mina-core-1.1.7.ebuild
+++ b/dev-java/mina-core/mina-core-1.1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/mina-core/mina-core-2.0.7.ebuild b/dev-java/mina-core/mina-core-2.0.7.ebuild
index db63a5346b9b..d4f1d9a26061 100644
--- a/dev-java/mina-core/mina-core-2.0.7.ebuild
+++ b/dev-java/mina-core/mina-core-2.0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/minlog/minlog-1.2.ebuild b/dev-java/minlog/minlog-1.2.ebuild
index 69a7b4b85043..afa340f3c6df 100644
--- a/dev-java/minlog/minlog-1.2.ebuild
+++ b/dev-java/minlog/minlog-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
index 82e00a3130bc..6e3084956cad 100644
--- a/dev-java/mockito/mockito-1.9.5-r1.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
index d63bbebd8188..735e0e7b91bc 100644
--- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/moshi/moshi-1.1.0.ebuild b/dev-java/moshi/moshi-1.1.0.ebuild
index 10df768eb938..5348dfbdb2f7 100644
--- a/dev-java/moshi/moshi-1.1.0.ebuild
+++ b/dev-java/moshi/moshi-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index 97a79577d989..4826b3ffa6a9 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
index deb9132a83e3..e9de102fb5de 100644
--- a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
+++ b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
index 0cecaeb6f9dc..10d59c6e606f 100644
--- a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
+++ b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
index 0e98741905ed..ba1cc419b4cf 100644
--- a/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
+++ b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
index b7f5e9cd9d4e..e025d3c7ba4d 100644
--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild
index 9b34b965ad60..d0fe385ae93b 100644
--- a/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
index a5cf86a4985f..fd1401c96ca6 100644
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
index edffffb357b4..3302b2a8a8f1 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
index b4ea08973e52..7e06a14a2858 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 765150335775..c65156c96450 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
index 166ad504a834..2a48d8be29ee 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
index 5fc49d056152..f949763f6a96 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
index 7f8423ab93cd..2a2172271874 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
index ab4d353dd7f5..9f07aad0a1c1 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
index 909d4bc81013..287adca3cbd2 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
index f74078426933..d1b7d580efba 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
index 0142cda11d13..aabb34b5b477 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
index 8ff9cc753391..8b785450dd03 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
index fc59f743d484..e8426f9fc30f 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
index a832b018e22e..a172efd32d32 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
index 3bbefa0b63a4..fae2cb560c58 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
index e5f5139e7ea2..31f457b3fd8d 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
index de1a8c784ec6..562dceabff3d 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
index 83a3dd9b5bb2..1c48cdec328a 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
index 6935fcbd8541..39655eeaff74 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
index 271b8ad93c26..0ac873ceb00f 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
index 83db546e4083..201018b640de 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
index cd09e2011125..80c4a9292d81 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
index 2c70cf83d8cf..ab48da5a62a7 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
index 63934d31f1be..c9995def9e3f 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
index f9a0a84192a9..72d48f8fe263 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
index 4934500b48ce..13dd58f700ad 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
index 204f24df7807..c0788658d872 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild
index 5216312c4cf6..6f6f31d608c8 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 19b3f352f065..b84bb7b5d1bf 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
index cf803d2a9a1f..e503634d6709 100644
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
index f79398d00d18..2cfd77b9ae19 100644
--- a/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
index 41ca660a39b2..31cb4e4e16a6 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
index 0d0d1928f038..1ea84176a946 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
index 56601c53431f..2e4228115986 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
index 60f47fdde200..2b852ec0483c 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
index 505006ff1b44..917fe8ec1741 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
index 0963e8572c78..4d3e0c5715f0 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
index c2901959ed81..06fb61cf79f5 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
index e48231f779bd..ab35715ec593 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
index 75b3d0f66473..7efda851d632 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
index d4d0660626b8..7e99662166e0 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
index 4e40a7f0274d..e2e7a1c03fec 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
index 4cecfd28fc61..9ab706bb53ef 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
index 7e76fe0c6d1e..34c154c94810 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
index 45a681f877a8..0127e902ae39 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
index 34507a4b52df..e7959f7efeea 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
index 04b85fcbf5c9..3f12a6126b64 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
index 38d35e4fad39..5ba98bd4220e 100644
--- a/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-php/netbeans-php-8.1.ebuild b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
index e870aa24e8a7..59b9b8e27f1e 100644
--- a/dev-java/netbeans-php/netbeans-php-8.1.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
index 1695b2253e43..1c17eadefa01 100644
--- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
index be3032b442c9..510c11d07237 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
index efdc3af8fd87..01c99d222a05 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
index 2df7647e95ce..9120c0763c95 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
index 44dea59273aa..bb417f365e09 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
index bf07025f65a7..14d5385b7953 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
index ca6843eee178..43f29f2b4ac7 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
index 31113504f888..b420078e2adb 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
index cbfa91491798..1413428fe123 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
index 4a39ed20cccd..2c07b73e236e 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
index 9fe39a955c53..033ca7cb96a5 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
index ac43ab24cba4..e50b6dacdc34 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
index 8720513fceef..c910a0da6d38 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
index d84a549761f7..5815d2967900 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index f72eebd9fdb1..2e4b6c85aa19 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
index 0e9197730aab..bf33b39d6b32 100644
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
index 15dd8a78c551..d533c69e16b2 100644
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index 52c5735bf687..9c01ccf4c53f 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index f4ff97faf704..f422e9568de7 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
index 2d9f1c540537..d4ffae7bdcd0 100644
--- a/dev-java/netty-handler/netty-handler-4.0.36.ebuild
+++ b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
index ff5ae765d35c..395e9a7a95df 100644
--- a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
+++ b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
index 457d27258657..de1a597cf723 100644
--- a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 9498833623e1..46802012be81 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/neuroph/neuroph-2.3.1.ebuild b/dev-java/neuroph/neuroph-2.3.1.ebuild
index eda6eb081be6..cfe33c8ea55b 100644
--- a/dev-java/neuroph/neuroph-2.3.1.ebuild
+++ b/dev-java/neuroph/neuroph-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/neuroph/neuroph-2.3.ebuild b/dev-java/neuroph/neuroph-2.3.ebuild
index eda6eb081be6..cfe33c8ea55b 100644
--- a/dev-java/neuroph/neuroph-2.3.ebuild
+++ b/dev-java/neuroph/neuroph-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/neuroph/neuroph-2.4.ebuild b/dev-java/neuroph/neuroph-2.4.ebuild
index 96302c394fb5..c2bd142ce233 100644
--- a/dev-java/neuroph/neuroph-2.4.ebuild
+++ b/dev-java/neuroph/neuroph-2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
index 4c217dc5d347..e0e815a65d5e 100644
--- a/dev-java/objenesis/objenesis-1.3.ebuild
+++ b/dev-java/objenesis/objenesis-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index 572270572e2a..d770b3a1f21f 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
index 4edc5c37890e..e68c0ee10fa8 100644
--- a/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
+++ b/dev-java/offo-hyphenation/offo-hyphenation-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/ognl/ognl-3.0.8.ebuild b/dev-java/ognl/ognl-3.0.8.ebuild
index cff299f97b51..c3d11389846b 100644
--- a/dev-java/ognl/ognl-3.0.8.ebuild
+++ b/dev-java/ognl/ognl-3.0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/okio/okio-1.11.0.ebuild b/dev-java/okio/okio-1.11.0.ebuild
index cca6f42c8189..57105c8e9838 100644
--- a/dev-java/okio/okio-1.11.0.ebuild
+++ b/dev-java/okio/okio-1.11.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index a6f96d817d89..17e96b3424e3 100644
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/dev-java/opencsv/opencsv-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
index 72f079a54e42..6275061a6978 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
index 3026d48157f5..73f38b732f1f 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index 3026d48157f5..73f38b732f1f 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
index 65bd0446425d..0e52efb3de25 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
index ceba82c425e2..0829cfb55ff3 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
index 4207c291ebb0..29c598b6ed44 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
index 30ac8b1056be..8ab9968af27e 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
index 11c36bfa46de..b00be73ca481 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
index f4049e618f61..5ef88db0e2f5 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
index e8e9becf888a..de894898fc85 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
index d73ee9616570..4397353a0207 100644
--- a/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
+++ b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/pat/pat-1.5.3-r1.ebuild b/dev-java/pat/pat-1.5.3-r1.ebuild
index 0cc0f75f59d9..adbf49105f3f 100644
--- a/dev-java/pat/pat-1.5.3-r1.ebuild
+++ b/dev-java/pat/pat-1.5.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
index 3faad4db356e..835e3e6b6624 100644
--- a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
+++ b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
index 65de3b980d0e..6a0cd762677f 100644
--- a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/pdfbox/pdfbox-1.8.11.ebuild b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
index cc736d9d8d48..7d00d020db52 100644
--- a/dev-java/pdfbox/pdfbox-1.8.11.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/piccolo/piccolo-1.04.ebuild b/dev-java/piccolo/piccolo-1.04.ebuild
index 8e88cf3bebeb..c8224f463a1c 100644
--- a/dev-java/piccolo/piccolo-1.04.ebuild
+++ b/dev-java/piccolo/piccolo-1.04.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
index 87c48e946b41..6193eb4112ae 100644
--- a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
index 101eac57f2db..6f655fab8660 100644
--- a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index 36503bf36876..a5b7b5428ac9 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/portletapi/portletapi-1.0-r1.ebuild b/dev-java/portletapi/portletapi-1.0-r1.ebuild
index b6f2d806ab39..6e17bbd0b0b6 100644
--- a/dev-java/portletapi/portletapi-1.0-r1.ebuild
+++ b/dev-java/portletapi/portletapi-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/portletapi/portletapi-2.0-r1.ebuild b/dev-java/portletapi/portletapi-2.0-r1.ebuild
index 7d4be8fcd7b8..c4c81fe914f3 100644
--- a/dev-java/portletapi/portletapi-2.0-r1.ebuild
+++ b/dev-java/portletapi/portletapi-2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index 1666fc1f6caf..563f4fdaf798 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild
index 96e8d253d14f..5591f87e982d 100644
--- a/dev-java/proguard/proguard-4.5.ebuild
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/proguard/proguard-4.7.ebuild b/dev-java/proguard/proguard-4.7.ebuild
index 309240aeacf2..439692179911 100644
--- a/dev-java/proguard/proguard-4.7.ebuild
+++ b/dev-java/proguard/proguard-4.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild
index eae5da79aaf7..5a91d3ffce7d 100644
--- a/dev-java/proguard/proguard-4.8.ebuild
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/proguard/proguard-5.2.1.ebuild b/dev-java/proguard/proguard-5.2.1.ebuild
index ae87f1fe55ad..c7e674619b0d 100644
--- a/dev-java/proguard/proguard-5.2.1.ebuild
+++ b/dev-java/proguard/proguard-5.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
index 569885dbbc6e..c8584f5a1e2e 100644
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
index 4922ae8983d5..ccef8e5dbaba 100644
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
index 2794a503b827..9b1cc5e0e550 100644
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index 6ffaf3f9b065..a5a5f29f2623 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
index fddfeabf93f4..595e0e62b25a 100644
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
index 8b158c7e34ef..6c0f069442cd 100644
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/rat/rat-0.11.ebuild b/dev-java/rat/rat-0.11.ebuild
index 372e8de416a7..c5275947926b 100644
--- a/dev-java/rat/rat-0.11.ebuild
+++ b/dev-java/rat/rat-0.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/reflectasm/reflectasm-1.11.0.ebuild b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
index 3bdc751870b1..2e3db628eff6 100644
--- a/dev-java/reflectasm/reflectasm-1.11.0.ebuild
+++ b/dev-java/reflectasm/reflectasm-1.11.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/reflectasm/reflectasm-1.11.1.ebuild b/dev-java/reflectasm/reflectasm-1.11.1.ebuild
index c69fd2cc4aa7..4826d55119bf 100644
--- a/dev-java/reflectasm/reflectasm-1.11.1.ebuild
+++ b/dev-java/reflectasm/reflectasm-1.11.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
index 6cde882aef34..4750a28d85da 100644
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
index 8f33d4dbf7c1..f17f6ddf9a42 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
index 3561fc5136f3..dacdd1feb4fb 100644
--- a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
index 357afbe8b0f6..a876cc7bf73c 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="source"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
index 75a5c4186c08..6397acb28a97 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
index 2f1948876cfc..96588c8a848a 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index 725eaf914fd2..a065f54990a3 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
index c9d7c08ddd57..3b3bcabcd85d 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
index c9d7c08ddd57..3b3bcabcd85d 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 0a9aa6255d9b..134b07cdd7c9 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
diff --git a/dev-java/rngom/rngom-20100718-r1.ebuild b/dev-java/rngom/rngom-20100718-r1.ebuild
index 3f89ebd90944..3906f553ff8a 100644
--- a/dev-java/rngom/rngom-20100718-r1.ebuild
+++ b/dev-java/rngom/rngom-20100718-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/rome/rome-0.9-r2.ebuild b/dev-java/rome/rome-0.9-r2.ebuild
index 7746993e6a11..bdeb19f9bd88 100644
--- a/dev-java/rome/rome-0.9-r2.ebuild
+++ b/dev-java/rome/rome-0.9-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/rome/rome-0.9-r3.ebuild b/dev-java/rome/rome-0.9-r3.ebuild
index 3fb9bf507e08..52ee0ab18877 100644
--- a/dev-java/rome/rome-0.9-r3.ebuild
+++ b/dev-java/rome/rome-0.9-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/rundoc/rundoc-0.11-r1.ebuild b/dev-java/rundoc/rundoc-0.11-r1.ebuild
index 2393616f9ad9..9da02b564ff8 100644
--- a/dev-java/rundoc/rundoc-0.11-r1.ebuild
+++ b/dev-java/rundoc/rundoc-0.11-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
index 8cd2fc01a7d7..4a59306f198f 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
index 3bd68bb98de8..906a1b6e0471 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
index 996486fb279c..9ab5db100c49 100644
--- a/dev-java/saaj/saaj-1.3.19-r1.ebuild
+++ b/dev-java/saaj/saaj-1.3.19-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild
index 43b5c7f85c7e..03cd8bbc11cf 100644
--- a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sablecc/sablecc-3.7-r1.ebuild b/dev-java/sablecc/sablecc-3.7-r1.ebuild
index 4892847e4245..861695b504eb 100644
--- a/dev-java/sablecc/sablecc-3.7-r1.ebuild
+++ b/dev-java/sablecc/sablecc-3.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sac/sac-1.3-r2.ebuild b/dev-java/sac/sac-1.3-r2.ebuild
index f6d0142e1b5d..919b79855870 100644
--- a/dev-java/sac/sac-1.3-r2.ebuild
+++ b/dev-java/sac/sac-1.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
index e33a75a141db..2f749da534ce 100644
--- a/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
+++ b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
index 0eef81467296..13a3083381cb 100644
--- a/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
+++ b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
index 204de24c6f85..b8b5bfbf3d9b 100644
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
index 7b32cf2f9773..d405ae412f17 100644
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-java/sax/sax-2.2.1-r2.ebuild b/dev-java/sax/sax-2.2.1-r2.ebuild
index 7f5be4196f3c..9db1556e401a 100644
--- a/dev-java/sax/sax-2.2.1-r2.ebuild
+++ b/dev-java/sax/sax-2.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
index 46dbdd773cfd..00a705b18237 100644
--- a/dev-java/sax/sax-2.2.1-r3.ebuild
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/saxon/saxon-6.5.5-r1.ebuild b/dev-java/saxon/saxon-6.5.5-r1.ebuild
index 658cc9af1a53..02d7e4112288 100644
--- a/dev-java/saxon/saxon-6.5.5-r1.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/saxon/saxon-6.5.5.ebuild b/dev-java/saxon/saxon-6.5.5.ebuild
index 37f4a8844720..c0bb28bba2c9 100644
--- a/dev-java/saxon/saxon-6.5.5.ebuild
+++ b/dev-java/saxon/saxon-6.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc examples source"
inherit java-pkg-2 java-ant-2 eutils versionator
diff --git a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
index 4eda7de72ee5..dbe8dbd2e577 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
index b45fcde16683..715fbbf14830 100644
--- a/dev-java/saxon/saxon-9.2.0.6.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
index 7c1bc7559ac0..5d926826d3fe 100644
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
index e1fdfb5fa518..1c913ecc1d14 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
index 4d5209770799..458a49941128 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
index 10f324c0d971..09992eb8f5f3 100644
--- a/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.12.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
index 10f324c0d971..09992eb8f5f3 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
index 10f324c0d971..09992eb8f5f3 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
index 10f324c0d971..09992eb8f5f3 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
index 10f324c0d971..09992eb8f5f3 100644
--- a/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-0.13.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sbt/sbt-0.13.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
index cf80d0f9a039..1c85cdff4025 100644
--- a/dev-java/sbt/sbt-0.13.10_rc2.ebuild
+++ b/dev-java/sbt/sbt-0.13.10_rc2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
index 991ac8615188..e1157a8118a7 100644
--- a/dev-java/sbt/sbt-0.13.11.ebuild
+++ b/dev-java/sbt/sbt-0.13.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index a6753ad7194c..f881129e9bef 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/dev-java/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
index 3c3360f20210..6e8a7e3062ca 100644
--- a/dev-java/sbt/sbt-0.13.8-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.8-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
index 1adfb0748197..32c3fbd50eee 100644
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
index 37454c018949..5f11bf552500 100644
--- a/dev-java/servletapi/servletapi-2.3-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index d11f80910e63..0537d0b2a61d 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/shared-objects/shared-objects-1.4-r4.ebuild b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild
index bde20d61d767..f68f79559231 100644
--- a/dev-java/shared-objects/shared-objects-1.4-r4.ebuild
+++ b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
index 3be6f03954f7..fc91a2631935 100644
--- a/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
+++ b/dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
index 415b165534d8..0f84096e5059 100644
--- a/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/skinlf/skinlf-6.7-r1.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
index d745774aa030..307c35f9c285 100644
--- a/dev-java/skinlf/skinlf-6.7-r1.ebuild
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
index 41d0e910888d..20cdbe900583 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
index a86b78a55c6d..5aef8e47489b 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
index 6b2e15ea4942..a28025766e7d 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
index 3b64250cb2dc..87788627a484 100644
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
index 8410cf8965a7..417575df7e97 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index 56cfc29c165d..25838b6351bd 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/smack/smack-2.2.1.ebuild b/dev-java/smack/smack-2.2.1.ebuild
index ab51c1568468..db08399d82ab 100644
--- a/dev-java/smack/smack-2.2.1.ebuild
+++ b/dev-java/smack/smack-2.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
index f08f31949c25..d0e257b8771e 100644
--- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
index e10ed9b57b4b..3d2afabf6e0d 100644
--- a/dev-java/snappy/snappy-1.0.3_rc3.ebuild
+++ b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
index 21c5a5f6be03..60983950c431 100644
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/snip/snip-0.11-r1.ebuild b/dev-java/snip/snip-0.11-r1.ebuild
index 2393616f9ad9..9da02b564ff8 100644
--- a/dev-java/snip/snip-0.11-r1.ebuild
+++ b/dev-java/snip/snip-0.11-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
index 280f0df73603..fd39702bbe77 100644
--- a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
+++ b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
index b98bae4ced7a..b2557cff7bdc 100644
--- a/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
+++ b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/spin/spin-1.5-r1.ebuild b/dev-java/spin/spin-1.5-r1.ebuild
index c42dbb5fe212..ba1292591bb0 100644
--- a/dev-java/spin/spin-1.5-r1.ebuild
+++ b/dev-java/spin/spin-1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/spring-aop/spring-aop-3.2.4.ebuild b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
index 9b6f635be1f7..f4a57be18c20 100644
--- a/dev-java/spring-aop/spring-aop-3.2.4.ebuild
+++ b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/spring-beans/spring-beans-3.2.4.ebuild b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
index 583cbd0c406b..466cd5490056 100644
--- a/dev-java/spring-beans/spring-beans-3.2.4.ebuild
+++ b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/spring-core/spring-core-3.2.4.ebuild b/dev-java/spring-core/spring-core-3.2.4.ebuild
index 58ea79f9710d..fdf900c684cf 100644
--- a/dev-java/spring-core/spring-core-3.2.4.ebuild
+++ b/dev-java/spring-core/spring-core-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/spring-expression/spring-expression-3.2.4.ebuild b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
index de0b17a2c172..2d366ebdddd9 100644
--- a/dev-java/spring-expression/spring-expression-3.2.4.ebuild
+++ b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
index db2ccb06eb4a..f72e963f9e7c 100644
--- a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
+++ b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
index 74e123ceeb15..bb946411bb78 100644
--- a/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
+++ b/dev-java/spymemcached/spymemcached-2.9.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
index cbdcd625624d..0bcbf798fece 100644
--- a/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
+++ b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/stax-ex/stax-ex-1.0-r4.ebuild b/dev-java/stax-ex/stax-ex-1.0-r4.ebuild
index d02d66331b9b..ab30dcac5424 100644
--- a/dev-java/stax-ex/stax-ex-1.0-r4.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/stax-ex/stax-ex-1.7.6.ebuild b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
index 7193eb5cd32d..cab4dbe328d8 100644
--- a/dev-java/stax-ex/stax-ex-1.7.6.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/stax/stax-1.2.0.ebuild b/dev-java/stax/stax-1.2.0.ebuild
index de68ba40c435..bbe00fb8a693 100644
--- a/dev-java/stax/stax-1.2.0.ebuild
+++ b/dev-java/stax/stax-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
index b20b192dc01d..e75af973571b 100644
--- a/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/stax2-api/stax2-api-4.0.0.ebuild b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
index 301cb33bbcae..63a661dec1c3 100644
--- a/dev-java/stax2-api/stax2-api-4.0.0.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 26b188d23e86..1c765b5393b3 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 9d91123220a3..7b0d10d82352 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
index 100273abb9bf..90914627c53d 100644
--- a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
index 3dc1cccdc87a..731d5cd936ae 100644
--- a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit java-pkg-2
diff --git a/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
index 09e4a5c02293..5499c4613f57 100644
--- a/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
+++ b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
index 586697369de4..dcf5c7a29860 100644
--- a/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
+++ b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
index 334acdd3bfbc..8750b73d4038 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
index 885e403a5f74..90eeda9d5b62 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index d7b82771c5f7..72d408be0023 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
index 40a626bf57f2..88d7bc2e3d7f 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
index 4ed500086eff..ca578582b69e 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
index 79ea84f9d6e9..a410977eac6a 100644
--- a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
+++ b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
index ec01acdf2fc4..ba659b246e78 100644
--- a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index 9cd9c963f0a6..b6aaba4b5052 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit java-pkg-2
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 3011958f23ee..d6a1f17070fe 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/super-csv/super-csv-2.3.1.ebuild b/dev-java/super-csv/super-csv-2.3.1.ebuild
index b2733a168c2c..3b686ea92fca 100644
--- a/dev-java/super-csv/super-csv-2.3.1.ebuild
+++ b/dev-java/super-csv/super-csv-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="source doc test"
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
index f16a15f79d80..4a87e81f9237 100644
--- a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
+++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
index 4bc905db42d2..c950e60e21df 100644
--- a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/swidgets/swidgets-0.1.1-r1.ebuild b/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
index 200822864427..913df53422ac 100644
--- a/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
+++ b/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="source"
diff --git a/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild b/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
index 8ada85f2dc54..5a719092c419 100644
--- a/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/swing-layout/swing-layout-1.0.4.ebuild b/dev-java/swing-layout/swing-layout-1.0.4.ebuild
index b8928eef407b..f3fb747cef9e 100644
--- a/dev-java/swing-layout/swing-layout-1.0.4.ebuild
+++ b/dev-java/swing-layout/swing-layout-1.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/swing-worker/swing-worker-1.1.ebuild b/dev-java/swing-worker/swing-worker-1.1.ebuild
index 904e91ee8aaa..d1c16300ee00 100644
--- a/dev-java/swing-worker/swing-worker-1.1.ebuild
+++ b/dev-java/swing-worker/swing-worker-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
index d59228928184..d16f79a73d8a 100644
--- a/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
+++ b/dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
index b187832b805d..bb050ca9a791 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
index 784dd520d83e..d417f67fd56f 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/dev-java/swingx/swingx-1.6.4.ebuild b/dev-java/swingx/swingx-1.6.4.ebuild
index bcbfd9b7536f..98db1f30a104 100644
--- a/dev-java/swingx/swingx-1.6.4.ebuild
+++ b/dev-java/swingx/swingx-1.6.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild
index 79a975a6f01e..8f9fb56f021b 100644
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ b/dev-java/swt/swt-3.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
index 95012a506401..de15a30fd3e7 100644
--- a/dev-java/swt/swt-3.7.2-r1.ebuild
+++ b/dev-java/swt/swt-3.7.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
index aed1fb0fa482..e0d8a03d7f0a 100644
--- a/dev-java/swt/swt-3.8.2-r1.ebuild
+++ b/dev-java/swt/swt-3.8.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
index 0a62430b5f1e..10d4a3a0aa38 100644
--- a/dev-java/swt/swt-4.2-r2.ebuild
+++ b/dev-java/swt/swt-4.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tablelayout/tablelayout-1.0.ebuild b/dev-java/tablelayout/tablelayout-1.0.ebuild
index 964c4f51dad6..b0689be25fcf 100644
--- a/dev-java/tablelayout/tablelayout-1.0.ebuild
+++ b/dev-java/tablelayout/tablelayout-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index 5fd880b76c6a..39e296a51b2c 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/tapestry/tapestry-3.0.4-r2.ebuild b/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
index 1e183d2455a2..db9cb0c89264 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/telnetd/telnetd-2.0-r1.ebuild b/dev-java/telnetd/telnetd-2.0-r1.ebuild
index 20b9169f9a4a..65c5919afd5e 100644
--- a/dev-java/telnetd/telnetd-2.0-r1.ebuild
+++ b/dev-java/telnetd/telnetd-2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 0fd85e3e81ed..6a886240f14c 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/texhyphj/texhyphj-1.1.ebuild b/dev-java/texhyphj/texhyphj-1.1.ebuild
index 6744a7945133..c3adbe617a2d 100644
--- a/dev-java/texhyphj/texhyphj-1.1.ebuild
+++ b/dev-java/texhyphj/texhyphj-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/tijmp/tijmp-0.8.ebuild b/dev-java/tijmp/tijmp-0.8.ebuild
index f07d4e70d597..9fea8db45ca0 100644
--- a/dev-java/tijmp/tijmp-0.8.ebuild
+++ b/dev-java/tijmp/tijmp-0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 527fd4be58da..6cd82ef7d554 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index fd00193f8f9c..acb770d95175 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 9ab517d834c1..42d13cb63240 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 5db72ed5e2ed..53f1365c8541 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
index a2925ec1b794..511f3db5d560 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
index 8090c986617a..f361a5a91e31 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
index 281d703b5136..a102a0a83832 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
index a2925ec1b794..511f3db5d560 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
index 0b03a597448f..484cf6a65d9e 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index dd00de0902d5..e598b2041c7f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index e1ce7c506084..0e5528db2026 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index ab75713ba6e7..959d50adb8db 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils java-pkg-2 java-ant-2 java-osgi
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index 4a35c78d5778..428bd62f637c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils java-pkg-2 java-ant-2 java-osgi
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
index 422a0e0254e8..4aba63da9699 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
index 8540bcaaebc0..26121ea67adf 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.73.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.73.ebuild
index 37d8e1716b51..c9daad266682 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.73.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.73.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.75.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.75.ebuild
index 270fee7d0353..5ad70ba59dd8 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.75.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.75.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.39.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.39.ebuild
index 18c5f32a60ad..5fdc913baf1d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.39.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.39.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.41.ebuild
index 945f76809b76..585cc884932c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.41.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.41.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
index a019f4191150..f8477cac7dfe 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.9.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.9.ebuild
index cabadeeefa6f..a767eb6ab832 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.9.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild
index 4ab7422ee88b..4eebcff57a14 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
JAVA_PKG_IUSE="source"
diff --git a/dev-java/toolbar/toolbar-1.1.0-r2.ebuild b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
index d2acdc92e3c3..057a3016ebfc 100644
--- a/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
+++ b/dev-java/toolbar/toolbar-1.1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
index 8d0541f865b2..252ec5063ff4 100644
--- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index f3d938d3f1a3..5bd891235098 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/trident/trident-1.3.ebuild b/dev-java/trident/trident-1.3.ebuild
index 5ec865c6e54b..4310cd5b1f56 100644
--- a/dev-java/trident/trident-1.3.ebuild
+++ b/dev-java/trident/trident-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/trove/trove-2.1.0.ebuild b/dev-java/trove/trove-2.1.0.ebuild
index 0ecb84db8c8b..88a296a90443 100644
--- a/dev-java/trove/trove-2.1.0.ebuild
+++ b/dev-java/trove/trove-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/trove/trove-3.0.2-r1.ebuild b/dev-java/trove/trove-3.0.2-r1.ebuild
index 8ca14c664b60..9c134d5f852f 100644
--- a/dev-java/trove/trove-3.0.2-r1.ebuild
+++ b/dev-java/trove/trove-3.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/trove/trove-3.0.2-r2.ebuild b/dev-java/trove/trove-3.0.2-r2.ebuild
index 821035c4545e..501b2f6b8f10 100644
--- a/dev-java/trove/trove-3.0.2-r2.ebuild
+++ b/dev-java/trove/trove-3.0.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/trove/trove-3.0.2.ebuild b/dev-java/trove/trove-3.0.2.ebuild
index 91d05fb70892..79fd976ca9be 100644
--- a/dev-java/trove/trove-3.0.2.ebuild
+++ b/dev-java/trove/trove-3.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
index d7a16ce6910f..331a381bf865 100644
--- a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
+++ b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
index dadedeef3ad5..e845f4083571 100644
--- a/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
index 436b08b67c1e..af863fe4372a 100644
--- a/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
index 151e4d32d5fc..a47290e3483e 100644
--- a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
+++ b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/upnplib/upnplib-1.0.7.ebuild b/dev-java/upnplib/upnplib-1.0.7.ebuild
index 634f001db06a..b9406fece2ba 100644
--- a/dev-java/upnplib/upnplib-1.0.7.ebuild
+++ b/dev-java/upnplib/upnplib-1.0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/validation-api/validation-api-1.1.0.ebuild b/dev-java/validation-api/validation-api-1.1.0.ebuild
index e05bd78e0844..19740c19abb0 100644
--- a/dev-java/validation-api/validation-api-1.1.0.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
index fffa590023fe..a6cfc8778ec7 100644
--- a/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
+++ b/dev-java/vecmath/vecmath-1.6.0_pre12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
index 28d2b78343af..42c7d261a5bc 100644
--- a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index 67dc9a5a6ff9..fd655d63ddbc 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
index 7f155a058bd2..75e885bd5de0 100644
--- a/dev-java/vldocking/vldocking-3.0.5.ebuild
+++ b/dev-java/vldocking/vldocking-3.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index 0715481e319a..cbba64656259 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
index 666827ae888a..3e6b2e2c676e 100644
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="source doc"
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
index 62d490ce94b2..2f661e8a0a81 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source test"
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 28b1403bf200..0db6b6957de9 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
index fecff4351c87..1be9a1038719 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index 33d11c148e37..f3784c03970d 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
index 375b9ff33d35..54739f5f82e1 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index 7ab611b3a2ea..d0881708a70a 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/xerial-core/xerial-core-2.0.1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
index d9ba44b7e6fc..edaab8c4a833 100644
--- a/dev-java/xerial-core/xerial-core-2.0.1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
index 818f0c9dcd14..5ed7901f0b2f 100644
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
index 7d815850bec5..c19fdaa61e34 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
index ae7bcb5345db..43ac0ec4c4cd 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 698ae0355040..8e5aeae38d73 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
index f5587be19a58..d700a12d7c4a 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xml-commons/xml-commons-1.4.01.ebuild b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
index 6c6642943aba..25d9caa3b6a6 100644
--- a/dev-java/xml-commons/xml-commons-1.4.01.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
index 3f58ddb0c4ca..2f0dfc584976 100644
--- a/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
+++ b/dev-java/xml-security/xml-security-1.5.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
index 90dc9bde09bf..1aea28db10e2 100644
--- a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
+++ b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
index ffa8c2a5a823..caeeefcb60e9 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xmldb/xmldb-20011111-r1.ebuild b/dev-java/xmldb/xmldb-20011111-r1.ebuild
index dd0c91cfe048..1fef14c0113a 100644
--- a/dev-java/xmldb/xmldb-20011111-r1.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
index 4f196003b1f7..d1a1ef74e9cb 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
index 1eca6f6cd225..ef2e39853971 100644
--- a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
+++ b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
index 996c5a137043..52d9d6ba51ca 100644
--- a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
+++ b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
index f1fe207bc98f..a42ae29d3a59 100644
--- a/dev-java/xmlunit/xmlunit-1.6.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/xmpcore/xmpcore-5.1.2.ebuild b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
index 1d28c87bcd77..91da69eb8ff0 100644
--- a/dev-java/xmpcore/xmpcore-5.1.2.ebuild
+++ b/dev-java/xmpcore/xmpcore-5.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
index 6966f9b596a4..ac0d5e5aa138 100644
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/xp/xp-0.5-r3.ebuild b/dev-java/xp/xp-0.5-r3.ebuild
index a699704960fc..93637e006ad9 100644
--- a/dev-java/xp/xp-0.5-r3.ebuild
+++ b/dev-java/xp/xp-0.5-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
index a552a9a2a2cf..6bf522c9246b 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
index 3bc2a5a0bb36..7eaf210fa737 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index c931c8a69fd5..0403c82aa311 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-java/xsom/xsom-20140925.ebuild b/dev-java/xsom/xsom-20140925.ebuild
index 90fe6d2ebe52..5f906491315f 100644
--- a/dev-java/xsom/xsom-20140925.ebuild
+++ b/dev-java/xsom/xsom-20140925.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xstream/xstream-1.4.8-r1.ebuild b/dev-java/xstream/xstream-1.4.8-r1.ebuild
index 22ddfe6f32ae..70bcd6d8e5b4 100644
--- a/dev-java/xstream/xstream-1.4.8-r1.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xstream/xstream-1.4.8-r2.ebuild b/dev-java/xstream/xstream-1.4.8-r2.ebuild
index b72fc3197567..4c6aee8cd984 100644
--- a/dev-java/xstream/xstream-1.4.8-r2.ebuild
+++ b/dev-java/xstream/xstream-1.4.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-java/xz-java/xz-java-1.5.ebuild b/dev-java/xz-java/xz-java-1.5.ebuild
index 79cb2112854b..d04c979c7ead 100644
--- a/dev-java/xz-java/xz-java-1.5.ebuild
+++ b/dev-java/xz-java/xz-java-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/xz-java/xz-java-1.6.ebuild b/dev-java/xz-java/xz-java-1.6.ebuild
index bee64be53a4c..1aeaf243f91a 100644
--- a/dev-java/xz-java/xz-java-1.6.ebuild
+++ b/dev-java/xz-java/xz-java-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
JAVA_PKG_IUSE="doc examples source"
diff --git a/dev-java/yanfs/yanfs-1.0.ebuild b/dev-java/yanfs/yanfs-1.0.ebuild
index fb2554291e1a..9c248cd2c3ad 100644
--- a/dev-java/yanfs/yanfs-1.0.ebuild
+++ b/dev-java/yanfs/yanfs-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
index 3ffa2e165a06..104b1c3c4742 100644
--- a/dev-java/zemberek/zemberek-2.1.1.ebuild
+++ b/dev-java/zemberek/zemberek-2.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
JAVA_PKG_IUSE="source doc test"
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
index b1108a85665a..0b481c266c9d 100644
--- a/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
+++ b/dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6