summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:47:27 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:50:50 -0800
commit61b861acd7b49083dab687e133f30f3331cb7480 (patch)
tree8a7f8399749ed165000187dad48ad8ac4b831465 /dev-util
parentkde-apps/kcharselect: Add missing DEPEND (diff)
downloadgentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.gz
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.bz2
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.zip
Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild1
-rw-r--r--dev-util/Orange/Orange-2.7.2.ebuild1
-rw-r--r--dev-util/a8/a8-0.11-r2.ebuild1
-rw-r--r--dev-util/a8/a8-1.0.ebuild1
-rw-r--r--dev-util/abi-compliance-checker/abi-compliance-checker-1.99.21.ebuild1
-rw-r--r--dev-util/abi-compliance-checker/abi-compliance-checker-1.99.22.ebuild1
-rw-r--r--dev-util/abi-compliance-checker/abi-compliance-checker-1.99.23.ebuild1
-rw-r--r--dev-util/abi-compliance-checker/abi-compliance-checker-1.99.25.ebuild1
-rw-r--r--dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild1
-rw-r--r--dev-util/abi-dumper/abi-dumper-0.99.15.ebuild1
-rw-r--r--dev-util/abi-dumper/abi-dumper-0.99.19.ebuild1
-rw-r--r--dev-util/abootimg/abootimg-20150323.ebuild1
-rw-r--r--dev-util/ald/ald-0.1.7-r2.ebuild1
-rw-r--r--dev-util/alleyoop/alleyoop-0.9.8.ebuild1
-rw-r--r--dev-util/amtterm/amtterm-1.3-r1.ebuild1
-rw-r--r--dev-util/amtterm/amtterm-1.4.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-10.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-10b.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-10d.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-10e.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-11c-r1.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-11c.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-13b.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-8b.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-8c.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-8d.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-8e.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-9.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-9b.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-9c.ebuild1
-rw-r--r--dev-util/android-ndk/android-ndk-9d.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild1
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild1
-rw-r--r--dev-util/android-studio/android-studio-2.2.3.0.145.3537739.ebuild1
-rw-r--r--dev-util/android-tools/android-tools-5.1.1_p13.ebuild1
-rw-r--r--dev-util/anjuta/anjuta-3.20.0.ebuild1
-rw-r--r--dev-util/anjuta/anjuta-3.22.0.ebuild1
-rw-r--r--dev-util/antlrworks/antlrworks-1.2.3.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-4.0.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-5.0.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-6.0.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-6.1.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-7.1.ebuild1
-rw-r--r--dev-util/appdata-tools/appdata-tools-0.1.7.ebuild1
-rw-r--r--dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild1
-rw-r--r--dev-util/appinventor/appinventor-1.1.ebuild1
-rw-r--r--dev-util/archdiff/archdiff-1.1.6.ebuild1
-rw-r--r--dev-util/argouml/argouml-0.34.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild1
-rw-r--r--dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild1
-rw-r--r--dev-util/aruba/aruba-0.5.4-r1.ebuild1
-rw-r--r--dev-util/aruba/aruba-0.6.2-r1.ebuild1
-rw-r--r--dev-util/aruba/aruba-0.6.2.ebuild1
-rw-r--r--dev-util/aruba/aruba-0.7.4.ebuild1
-rw-r--r--dev-util/aruba/aruba-0.8.1.ebuild1
-rw-r--r--dev-util/astyle/astyle-2.04-r1.ebuild1
-rw-r--r--dev-util/astyle/astyle-2.05.1.ebuild1
-rw-r--r--dev-util/astyle/astyle-2.06.ebuild1
-rw-r--r--dev-util/atomic-install/atomic-install-0.1.1.ebuild1
-rw-r--r--dev-util/atomic-install/atomic-install-9999.ebuild1
-rw-r--r--dev-util/autodia/autodia-2.140.0-r1.ebuild1
-rw-r--r--dev-util/automoc/automoc-0.9.88-r1.ebuild1
-rw-r--r--dev-util/autoproject/autoproject-0.20.ebuild1
-rw-r--r--dev-util/autoproject/autoproject-0.20_p5.ebuild1
-rw-r--r--dev-util/babeltrace/babeltrace-1.2.3.ebuild1
-rw-r--r--dev-util/babeltrace/babeltrace-1.2.4.ebuild1
-rw-r--r--dev-util/bakefile/bakefile-0.2.9-r1.ebuild1
-rw-r--r--dev-util/bam/bam-0.4.0-r1.ebuild1
-rw-r--r--dev-util/bats/bats-0.4.0.ebuild1
-rw-r--r--dev-util/bazel/bazel-0.3.2-r1.ebuild1
-rw-r--r--dev-util/bazel/bazel-0.3.2.ebuild1
-rw-r--r--dev-util/bazel/bazel-0.4.0.ebuild1
-rw-r--r--dev-util/bazel/bazel-0.4.3.ebuild1
-rw-r--r--dev-util/bbe/bbe-0.2.2.ebuild1
-rw-r--r--dev-util/bcc/bcc-0.1.8-r2.ebuild1
-rw-r--r--dev-util/bcc/bcc-0.2.0-r1.ebuild1
-rw-r--r--dev-util/bcpp/bcpp-20050725.ebuild1
-rw-r--r--dev-util/bcpp/bcpp-20090630.ebuild1
-rw-r--r--dev-util/bcpp/bcpp-20150811.ebuild1
-rw-r--r--dev-util/bdelta/bdelta-0.3.1.ebuild1
-rw-r--r--dev-util/beediff/beediff-1.9.ebuild1
-rw-r--r--dev-util/biew/biew-6.1.0-r3.ebuild1
-rw-r--r--dev-util/bin_replace_string/bin_replace_string-0.2.ebuild1
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.13.0.ebuild1
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.13.1.ebuild1
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild1
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild1
-rw-r--r--dev-util/bless/bless-0.6.0-r2.ebuild1
-rw-r--r--dev-util/bluej/bluej-3.1.1.ebuild1
-rw-r--r--dev-util/bnfc/bnfc-2.8.1.ebuild1
-rw-r--r--dev-util/bnfc/bnfc-2.8.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.56.0.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.58.0.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.59.0.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.60.0.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.61.0.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.62.0-r1.ebuild1
-rw-r--r--dev-util/boost-build/boost-build-1.63.0.ebuild1
-rw-r--r--dev-util/bsdiff/bsdiff-4.3-r3.ebuild1
-rw-r--r--dev-util/btyacc/btyacc-3.0-r2.ebuild1
-rw-r--r--dev-util/build/build-0.3.10.ebuild1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.2.ebuild1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.2.ebuild1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild1
-rw-r--r--dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.2.ebuild1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-9999.ebuild1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.2.ebuild1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.3.ebuild1
-rw-r--r--dev-util/buildbot-www/buildbot-www-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.8.10.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.8.12-r3.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.9.0_p1.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.9.1.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.9.2.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.9.3.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-0.9.4.ebuild1
-rw-r--r--dev-util/buildbot/buildbot-9999.ebuild1
-rw-r--r--dev-util/bumpversion/bumpversion-0.5.3.ebuild1
-rw-r--r--dev-util/bustle/bustle-0.4.2-r1.ebuild1
-rw-r--r--dev-util/bustle/bustle-0.4.7-r1.ebuild1
-rw-r--r--dev-util/bustle/bustle-0.5.4.ebuild1
-rw-r--r--dev-util/byacc/byacc-20150711.ebuild1
-rw-r--r--dev-util/byacc/byacc-20160606.ebuild1
-rw-r--r--dev-util/byacc/byacc-20170201.ebuild1
-rw-r--r--dev-util/cargo/cargo-0.15.0.ebuild1
-rw-r--r--dev-util/cargo/cargo-0.16.0.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r1.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r4.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-2.0.9999.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-2.9999.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-3.0_rc1.ebuild1
-rw-r--r--dev-util/catalyst/catalyst-9999.ebuild1
-rw-r--r--dev-util/catfish/catfish-1.2.2.ebuild1
-rw-r--r--dev-util/catkin/catkin-0.7.6-r1.ebuild1
-rw-r--r--dev-util/catkin/catkin-9999.ebuild1
-rw-r--r--dev-util/ccache/ccache-3.2.4.ebuild1
-rw-r--r--dev-util/ccache/ccache-3.2.5.ebuild1
-rw-r--r--dev-util/cccc/cccc-3.1.5.ebuild1
-rw-r--r--dev-util/ccglue/ccglue-0.3.1.ebuild1
-rw-r--r--dev-util/ccglue/ccglue-0.6.0.ebuild1
-rw-r--r--dev-util/cdiff/cdiff-0.9.7.ebuild1
-rw-r--r--dev-util/cdiff/cdiff-0.9.8.ebuild1
-rw-r--r--dev-util/cdiff/cdiff-9999.ebuild1
-rw-r--r--dev-util/cflow/cflow-1.4.ebuild1
-rw-r--r--dev-util/cgdb/cgdb-0.6.6.ebuild1
-rw-r--r--dev-util/cgdb/cgdb-0.6.7.ebuild1
-rw-r--r--dev-util/cgdb/cgdb-0.6.8.ebuild1
-rw-r--r--dev-util/cgdb/cgdb-9999.ebuild1
-rw-r--r--dev-util/cgvg/cgvg-1.6.2.ebuild1
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.16.13.ebuild1
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.17.0.ebuild1
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.17.1.ebuild1
-rw-r--r--dev-util/checkstyle/checkstyle-5.5-r1.ebuild1
-rw-r--r--dev-util/checkstyle/checkstyle-7.2.ebuild1
-rw-r--r--dev-util/cligh/cligh-0.1_p20120630.ebuild1
-rw-r--r--dev-util/cligh/cligh-0.2.ebuild1
-rw-r--r--dev-util/cligh/cligh-9999.ebuild1
-rw-r--r--dev-util/clion/clion-1.2.4.143.1186.ebuild1
-rw-r--r--dev-util/clion/clion-2016.2.1.ebuild1
-rw-r--r--dev-util/cloc/cloc-1.64.ebuild1
-rw-r--r--dev-util/cloc/cloc-1.66.ebuild1
-rw-r--r--dev-util/cloc/cloc-1.70.ebuild1
-rw-r--r--dev-util/cloc/cloc-1.72.ebuild1
-rw-r--r--dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild1
-rw-r--r--dev-util/cmake/cmake-3.6.3.ebuild1
-rw-r--r--dev-util/cmake/cmake-3.7.2.ebuild1
-rw-r--r--dev-util/cmake/cmake-3.8.0_rc1.ebuild1
-rw-r--r--dev-util/cmdtest/cmdtest-0.16.ebuild1
-rw-r--r--dev-util/cmdtest/cmdtest-0.18.ebuild1
-rw-r--r--dev-util/cmdtest/cmdtest-0.27.ebuild1
-rw-r--r--dev-util/cmocka/cmocka-1.0.1.ebuild1
-rw-r--r--dev-util/cmocka/cmocka-1.1.0.ebuild1
-rw-r--r--dev-util/cmt/cmt-1.26.ebuild1
-rw-r--r--dev-util/coccigrep/coccigrep-1.13.ebuild1
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.5.ebuild1
-rw-r--r--dev-util/coccinelle/coccinelle-1.0.6.ebuild1
-rw-r--r--dev-util/codeblocks/codeblocks-16.01.ebuild1
-rw-r--r--dev-util/codeblocks/codeblocks-9999.ebuild1
-rw-r--r--dev-util/colm/colm-0.12.0.ebuild1
-rw-r--r--dev-util/colm/colm-0.13.0.3.ebuild1
-rw-r--r--dev-util/colm/colm-0.13.0.4.ebuild1
-rw-r--r--dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild1
-rw-r--r--dev-util/comparator/comparator-2.10.ebuild1
-rw-r--r--dev-util/complexity/complexity-1.10.ebuild1
-rw-r--r--dev-util/conan/conan-0.17.1.ebuild1
-rw-r--r--dev-util/conan/conan-0.19.1.ebuild1
-rw-r--r--dev-util/confix-wrapper/confix-wrapper-0.ebuild1
-rw-r--r--dev-util/confix/confix-2.3.5-r2.ebuild1
-rw-r--r--dev-util/confix/confix-9999.ebuild1
-rw-r--r--dev-util/cookiecutter/cookiecutter-1.5.0.ebuild1
-rw-r--r--dev-util/cookiecutter/cookiecutter-1.5.1.ebuild1
-rw-r--r--dev-util/cppcheck/cppcheck-1.72.ebuild1
-rw-r--r--dev-util/cppcheck/cppcheck-1.75.ebuild1
-rw-r--r--dev-util/cppcheck/cppcheck-1.77.ebuild1
-rw-r--r--dev-util/cppcheck/cppcheck-9999.ebuild1
-rw-r--r--dev-util/cppi/cppi-1.18.ebuild1
-rw-r--r--dev-util/cpptest/cpptest-1.1.2.ebuild1
-rw-r--r--dev-util/cppunit/cppunit-1.13.1.ebuild1
-rw-r--r--dev-util/cppunit/cppunit-1.13.2-r2.ebuild1
-rw-r--r--dev-util/cppunit/cppunit-9999.ebuild1
-rw-r--r--dev-util/cpputest/cpputest-3.7.2.ebuild1
-rw-r--r--dev-util/cpputest/cpputest-3.8.ebuild1
-rw-r--r--dev-util/cproto/cproto-4.7e.ebuild1
-rw-r--r--dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild1
-rw-r--r--dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild1
-rw-r--r--dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild1
-rw-r--r--dev-util/cram/cram-0.7.ebuild1
-rw-r--r--dev-util/crash/crash-6.1.4.ebuild1
-rw-r--r--dev-util/crash/crash-7.0.0.ebuild1
-rw-r--r--dev-util/crash/crash-7.0.3.ebuild1
-rw-r--r--dev-util/crash/crash-7.0.7.ebuild1
-rw-r--r--dev-util/creduce/creduce-2.4.0.ebuild1
-rw-r--r--dev-util/creduce/creduce-2.5.0.ebuild1
-rw-r--r--dev-util/creduce/creduce-2.6.0.ebuild1
-rw-r--r--dev-util/creduce/creduce-9999.ebuild1
-rw-r--r--dev-util/cscope/cscope-15.8a-r1.ebuild1
-rw-r--r--dev-util/cscope/cscope-15.8a-r2.ebuild1
-rw-r--r--dev-util/csup/csup-20060318.ebuild1
-rw-r--r--dev-util/ctags/ctags-20161028.ebuild1
-rw-r--r--dev-util/ctags/ctags-5.8-r1.ebuild1
-rw-r--r--dev-util/ctags/ctags-5.8.ebuild1
-rw-r--r--dev-util/ctags/ctags-5.8_p20140919.ebuild1
-rw-r--r--dev-util/cucumber-core/cucumber-core-1.4.0.ebuild1
-rw-r--r--dev-util/cucumber-core/cucumber-core-1.5.0.ebuild1
-rw-r--r--dev-util/cucumber-rails/cucumber-rails-1.4.3.ebuild1
-rw-r--r--dev-util/cucumber-rails/cucumber-rails-1.4.4.ebuild1
-rw-r--r--dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild1
-rw-r--r--dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild1
-rw-r--r--dev-util/cucumber/cucumber-1.3.17.ebuild1
-rw-r--r--dev-util/cucumber/cucumber-1.3.20-r1.ebuild1
-rw-r--r--dev-util/cucumber/cucumber-2.4.0-r1.ebuild1
-rw-r--r--dev-util/cucumber/cucumber-2.4.0.ebuild1
-rw-r--r--dev-util/cunit/cunit-2.1_p2-r1.ebuild1
-rw-r--r--dev-util/cunit/cunit-2.1_p3.ebuild1
-rw-r--r--dev-util/cutils/cutils-1.6-r4.ebuild1
-rw-r--r--dev-util/cwdiff/cwdiff-0.2.8.ebuild1
-rw-r--r--dev-util/cwdiff/cwdiff-0.3.0.ebuild1
-rw-r--r--dev-util/cwdiff/cwdiff-0.3.1.ebuild1
-rw-r--r--dev-util/cwdiff/cwdiff-0.4.0.ebuild1
-rw-r--r--dev-util/cwdiff/cwdiff-9999.ebuild1
-rw-r--r--dev-util/cyclo/cyclo-2.1.0.ebuild1
-rw-r--r--dev-util/d-feet/d-feet-0.3.10.ebuild1
-rw-r--r--dev-util/d-feet/d-feet-0.3.11.ebuild1
-rw-r--r--dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild1
-rw-r--r--dev-util/ddd/ddd-3.3.12-r3.ebuild1
-rw-r--r--dev-util/ddd/ddd-3.3.12-r4.ebuild1
-rw-r--r--dev-util/debhelper/debhelper-10.2.4.ebuild1
-rw-r--r--dev-util/debhelper/debhelper-10.2.5.ebuild1
-rw-r--r--dev-util/debhelper/debhelper-9.20150101.ebuild1
-rw-r--r--dev-util/debhelper/debhelper-9.20160814.ebuild1
-rw-r--r--dev-util/debootstrap/debootstrap-1.0.87.ebuild1
-rw-r--r--dev-util/debootstrap/debootstrap-1.0.88.ebuild1
-rw-r--r--dev-util/debugedit/debugedit-5.3.5-r1.ebuild1
-rw-r--r--dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild1
-rw-r--r--dev-util/dejagnu/dejagnu-1.5.ebuild1
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild1
-rw-r--r--dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild1
-rw-r--r--dev-util/devhelp/devhelp-3.20.0.ebuild1
-rw-r--r--dev-util/devhelp/devhelp-3.22.0.ebuild1
-rw-r--r--dev-util/dialog/dialog-1.3.20160828.ebuild1
-rw-r--r--dev-util/dialog/dialog-1.3.20170131.ebuild1
-rw-r--r--dev-util/diffball/diffball-1.0.1.ebuild1
-rw-r--r--dev-util/difffilter/difffilter-0.3.3.ebuild1
-rw-r--r--dev-util/diffstat/diffstat-1.60.ebuild1
-rw-r--r--dev-util/diffstat/diffstat-1.61.ebuild1
-rw-r--r--dev-util/diffuse/diffuse-0.4.8.ebuild1
-rw-r--r--dev-util/dirdiff/dirdiff-2.1-r2.ebuild1
-rw-r--r--dev-util/dissembler/dissembler-0.9-r1.ebuild1
-rw-r--r--dev-util/distro-info-data/distro-info-data-0.29.ebuild1
-rw-r--r--dev-util/distro-info-data/distro-info-data-0.32.ebuild1
-rw-r--r--dev-util/distro-info/distro-info-0.14.ebuild1
-rw-r--r--dev-util/dmake/dmake-4.12.2.ebuild1
-rw-r--r--dev-util/dogtail/dogtail-0.9.0-r2.ebuild1
-rw-r--r--dev-util/dogtail/dogtail-0.9.9.ebuild1
-rw-r--r--dev-util/doxy-coverage/doxy-coverage-151229.ebuild1
-rw-r--r--dev-util/dput-ng/dput-ng-1.10.ebuild1
-rw-r--r--dev-util/drone-ui/drone-ui-0_pre20170103.ebuild1
-rw-r--r--dev-util/drone/drone-0.5.0_pre20170219.ebuild1
-rw-r--r--dev-util/drone/drone-0.5.0_pre20170224.ebuild1
-rw-r--r--dev-util/dropwatch/dropwatch-1.4-r1.ebuild1
-rw-r--r--dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild1
-rw-r--r--dev-util/duma/duma-2.5.13.ebuild1
-rw-r--r--dev-util/duma/duma-2.5.15-r2.ebuild1
-rw-r--r--dev-util/dwarves/dwarves-1.10_p20140618.ebuild1
-rw-r--r--dev-util/dwarves/dwarves-1.10_p20160519.ebuild1
-rw-r--r--dev-util/dwarves/dwarves-1.10_p20160630.ebuild1
-rw-r--r--dev-util/dwarves/dwarves-9999.ebuild1
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild1
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.0.ebuild1
-rw-r--r--dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild1
-rw-r--r--dev-util/egypt/egypt-1.10.ebuild1
-rw-r--r--dev-util/electron/electron-0.36.12-r5.ebuild1
-rw-r--r--dev-util/electron/electron-0.37.8-r2.ebuild1
-rw-r--r--dev-util/electron/electron-1.3.13-r1.ebuild1
-rw-r--r--dev-util/elfkickers/elfkickers-3.0a.ebuild1
-rw-r--r--dev-util/elfkickers/elfkickers-3.1.ebuild1
-rw-r--r--dev-util/emilpro/emilpro-3-r3.ebuild1
-rw-r--r--dev-util/emilpro/emilpro-9999.ebuild1
-rw-r--r--dev-util/eric/eric-16.12.ebuild1
-rw-r--r--dev-util/eric/eric-17.01.ebuild1
-rw-r--r--dev-util/fatrace/fatrace-0.11.ebuild1
-rw-r--r--dev-util/fatrace/fatrace-0.12.ebuild1
-rw-r--r--dev-util/febootstrap/febootstrap-2.11.ebuild1
-rw-r--r--dev-util/fhist/fhist-1.16.ebuild1
-rw-r--r--dev-util/fhist/fhist-1.19.ebuild1
-rw-r--r--dev-util/fhist/fhist-1.21.ebuild1
-rw-r--r--dev-util/findbugs/findbugs-3.0.1.ebuild1
-rw-r--r--dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild1
-rw-r--r--dev-util/flawfinder/flawfinder-1.31.ebuild1
-rw-r--r--dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild1
-rw-r--r--dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild1
-rw-r--r--dev-util/fuzz/fuzz-0.6-r1.ebuild1
-rw-r--r--dev-util/gcovr/gcovr-3.2.ebuild1
-rw-r--r--dev-util/gcovr/gcovr-3.3.ebuild1
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild1
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild1
-rw-r--r--dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild1
-rw-r--r--dev-util/geany/geany-1.28.ebuild1
-rw-r--r--dev-util/geany/geany-1.29-r1.ebuild1
-rw-r--r--dev-util/gengetopt/gengetopt-2.22.6.ebuild1
-rw-r--r--dev-util/gertty/gertty-1.3.2.ebuild1
-rw-r--r--dev-util/gertty/gertty-1.4.0.ebuild1
-rw-r--r--dev-util/glade/glade-3.20.0.ebuild1
-rw-r--r--dev-util/global/global-6.3.1.ebuild1
-rw-r--r--dev-util/gnome-devel-docs/gnome-devel-docs-3.20.2.ebuild1
-rw-r--r--dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild1
-rw-r--r--dev-util/gob/gob-2.0.20.ebuild1
-rw-r--r--dev-util/google-perftools/google-perftools-1.8.3.ebuild1
-rw-r--r--dev-util/google-perftools/google-perftools-2.0-r2.ebuild1
-rw-r--r--dev-util/google-perftools/google-perftools-2.5.ebuild1
-rw-r--r--dev-util/gource/gource-0.44.ebuild1
-rw-r--r--dev-util/gperf/gperf-3.0.4.ebuild1
-rw-r--r--dev-util/gperf/gperf-3.1.ebuild1
-rw-r--r--dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild1
-rw-r--r--dev-util/gquilt/gquilt-0.25-r1.ebuild1
-rw-r--r--dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild1
-rw-r--r--dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31.ebuild1
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild1
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild1
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.20.9.ebuild1
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild1
-rw-r--r--dev-util/heaptrack/heaptrack-9999.ebuild1
-rw-r--r--dev-util/howdoi/howdoi-1.1.9.ebuild1
-rw-r--r--dev-util/huc/huc-0.1-r1.ebuild1
-rw-r--r--dev-util/huc/huc-0.1.ebuild1
-rw-r--r--dev-util/hxd/hxd-0.70.02-r1.ebuild1
-rw-r--r--dev-util/hxtools/hxtools-20121125-r1.ebuild1
-rw-r--r--dev-util/icemon/icemon-20140102.ebuild1
-rw-r--r--dev-util/icmake/icmake-7.22.01.ebuild1
-rw-r--r--dev-util/icmake/icmake-9.00.00.ebuild1
-rw-r--r--dev-util/icmake/icmake-9.02.02.ebuild1
-rw-r--r--dev-util/idea-community/idea-community-2016.3.3.163.11103.6.ebuild1
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-2016.3.1.163.9166.29.ebuild1
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-2016.3.3.163.11103.6.ebuild1
-rw-r--r--dev-util/idutils/idutils-4.2.ebuild1
-rw-r--r--dev-util/idutils/idutils-4.5.ebuild1
-rw-r--r--dev-util/idutils/idutils-4.6.ebuild1
-rw-r--r--dev-util/igprof/igprof-5.9.11.ebuild1
-rw-r--r--dev-util/imediff2/imediff2-1.1.2-r3.ebuild1
-rw-r--r--dev-util/include-what-you-use/include-what-you-use-3.5.ebuild1
-rw-r--r--dev-util/include-what-you-use/include-what-you-use-3.6.ebuild1
-rw-r--r--dev-util/include-what-you-use/include-what-you-use-3.7-r1.ebuild1
-rw-r--r--dev-util/include-what-you-use/include-what-you-use-3.8.ebuild1
-rw-r--r--dev-util/include-what-you-use/include-what-you-use-3.9.ebuild1
-rw-r--r--dev-util/indent/indent-2.2.11-r1.ebuild1
-rw-r--r--dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild1
-rw-r--r--dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild1
-rw-r--r--dev-util/intltool/intltool-0.50.2-r1.ebuild1
-rw-r--r--dev-util/intltool/intltool-0.51.0-r1.ebuild1
-rw-r--r--dev-util/intltool/intltool-0.51.0.ebuild1
-rw-r--r--dev-util/its4/its4-1.1.1.ebuild1
-rw-r--r--dev-util/itstool/itstool-2.0.2.ebuild1
-rw-r--r--dev-util/jarwizard/jarwizard-2.50.ebuild1
-rw-r--r--dev-util/jay/jay-1.1.1-r2.ebuild1
-rw-r--r--dev-util/jconfig/jconfig-2.8-r3.ebuild1
-rw-r--r--dev-util/jconfig/jconfig-2.8.5.ebuild1
-rw-r--r--dev-util/jconfig/jconfig-2.9.ebuild1
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-1.651.2.ebuild1
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.32.2.ebuild1
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.45.ebuild1
-rw-r--r--dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild1
-rw-r--r--dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild1
-rw-r--r--dev-util/kbuild/kbuild-9999.ebuild1
-rw-r--r--dev-util/kcov/kcov-33.ebuild1
-rw-r--r--dev-util/kcov/kcov-9999.ebuild1
-rw-r--r--dev-util/kdbg/kdbg-2.5.6.ebuild1
-rw-r--r--dev-util/kdbg/kdbg-2.9.0.ebuild1
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild1
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild1
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild1
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0.ebuild1
-rw-r--r--dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild1
-rw-r--r--dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild1
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild1
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild1
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-5.0.3.ebuild1
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild1
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-1.7.4.ebuild1
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-5.0.3.ebuild1
-rw-r--r--dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild1
-rw-r--r--dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild1
-rw-r--r--dev-util/kdevelop/kdevelop-4.7.2.ebuild1
-rw-r--r--dev-util/kdevelop/kdevelop-4.7.4.ebuild1
-rw-r--r--dev-util/kdevelop/kdevelop-5.0.3.ebuild1
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild1
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.7.4.ebuild1
-rw-r--r--dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild1
-rw-r--r--dev-util/kdevplatform/kdevplatform-5.0.3.ebuild1
-rw-r--r--dev-util/kelbt/kelbt-0.15.ebuild1
-rw-r--r--dev-util/kscope/kscope-1.9.4-r2.ebuild1
-rw-r--r--dev-util/kup/kup-0.3.4-r1.ebuild1
-rw-r--r--dev-util/lcov/lcov-1.11.ebuild1
-rw-r--r--dev-util/lcov/lcov-1.13.ebuild1
-rw-r--r--dev-util/lcov/lcov-1.9-r1.ebuild1
-rw-r--r--dev-util/leaktracer/leaktracer-2.4-r3.ebuild1
-rw-r--r--dev-util/linklint/linklint-2.3.5.ebuild1
-rw-r--r--dev-util/lldb/lldb-4.0.0_rc2.ebuild1
-rw-r--r--dev-util/lldb/lldb-9999.ebuild1
-rw-r--r--dev-util/lockrun/lockrun-20120508.ebuild1
-rw-r--r--dev-util/lsuio/lsuio-0.2.0.ebuild1
-rw-r--r--dev-util/ltrace/ltrace-0.5.3.1.ebuild1
-rw-r--r--dev-util/ltrace/ltrace-0.7.2.ebuild1
-rw-r--r--dev-util/ltrace/ltrace-0.7.3.ebuild1
-rw-r--r--dev-util/ltrace/ltrace-0.7.3_p4.ebuild1
-rw-r--r--dev-util/lttng-modules/lttng-modules-2.6.4.ebuild1
-rw-r--r--dev-util/lttng-modules/lttng-modules-2.7.1.ebuild1
-rw-r--r--dev-util/lttng-modules/lttng-modules-2.7.4.ebuild1
-rw-r--r--dev-util/lttng-modules/lttng-modules-2.8.0.ebuild1
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.6.1.ebuild1
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.7.1.ebuild1
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.7.3.ebuild1
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.8.0.ebuild1
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.6.5.ebuild1
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.7.1.ebuild1
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.7.4.ebuild1
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.8.1.ebuild1
-rw-r--r--dev-util/makeheaders/makeheaders-0_p4.ebuild1
-rw-r--r--dev-util/makepp/makepp-1.18.ebuild1
-rw-r--r--dev-util/makepp/makepp-1.40.1a.ebuild1
-rw-r--r--dev-util/makepp/makepp-1.50_pre110621.ebuild1
-rw-r--r--dev-util/makepp/makepp-2.0-r1.ebuild1
-rw-r--r--dev-util/makepp/makepp-2.0.98.4.ebuild1
-rw-r--r--dev-util/makepp/makepp-2.0.98.5.ebuild1
-rw-r--r--dev-util/mdds/mdds-1.2.2.ebuild1
-rw-r--r--dev-util/mdds/mdds-9999.ebuild1
-rw-r--r--dev-util/meld/meld-3.16.4.ebuild1
-rw-r--r--dev-util/memprof/memprof-0.6.2-r1.ebuild1
-rw-r--r--dev-util/meson/meson-0.36.0.ebuild1
-rw-r--r--dev-util/meson/meson-0.37.1.ebuild1
-rw-r--r--dev-util/meson/meson-0.38.0.ebuild1
-rw-r--r--dev-util/meson/meson-0.38.1.ebuild1
-rw-r--r--dev-util/meson/meson-9999.ebuild1
-rw-r--r--dev-util/min-cscope/min-cscope-16.1.0.ebuild1
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.18.ebuild1
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild1
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.20.ebuild1
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild1
-rw-r--r--dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild1
-rw-r--r--dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild1
-rw-r--r--dev-util/molecule/molecule-2.ebuild1
-rw-r--r--dev-util/monkeystudio/monkeystudio-1.9.0.4-r1.ebuild1
-rw-r--r--dev-util/mpatch/mpatch-0.8-r1.ebuild1
-rw-r--r--dev-util/mutrace/mutrace-0.2-r1.ebuild1
-rw-r--r--dev-util/nemiver/nemiver-0.9.6.ebuild1
-rw-r--r--dev-util/netbeans/netbeans-8.0.2.ebuild1
-rw-r--r--dev-util/netbeans/netbeans-8.1.ebuild1
-rw-r--r--dev-util/netbeans/netbeans-8.2.ebuild1
-rw-r--r--dev-util/ninja-ide/ninja-ide-2.3.ebuild1
-rw-r--r--dev-util/ninja/ninja-1.6.0.ebuild1
-rw-r--r--dev-util/ninja/ninja-1.7.1.ebuild1
-rw-r--r--dev-util/ninja/ninja-1.7.2.ebuild1
-rw-r--r--dev-util/ninja/ninja-9999.ebuild1
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild1
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild1
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild1
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild1
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild1
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild1
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild1
-rw-r--r--dev-util/objconv/objconv-2.32_pre20131127.ebuild1
-rw-r--r--dev-util/objconv/objconv-2.42.ebuild1
-rw-r--r--dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild1
-rw-r--r--dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild1
-rw-r--r--dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild1
-rw-r--r--dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild1
-rw-r--r--dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild1
-rw-r--r--dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild1
-rw-r--r--dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild1
-rw-r--r--dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild1
-rw-r--r--dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild1
-rw-r--r--dev-util/obs-service-meta/obs-service-meta-1.ebuild1
-rw-r--r--dev-util/obs-service-meta/obs-service-meta-2.ebuild1
-rw-r--r--dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild1
-rw-r--r--dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild1
-rw-r--r--dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild1
-rw-r--r--dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild1
-rw-r--r--dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild1
-rw-r--r--dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild1
-rw-r--r--dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild1
-rw-r--r--dev-util/omake/omake-0.10.2.ebuild1
-rw-r--r--dev-util/omake/omake-0.9.8.6.0_rc1.ebuild1
-rw-r--r--dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild1
-rw-r--r--dev-util/oprofile/oprofile-0.9.9-r2.ebuild1
-rw-r--r--dev-util/oprofile/oprofile-1.1.0-r1.ebuild1
-rw-r--r--dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild1
-rw-r--r--dev-util/osc/osc-0.148.2.ebuild1
-rw-r--r--dev-util/osc/osc-0.152.0.ebuild1
-rw-r--r--dev-util/osc/osc-0.154.0.ebuild1
-rw-r--r--dev-util/osc/osc-9999.ebuild1
-rw-r--r--dev-util/patchelf/patchelf-0.8.ebuild1
-rw-r--r--dev-util/patchelf/patchelf-0.9.ebuild1
-rw-r--r--dev-util/patchutils/patchutils-0.3.3.ebuild1
-rw-r--r--dev-util/patchutils/patchutils-0.3.4.ebuild1
-rw-r--r--dev-util/peg/peg-0.1.13.ebuild1
-rw-r--r--dev-util/peg/peg-0.1.15-r1.ebuild1
-rw-r--r--dev-util/peg/peg-0.1.15.ebuild1
-rw-r--r--dev-util/peg/peg-0.1.9.ebuild1
-rw-r--r--dev-util/perf/perf-3.12.ebuild1
-rw-r--r--dev-util/perf/perf-3.13.1-r1.ebuild1
-rw-r--r--dev-util/perf/perf-3.15.5.ebuild1
-rw-r--r--dev-util/perf/perf-4.1.5-r1.ebuild1
-rw-r--r--dev-util/perf/perf-4.4.4.ebuild1
-rw-r--r--dev-util/perf/perf-4.9.13.ebuild1
-rw-r--r--dev-util/pida/pida-0.6.2-r1.ebuild1
-rw-r--r--dev-util/pkgcheck/pkgcheck-0.5.3.ebuild1
-rw-r--r--dev-util/pkgcheck/pkgcheck-9999.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-0.9.11.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-0.9.12.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-1.0.1.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-1.0.2.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-1.1.0.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-1.2.2.ebuild1
-rw-r--r--dev-util/pkgconf/pkgconf-9999.ebuild1
-rw-r--r--dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild1
-rw-r--r--dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild1
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild1
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild1
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.1.ebuild1
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.ebuild1
-rw-r--r--dev-util/pkgconfig/pkgconfig-9999.ebuild1
-rw-r--r--dev-util/plan9port/plan9port-20140306-r3.ebuild1
-rw-r--r--dev-util/ply/ply-0_pre20160313.ebuild1
-rw-r--r--dev-util/pmd/pmd-4.2.5.ebuild1
-rw-r--r--dev-util/premake/premake-3.7.ebuild1
-rw-r--r--dev-util/premake/premake-4.3-r1.ebuild1
-rw-r--r--dev-util/pretrace/pretrace-0.4.ebuild1
-rw-r--r--dev-util/promu/promu-0.1.0_p20161031.ebuild1
-rw-r--r--dev-util/promu/promu-0.1.0_p20170130.ebuild1
-rw-r--r--dev-util/pscan/pscan-20000721-r1.ebuild1
-rw-r--r--dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild1
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2016.2.3-r1.ebuild1
-rw-r--r--dev-util/qbs/qbs-1.4.5.ebuild1
-rw-r--r--dev-util/qbs/qbs-1.5.2.ebuild1
-rw-r--r--dev-util/qbs/qbs-1.6.1.ebuild1
-rw-r--r--dev-util/qbs/qbs-1.7.0.ebuild1
-rw-r--r--dev-util/qfsm/qfsm-0.54.0.ebuild1
-rw-r--r--dev-util/qmtest/qmtest-2.4.1-r1.ebuild1
-rw-r--r--dev-util/qstlink2/qstlink2-1.0.3.ebuild1
-rw-r--r--dev-util/quilt/quilt-0.50.ebuild1
-rw-r--r--dev-util/quilt/quilt-0.63.ebuild1
-rw-r--r--dev-util/quilt/quilt-9999.ebuild1
-rw-r--r--dev-util/radare2/radare2-0.10.6.ebuild1
-rw-r--r--dev-util/radare2/radare2-1.0.2.ebuild1
-rw-r--r--dev-util/radare2/radare2-1.1.0.ebuild1
-rw-r--r--dev-util/radare2/radare2-1.2.0.ebuild1
-rw-r--r--dev-util/radare2/radare2-9999.ebuild1
-rw-r--r--dev-util/ragel/ragel-6.7-r1.ebuild1
-rw-r--r--dev-util/ragel/ragel-6.8.ebuild1
-rw-r--r--dev-util/ragel/ragel-6.9.ebuild1
-rw-r--r--dev-util/ragel/ragel-7.0.0.9.ebuild1
-rw-r--r--dev-util/rats/rats-2.1-r2.ebuild1
-rw-r--r--dev-util/rats/rats-2.3.ebuild1
-rw-r--r--dev-util/rats/rats-2.4.ebuild1
-rw-r--r--dev-util/rbtools/rbtools-0.7.6.ebuild1
-rw-r--r--dev-util/rbtools/rbtools-0.7.8.ebuild1
-rw-r--r--dev-util/rbtools/rbtools-0.7.9.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.13.5-r1.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.13.6.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.13.7.5.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.14.2.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.14.3.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.15.2.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.15.3.ebuild1
-rw-r--r--dev-util/re2c/re2c-0.16.ebuild1
-rw-r--r--dev-util/rebar/rebar-2.6.1.ebuild1
-rw-r--r--dev-util/rebar/rebar-2.6.2.ebuild1
-rw-r--r--dev-util/rebar/rebar-2.6.3.ebuild1
-rw-r--r--dev-util/rebar/rebar-2.6.4.ebuild1
-rw-r--r--dev-util/regexxer/regexxer-0.10.ebuild1
-rw-r--r--dev-util/rej/rej-0.16.ebuild1
-rw-r--r--dev-util/reswrap/reswrap-3.2.0.ebuild1
-rw-r--r--dev-util/reswrap/reswrap-4.0.0.ebuild1
-rw-r--r--dev-util/rosdep/rosdep-0.11.5.ebuild1
-rw-r--r--dev-util/rosdep/rosdep-9999.ebuild1
-rw-r--r--dev-util/rosinstall/rosinstall-0.7.8.ebuild1
-rw-r--r--dev-util/rosinstall/rosinstall-9999.ebuild1
-rw-r--r--dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild1
-rw-r--r--dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild1
-rw-r--r--dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild1
-rw-r--r--dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild1
-rw-r--r--dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild1
-rw-r--r--dev-util/rpmdevtools/rpmdevtools-8.3.ebuild1
-rw-r--r--dev-util/rpmdevtools/rpmdevtools-8.5.ebuild1
-rw-r--r--dev-util/rr/rr-4.5.0.ebuild1
-rw-r--r--dev-util/rustfmt/rustfmt-0.5.0.ebuild1
-rw-r--r--dev-util/sasm/sasm-2.2.ebuild1
-rw-r--r--dev-util/sasm/sasm-9999.ebuild1
-rw-r--r--dev-util/scala-ide/scala-ide-4.1.0.ebuild1
-rw-r--r--dev-util/scala-ide/scala-ide-4.3.0.ebuild1
-rw-r--r--dev-util/scanmem/scanmem-0.15.2.ebuild1
-rw-r--r--dev-util/scanmem/scanmem-0.15.3.ebuild1
-rw-r--r--dev-util/schroot/schroot-1.6.10-r3.ebuild1
-rw-r--r--dev-util/schroot/schroot-1.6.10-r4.ebuild1
-rw-r--r--dev-util/scons/scons-2.3.5.ebuild1
-rw-r--r--dev-util/scons/scons-2.4.1.ebuild1
-rw-r--r--dev-util/scons/scons-2.5.0.ebuild1
-rw-r--r--dev-util/scons/scons-2.5.1.ebuild1
-rw-r--r--dev-util/sel/sel-0.08.4-r1.ebuild1
-rw-r--r--dev-util/sel/sel-0.08.4.ebuild1
-rw-r--r--dev-util/serialtalk/serialtalk-1.2.ebuild1
-rw-r--r--dev-util/serialtalk/serialtalk-9999.ebuild1
-rw-r--r--dev-util/setconf/setconf-0.6.6.ebuild1
-rw-r--r--dev-util/setconf/setconf-0.6.7.ebuild1
-rw-r--r--dev-util/sgb/sgb-20030623.ebuild1
-rw-r--r--dev-util/shards/shards-0.6.1.ebuild1
-rw-r--r--dev-util/shards/shards-0.6.2.ebuild1
-rw-r--r--dev-util/shards/shards-0.6.3.ebuild1
-rw-r--r--dev-util/shards/shards-0.6.4.ebuild1
-rw-r--r--dev-util/shards/shards-0.7.1.ebuild1
-rw-r--r--dev-util/shc/shc-3.8.9.ebuild1
-rw-r--r--dev-util/shellcheck/shellcheck-0.4.4.ebuild1
-rw-r--r--dev-util/shellcheck/shellcheck-0.4.5.ebuild1
-rw-r--r--dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild1
-rw-r--r--dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild1
-rw-r--r--dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild1
-rw-r--r--dev-util/shflags/shflags-1.0.3.ebuild1
-rw-r--r--dev-util/shtool/shtool-2.0.8-r1.ebuild1
-rw-r--r--dev-util/shunit2/shunit2-2.1.6-r1.ebuild1
-rw-r--r--dev-util/skipfish/skipfish-2.10_beta.ebuild1
-rw-r--r--dev-util/smem/smem-20071119_p1.ebuild1
-rw-r--r--dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild1
-rw-r--r--dev-util/source-highlight/source-highlight-3.1.8.ebuild1
-rw-r--r--dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild1
-rw-r--r--dev-util/spec-cleaner/spec-cleaner-9999.ebuild1
-rw-r--r--dev-util/splint/splint-3.1.2-r1.ebuild1
-rw-r--r--dev-util/splint/splint-3.1.2-r2.ebuild1
-rw-r--r--dev-util/squashdelta/squashdelta-0.1.ebuild1
-rw-r--r--dev-util/squashdelta/squashdelta-9999.ebuild1
-rw-r--r--dev-util/squashmerge/squashmerge-0.1.ebuild1
-rw-r--r--dev-util/squashmerge/squashmerge-9999.ebuild1
-rw-r--r--dev-util/staruml-bin/staruml-bin-2.8.0.ebuild1
-rw-r--r--dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild1
-rw-r--r--dev-util/stubgen/stubgen-2.08.ebuild1
-rw-r--r--dev-util/suse-build/suse-build-2014.09.18.ebuild1
-rw-r--r--dev-util/suse-build/suse-build-2015.11.05.ebuild1
-rw-r--r--dev-util/suse-build/suse-build-9999.ebuild1
-rw-r--r--dev-util/synopsis/synopsis-0.13.ebuild1
-rw-r--r--dev-util/sysdig/sysdig-0.12.1.ebuild1
-rw-r--r--dev-util/sysdig/sysdig-0.13.0.ebuild1
-rw-r--r--dev-util/sysdig/sysdig-0.14.0.ebuild1
-rw-r--r--dev-util/sysprof/sysprof-1.2.0.ebuild1
-rw-r--r--dev-util/sysprof/sysprof-3.22.2.ebuild1
-rw-r--r--dev-util/systemtap/systemtap-2.4-r1.ebuild1
-rw-r--r--dev-util/systemtap/systemtap-2.9.ebuild1
-rw-r--r--dev-util/systemtap/systemtap-3.1.ebuild1
-rw-r--r--dev-util/tailor/tailor-0.9.35-r1.ebuild1
-rw-r--r--dev-util/ticpp/ticpp-0_p20120423.ebuild1
-rw-r--r--dev-util/ticpp/ticpp-9999.ebuild1
-rw-r--r--dev-util/tinlink/tinlink-1.0.0.ebuild1
-rw-r--r--dev-util/tkdiff/tkdiff-4.2.ebuild1
-rw-r--r--dev-util/tmake/tmake-2.12.ebuild1
-rw-r--r--dev-util/trace-cmd/trace-cmd-2.5.1.ebuild1
-rw-r--r--dev-util/trace-cmd/trace-cmd-2.6.ebuild1
-rw-r--r--dev-util/treecc/treecc-0.3.10.ebuild1
-rw-r--r--dev-util/trinity/trinity-1.5.ebuild1
-rw-r--r--dev-util/trinity/trinity-1.6.ebuild1
-rw-r--r--dev-util/trinity/trinity-9999.ebuild1
-rw-r--r--dev-util/txt2regex/txt2regex-0.8-r3.ebuild1
-rw-r--r--dev-util/umockdev/umockdev-0.8.11.ebuild1
-rw-r--r--dev-util/uncrustify/uncrustify-0.59.ebuild1
-rw-r--r--dev-util/uncrustify/uncrustify-0.64.ebuild1
-rw-r--r--dev-util/uncrustify/uncrustify-9999.ebuild1
-rw-r--r--dev-util/unifdef/unifdef-2.10.ebuild1
-rw-r--r--dev-util/unifdef/unifdef-2.11.ebuild1
-rw-r--r--dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild1
-rw-r--r--dev-util/usb-robot/usb-robot-0.2.0.ebuild1
-rw-r--r--dev-util/valgrind/valgrind-3.10.1.ebuild1
-rw-r--r--dev-util/valgrind/valgrind-3.11.0.ebuild1
-rw-r--r--dev-util/valgrind/valgrind-3.12.0.ebuild1
-rw-r--r--dev-util/valkyrie/valkyrie-2.0.0.ebuild1
-rw-r--r--dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild1
-rw-r--r--dev-util/vbindiff/vbindiff-3.0_beta5.ebuild1
-rw-r--r--dev-util/vint/vint-0.3.11.ebuild1
-rw-r--r--dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild1
-rw-r--r--dev-util/visual-regexp/visual-regexp-3.1.ebuild1
-rw-r--r--dev-util/visualvm/visualvm-1.3.8-r1.ebuild1
-rw-r--r--dev-util/vmtouch/vmtouch-1.0.2.ebuild1
-rw-r--r--dev-util/vmtouch/vmtouch-1.2.0.ebuild1
-rw-r--r--dev-util/vtable-dumper/vtable-dumper-1.2.ebuild1
-rw-r--r--dev-util/w32api/w32api-3.17.2.ebuild1
-rw-r--r--dev-util/w32api/w32api-4.0.3.1.ebuild1
-rw-r--r--dev-util/watchr/watchr-0.7.ebuild1
-rw-r--r--dev-util/weblint/weblint-1.020.ebuild1
-rw-r--r--dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild1
-rw-r--r--dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild1
-rw-r--r--dev-util/weka/weka-3.7.13.ebuild1
-rw-r--r--dev-util/weka/weka-3.8.0.ebuild1
-rw-r--r--dev-util/wiggle/wiggle-0.9-r1.ebuild1
-rw-r--r--dev-util/wsta/wsta-0.4.1.ebuild1
-rw-r--r--dev-util/wsta/wsta-0.5.0.ebuild1
-rw-r--r--dev-util/wstool/wstool-0.1.13.ebuild1
-rw-r--r--dev-util/wstool/wstool-9999.ebuild1
-rw-r--r--dev-util/wxglade/wxglade-0.6.3-r3.ebuild1
-rw-r--r--dev-util/xdelta/xdelta-1.1.4-r1.ebuild1
-rw-r--r--dev-util/xdelta/xdelta-3.0.10.ebuild1
-rw-r--r--dev-util/xdelta/xdelta-3.0.11.ebuild1
-rw-r--r--dev-util/xdelta/xdelta-3.1.0.ebuild1
-rw-r--r--dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild1
-rw-r--r--dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild1
-rw-r--r--dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild1
-rw-r--r--dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild1
-rw-r--r--dev-util/xxdi/xxdi-1.0.0.ebuild1
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild1
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1.ebuild1
-rw-r--r--dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild1
-rw-r--r--dev-util/yacc/yacc-1.9.1-r6.ebuild1
-rw-r--r--dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild1
787 files changed, 0 insertions, 787 deletions
diff --git a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
index f395b2fd95b..09f6de5e8c0 100644
--- a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
+++ b/dev-util/App-SVN-Bisect/App-SVN-Bisect-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
diff --git a/dev-util/Orange/Orange-2.7.2.ebuild b/dev-util/Orange/Orange-2.7.2.ebuild
index 1e16e2720f9..55b72893cea 100644
--- a/dev-util/Orange/Orange-2.7.2.ebuild
+++ b/dev-util/Orange/Orange-2.7.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-util/a8/a8-0.11-r2.ebuild b/dev-util/a8/a8-0.11-r2.ebuild
index 1c395489d67..c07bd2e5082 100644
--- a/dev-util/a8/a8-0.11-r2.ebuild
+++ b/dev-util/a8/a8-0.11-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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/a8/a8-1.0.ebuild b/dev-util/a8/a8-1.0.ebuild
index 7676f40a469..51a790f6370 100644
--- a/dev-util/a8/a8-1.0.ebuild
+++ b/dev-util/a8/a8-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=5
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.21.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.21.ebuild
index b52871ff047..7ad9918b7bc 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.21.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.21.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-util/abi-compliance-checker/abi-compliance-checker-1.99.22.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.22.ebuild
index b52871ff047..7ad9918b7bc 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.22.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.22.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-util/abi-compliance-checker/abi-compliance-checker-1.99.23.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.23.ebuild
index b52871ff047..7ad9918b7bc 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.23.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.23.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-util/abi-compliance-checker/abi-compliance-checker-1.99.25.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.25.ebuild
index b52871ff047..7ad9918b7bc 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.25.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.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-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
index 665ec3c9d79..e602ebea316 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.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-util/abi-dumper/abi-dumper-0.99.15.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
index f9655f830d3..1a4ff5dc50a 100644
--- a/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
+++ b/dev-util/abi-dumper/abi-dumper-0.99.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-util/abi-dumper/abi-dumper-0.99.19.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
index f9655f830d3..1a4ff5dc50a 100644
--- a/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
+++ b/dev-util/abi-dumper/abi-dumper-0.99.19.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-util/abootimg/abootimg-20150323.ebuild b/dev-util/abootimg/abootimg-20150323.ebuild
index 97a6c82130c..8939a70bcb3 100644
--- a/dev-util/abootimg/abootimg-20150323.ebuild
+++ b/dev-util/abootimg/abootimg-20150323.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-util/ald/ald-0.1.7-r2.ebuild b/dev-util/ald/ald-0.1.7-r2.ebuild
index 4265e3f8b48..cb433ceca65 100644
--- a/dev-util/ald/ald-0.1.7-r2.ebuild
+++ b/dev-util/ald/ald-0.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="6"
diff --git a/dev-util/alleyoop/alleyoop-0.9.8.ebuild b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
index 13a9e523279..bb2bdbe4eac 100644
--- a/dev-util/alleyoop/alleyoop-0.9.8.ebuild
+++ b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/dev-util/amtterm/amtterm-1.3-r1.ebuild b/dev-util/amtterm/amtterm-1.3-r1.ebuild
index 2ab3ff64d88..7b6ed194957 100644
--- a/dev-util/amtterm/amtterm-1.3-r1.ebuild
+++ b/dev-util/amtterm/amtterm-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-util/amtterm/amtterm-1.4.ebuild b/dev-util/amtterm/amtterm-1.4.ebuild
index 2ab3ff64d88..7b6ed194957 100644
--- a/dev-util/amtterm/amtterm-1.4.ebuild
+++ b/dev-util/amtterm/amtterm-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-util/android-ndk/android-ndk-10.ebuild b/dev-util/android-ndk/android-ndk-10.ebuild
index 79671af4bf5..27ec2497950 100644
--- a/dev-util/android-ndk/android-ndk-10.ebuild
+++ b/dev-util/android-ndk/android-ndk-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-util/android-ndk/android-ndk-10b.ebuild b/dev-util/android-ndk/android-ndk-10b.ebuild
index 79671af4bf5..27ec2497950 100644
--- a/dev-util/android-ndk/android-ndk-10b.ebuild
+++ b/dev-util/android-ndk/android-ndk-10b.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-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
index 3dc807f0cc9..632defda31a 100644
--- a/dev-util/android-ndk/android-ndk-10d.ebuild
+++ b/dev-util/android-ndk/android-ndk-10d.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-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
index 59d6aa8c5f3..5abb2ebaafe 100644
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ b/dev-util/android-ndk/android-ndk-10e.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-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild
index add201b5a4f..703cae635c3 100644
--- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c-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-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild
index 86e89235aeb..ae39d95ef37 100644
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c.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-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild
index add201b5a4f..703cae635c3 100644
--- a/dev-util/android-ndk/android-ndk-13b.ebuild
+++ b/dev-util/android-ndk/android-ndk-13b.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-util/android-ndk/android-ndk-8b.ebuild b/dev-util/android-ndk/android-ndk-8b.ebuild
index 0b0eca2d242..4c8c21c9754 100644
--- a/dev-util/android-ndk/android-ndk-8b.ebuild
+++ b/dev-util/android-ndk/android-ndk-8b.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-util/android-ndk/android-ndk-8c.ebuild b/dev-util/android-ndk/android-ndk-8c.ebuild
index 0b0eca2d242..4c8c21c9754 100644
--- a/dev-util/android-ndk/android-ndk-8c.ebuild
+++ b/dev-util/android-ndk/android-ndk-8c.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-util/android-ndk/android-ndk-8d.ebuild b/dev-util/android-ndk/android-ndk-8d.ebuild
index 32372a09ada..f5d15a69aed 100644
--- a/dev-util/android-ndk/android-ndk-8d.ebuild
+++ b/dev-util/android-ndk/android-ndk-8d.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-util/android-ndk/android-ndk-8e.ebuild b/dev-util/android-ndk/android-ndk-8e.ebuild
index 32372a09ada..f5d15a69aed 100644
--- a/dev-util/android-ndk/android-ndk-8e.ebuild
+++ b/dev-util/android-ndk/android-ndk-8e.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-util/android-ndk/android-ndk-9.ebuild b/dev-util/android-ndk/android-ndk-9.ebuild
index ae194f723f3..29c231420c9 100644
--- a/dev-util/android-ndk/android-ndk-9.ebuild
+++ b/dev-util/android-ndk/android-ndk-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-util/android-ndk/android-ndk-9b.ebuild b/dev-util/android-ndk/android-ndk-9b.ebuild
index ae194f723f3..29c231420c9 100644
--- a/dev-util/android-ndk/android-ndk-9b.ebuild
+++ b/dev-util/android-ndk/android-ndk-9b.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-util/android-ndk/android-ndk-9c.ebuild b/dev-util/android-ndk/android-ndk-9c.ebuild
index 21d5a6d6cd5..1e683e59f57 100644
--- a/dev-util/android-ndk/android-ndk-9c.ebuild
+++ b/dev-util/android-ndk/android-ndk-9c.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-util/android-ndk/android-ndk-9d.ebuild b/dev-util/android-ndk/android-ndk-9d.ebuild
index 21d5a6d6cd5..1e683e59f57 100644
--- a/dev-util/android-ndk/android-ndk-9d.ebuild
+++ b/dev-util/android-ndk/android-ndk-9d.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-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
index a7c2a104b07..5f00b9850c8 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.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-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
index 31b37f4586a..5a517bb942a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-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-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index 96b3b8f1342..f7afd556077 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.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-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
index 7250eb55b54..b4f3c7e230f 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index 96b3b8f1342..f7afd556077 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.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-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index 42d80e2126a..469b385c8e8 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.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-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index 96b3b8f1342..f7afd556077 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 42d80e2126a..469b385c8e8 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index abd72727b32..5c4a40c1c3a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index abd72727b32..5c4a40c1c3a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index abd72727b32..5c4a40c1c3a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.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-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
index 7250eb55b54..b4f3c7e230f 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-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-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
index f5ee87717b7..d68d94698d0 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-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-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 18a71ef6435..dae7e2366b6 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.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-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index f5ee87717b7..d68d94698d0 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.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-util/android-studio/android-studio-2.2.3.0.145.3537739.ebuild b/dev-util/android-studio/android-studio-2.2.3.0.145.3537739.ebuild
index b0b6dc3579f..ff1fe228188 100644
--- a/dev-util/android-studio/android-studio-2.2.3.0.145.3537739.ebuild
+++ b/dev-util/android-studio/android-studio-2.2.3.0.145.3537739.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils java-pkg-2 versionator
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index bfb94858bf0..7900622e6ed 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.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 bash-completion-r1 eutils toolchain-funcs
diff --git a/dev-util/anjuta/anjuta-3.20.0.ebuild b/dev-util/anjuta/anjuta-3.20.0.ebuild
index 4eb473de531..6a12af0bd36 100644
--- a/dev-util/anjuta/anjuta-3.20.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.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
GNOME2_LA_PUNT="yes"
diff --git a/dev-util/anjuta/anjuta-3.22.0.ebuild b/dev-util/anjuta/anjuta-3.22.0.ebuild
index c1930c8875c..fbc4d5cedcb 100644
--- a/dev-util/anjuta/anjuta-3.22.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.22.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
GNOME2_LA_PUNT="yes"
diff --git a/dev-util/antlrworks/antlrworks-1.2.3.ebuild b/dev-util/antlrworks/antlrworks-1.2.3.ebuild
index 8ea416e55aa..e14282c5f00 100644
--- a/dev-util/antlrworks/antlrworks-1.2.3.ebuild
+++ b/dev-util/antlrworks/antlrworks-1.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="2"
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
index 8e9012799c3..2e9fa0dba87 100644
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ b/dev-util/apitrace/apitrace-4.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild
index 5b250871b90..83c1923d2b3 100644
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ b/dev-util/apitrace/apitrace-5.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
index 4c8493b4cc6..1128fb732d5 100644
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ b/dev-util/apitrace/apitrace-6.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
index 00844442dae..4920e2bd25e 100644
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ b/dev-util/apitrace/apitrace-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1.ebuild
index 47c58bfa3ad..5736288e679 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-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="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
index 478b2ca8a38..c05659eb002 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.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-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
index 96c10c883a2..9cfc41218f8 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.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-util/appinventor/appinventor-1.1.ebuild b/dev-util/appinventor/appinventor-1.1.ebuild
index fa282685eb0..6e3baf91d34 100644
--- a/dev-util/appinventor/appinventor-1.1.ebuild
+++ b/dev-util/appinventor/appinventor-1.1.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-util/archdiff/archdiff-1.1.6.ebuild b/dev-util/archdiff/archdiff-1.1.6.ebuild
index 83c1685ed41..acc017fc655 100644
--- a/dev-util/archdiff/archdiff-1.1.6.ebuild
+++ b/dev-util/archdiff/archdiff-1.1.6.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-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
index 16444c230fb..96dd77d1ac1 100644
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ b/dev-util/argouml/argouml-0.34.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-util/artifactory-bin/artifactory-bin-4.10.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild
index 90c97a4e1c9..7af12654f3e 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild
index 90c97a4e1c9..7af12654f3e 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild
index 9cea80c78a9..3afb11daa27 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild
index 90c97a4e1c9..7af12654f3e 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild
index 9cea80c78a9..3afb11daa27 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild
index 9cea80c78a9..3afb11daa27 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild
index 9d90b251d40..25a3a19fc30 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild
index 27d65dc8847..083c74b35c1 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This is currently blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild
index 27d65dc8847..083c74b35c1 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This is currently blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild
index 8c147a10560..1d85067c585 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild
index 211224df317..cc4ae8f9786 100644
--- a/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Using a binary ebuild until a source ebuild is doable.
# This was previously blocked by two major bugs upstream:
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
index d007718a32c..2833aa6b9cf 100644
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ b/dev-util/aruba/aruba-0.5.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
USE_RUBY="ruby20 ruby21"
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
index 4d26759ae66..770acb1779e 100644
--- a/dev-util/aruba/aruba-0.6.2-r1.ebuild
+++ b/dev-util/aruba/aruba-0.6.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
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/dev-util/aruba/aruba-0.6.2.ebuild b/dev-util/aruba/aruba-0.6.2.ebuild
index b9721cb2923..bfd66f5dc73 100644
--- a/dev-util/aruba/aruba-0.6.2.ebuild
+++ b/dev-util/aruba/aruba-0.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/aruba/aruba-0.7.4.ebuild b/dev-util/aruba/aruba-0.7.4.ebuild
index bba79aeecd2..db894883c98 100644
--- a/dev-util/aruba/aruba-0.7.4.ebuild
+++ b/dev-util/aruba/aruba-0.7.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 2e56256fc29..f3c4aeb92fe 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/astyle/astyle-2.04-r1.ebuild b/dev-util/astyle/astyle-2.04-r1.ebuild
index 38a88bca00b..0e5f5d5dfe7 100644
--- a/dev-util/astyle/astyle-2.04-r1.ebuild
+++ b/dev-util/astyle/astyle-2.04-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-util/astyle/astyle-2.05.1.ebuild b/dev-util/astyle/astyle-2.05.1.ebuild
index 9a0762b5c9a..d0921eb8842 100644
--- a/dev-util/astyle/astyle-2.05.1.ebuild
+++ b/dev-util/astyle/astyle-2.05.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-util/astyle/astyle-2.06.ebuild b/dev-util/astyle/astyle-2.06.ebuild
index 671d30bc5b5..70a8f8a5969 100644
--- a/dev-util/astyle/astyle-2.06.ebuild
+++ b/dev-util/astyle/astyle-2.06.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-util/atomic-install/atomic-install-0.1.1.ebuild b/dev-util/atomic-install/atomic-install-0.1.1.ebuild
index bee6b11f03e..6ee38de78ef 100644
--- a/dev-util/atomic-install/atomic-install-0.1.1.ebuild
+++ b/dev-util/atomic-install/atomic-install-0.1.1.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-util/atomic-install/atomic-install-9999.ebuild b/dev-util/atomic-install/atomic-install-9999.ebuild
index a7ad1679dce..795f3a6051c 100644
--- a/dev-util/atomic-install/atomic-install-9999.ebuild
+++ b/dev-util/atomic-install/atomic-install-9999.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-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r1.ebuild
index df5da032c9a..da836e9aeda 100644
--- a/dev-util/autodia/autodia-2.140.0-r1.ebuild
+++ b/dev-util/autodia/autodia-2.140.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-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
index 7c76f37c887..ab081a4e796 100644
--- a/dev-util/automoc/automoc-0.9.88-r1.ebuild
+++ b/dev-util/automoc/automoc-0.9.88-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-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
index 9286454a1d8..05e5e1d5581 100644
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ b/dev-util/autoproject/autoproject-0.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index 0df09eb4c48..f76f1b6b654 100644
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
index 19b8315b2c5..6fe8e9289c0 100644
--- a/dev-util/babeltrace/babeltrace-1.2.3.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.2.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-util/babeltrace/babeltrace-1.2.4.ebuild b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
index 70efa4b633e..2f96b212360 100644
--- a/dev-util/babeltrace/babeltrace-1.2.4.ebuild
+++ b/dev-util/babeltrace/babeltrace-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-util/bakefile/bakefile-0.2.9-r1.ebuild b/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
index dc9c677a82e..2fd0112e265 100644
--- a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
+++ b/dev-util/bakefile/bakefile-0.2.9-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-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
index 7e5bc01a7ac..96a42af2513 100644
--- a/dev-util/bam/bam-0.4.0-r1.ebuild
+++ b/dev-util/bam/bam-0.4.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-util/bats/bats-0.4.0.ebuild b/dev-util/bats/bats-0.4.0.ebuild
index 538d12b65d2..0af7a00bf20 100644
--- a/dev-util/bats/bats-0.4.0.ebuild
+++ b/dev-util/bats/bats-0.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=6
diff --git a/dev-util/bazel/bazel-0.3.2-r1.ebuild b/dev-util/bazel/bazel-0.3.2-r1.ebuild
index a78ef97d2ae..214e240f63e 100644
--- a/dev-util/bazel/bazel-0.3.2-r1.ebuild
+++ b/dev-util/bazel/bazel-0.3.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-util/bazel/bazel-0.3.2.ebuild b/dev-util/bazel/bazel-0.3.2.ebuild
index a02451f65a0..60d5fc5ed59 100644
--- a/dev-util/bazel/bazel-0.3.2.ebuild
+++ b/dev-util/bazel/bazel-0.3.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-util/bazel/bazel-0.4.0.ebuild b/dev-util/bazel/bazel-0.4.0.ebuild
index a78ef97d2ae..214e240f63e 100644
--- a/dev-util/bazel/bazel-0.4.0.ebuild
+++ b/dev-util/bazel/bazel-0.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=6
diff --git a/dev-util/bazel/bazel-0.4.3.ebuild b/dev-util/bazel/bazel-0.4.3.ebuild
index 09ffca6720c..d77e41eb1e6 100644
--- a/dev-util/bazel/bazel-0.4.3.ebuild
+++ b/dev-util/bazel/bazel-0.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=6
diff --git a/dev-util/bbe/bbe-0.2.2.ebuild b/dev-util/bbe/bbe-0.2.2.ebuild
index f37224b8c44..0d506f35d5c 100644
--- a/dev-util/bbe/bbe-0.2.2.ebuild
+++ b/dev-util/bbe/bbe-0.2.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-util/bcc/bcc-0.1.8-r2.ebuild b/dev-util/bcc/bcc-0.1.8-r2.ebuild
index b1d13fef63a..b2a4e834cb1 100644
--- a/dev-util/bcc/bcc-0.1.8-r2.ebuild
+++ b/dev-util/bcc/bcc-0.1.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=6
diff --git a/dev-util/bcc/bcc-0.2.0-r1.ebuild b/dev-util/bcc/bcc-0.2.0-r1.ebuild
index bb608ad65f8..4cd829860f8 100644
--- a/dev-util/bcc/bcc-0.2.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.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=6
diff --git a/dev-util/bcpp/bcpp-20050725.ebuild b/dev-util/bcpp/bcpp-20050725.ebuild
index dacf2758c5a..2dc4a6daba8 100644
--- a/dev-util/bcpp/bcpp-20050725.ebuild
+++ b/dev-util/bcpp/bcpp-20050725.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/bcpp/bcpp-20090630.ebuild b/dev-util/bcpp/bcpp-20090630.ebuild
index a64445f9a6d..2f411f8f2e0 100644
--- a/dev-util/bcpp/bcpp-20090630.ebuild
+++ b/dev-util/bcpp/bcpp-20090630.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-util/bcpp/bcpp-20150811.ebuild b/dev-util/bcpp/bcpp-20150811.ebuild
index 10ebb2c3edc..93e1eb53958 100644
--- a/dev-util/bcpp/bcpp-20150811.ebuild
+++ b/dev-util/bcpp/bcpp-20150811.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-util/bdelta/bdelta-0.3.1.ebuild b/dev-util/bdelta/bdelta-0.3.1.ebuild
index 9e75a60fb9b..edb6de3eca3 100644
--- a/dev-util/bdelta/bdelta-0.3.1.ebuild
+++ b/dev-util/bdelta/bdelta-0.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=4
diff --git a/dev-util/beediff/beediff-1.9.ebuild b/dev-util/beediff/beediff-1.9.ebuild
index f4c3df1f916..291c7b1aab2 100644
--- a/dev-util/beediff/beediff-1.9.ebuild
+++ b/dev-util/beediff/beediff-1.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
inherit eutils qt4-r2
diff --git a/dev-util/biew/biew-6.1.0-r3.ebuild b/dev-util/biew/biew-6.1.0-r3.ebuild
index 5412959d81b..d35ab26a959 100644
--- a/dev-util/biew/biew-6.1.0-r3.ebuild
+++ b/dev-util/biew/biew-6.1.0-r3.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 flag-o-matic toolchain-funcs versionator
diff --git a/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild b/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild
index 862e9b1d50d..d51ab769609 100644
--- a/dev-util/bin_replace_string/bin_replace_string-0.2.ebuild
+++ b/dev-util/bin_replace_string/bin_replace_string-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=4
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.13.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.13.0.ebuild
index b3a77bfb5f5..8d4a32a6728 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.13.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.13.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 2010-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.13.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.13.1.ebuild
index dc715a622a3..65a55ef51cc 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.13.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.13.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 2010-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
index 226280c5d1f..ea538a25194 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 2010-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
index 755248dc082..51d37bc8c3d 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 2010-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild
index c65b564214d..577337347e6 100644
--- a/dev-util/bless/bless-0.6.0-r2.ebuild
+++ b/dev-util/bless/bless-0.6.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=6
inherit autotools gnome2 mono-env
diff --git a/dev-util/bluej/bluej-3.1.1.ebuild b/dev-util/bluej/bluej-3.1.1.ebuild
index 9a01e99e539..b38d355a826 100644
--- a/dev-util/bluej/bluej-3.1.1.ebuild
+++ b/dev-util/bluej/bluej-3.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-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
index c6b21a0ed97..054b7ddd2bc 100644
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ b/dev-util/bnfc/bnfc-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-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
index 08c4ba52a9b..661b7ce9b92 100644
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ b/dev-util/bnfc/bnfc-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
diff --git a/dev-util/boost-build/boost-build-1.56.0.ebuild b/dev-util/boost-build/boost-build-1.56.0.ebuild
index 33e590c428f..72b917152b6 100644
--- a/dev-util/boost-build/boost-build-1.56.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.56.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"
diff --git a/dev-util/boost-build/boost-build-1.58.0.ebuild b/dev-util/boost-build/boost-build-1.58.0.ebuild
index d63d00fb86e..dc8b4e32dbf 100644
--- a/dev-util/boost-build/boost-build-1.58.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.58.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"
diff --git a/dev-util/boost-build/boost-build-1.59.0.ebuild b/dev-util/boost-build/boost-build-1.59.0.ebuild
index 80bed8939c5..01fd3eec911 100644
--- a/dev-util/boost-build/boost-build-1.59.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.59.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-util/boost-build/boost-build-1.60.0.ebuild b/dev-util/boost-build/boost-build-1.60.0.ebuild
index 80bed8939c5..01fd3eec911 100644
--- a/dev-util/boost-build/boost-build-1.60.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.60.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-util/boost-build/boost-build-1.61.0.ebuild b/dev-util/boost-build/boost-build-1.61.0.ebuild
index 1d42634b70f..488e0c46308 100644
--- a/dev-util/boost-build/boost-build-1.61.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.61.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-util/boost-build/boost-build-1.62.0-r1.ebuild b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
index 3e919adebe6..8be32621a8b 100644
--- a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.62.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
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
index eb5f9feb1ce..0931aaaa61d 100644
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.63.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-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
index ec463a4928e..575d008b307 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-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-util/btyacc/btyacc-3.0-r2.ebuild b/dev-util/btyacc/btyacc-3.0-r2.ebuild
index 43a7317cfd0..bf06edcf5ab 100644
--- a/dev-util/btyacc/btyacc-3.0-r2.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r2.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-util/build/build-0.3.10.ebuild b/dev-util/build/build-0.3.10.ebuild
index eb9da0f94f8..059d3c00ac8 100644
--- a/dev-util/build/build-0.3.10.ebuild
+++ b/dev-util/build/build-0.3.10.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-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild
index 8870a30a4fd..a8c04162b39 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.0_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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.1.ebuild
index 8f1d0a73648..7c58c48185c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.2.ebuild
index 62b5c18167c..1cabd215dc8 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild
index 62b5c18167c..1cabd215dc8 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild
index 62b5c18167c..1cabd215dc8 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild
index 3fe2ccaa018..43630ae901b 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.1.ebuild
index b38670993f7..e27de9d6dc0 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.2.ebuild
index 32f41c6cd36..9c10a8fde7f 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.2.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild
index 32f41c6cd36..9c10a8fde7f 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild
index 32f41c6cd36..9c10a8fde7f 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
index 325c2d95da5..8bb290378b5 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.10.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index 325c2d95da5..8bb290378b5 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild
index 17574e86192..e12a0ba4238 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.1.ebuild
index 22c8d6587d5..55a4ee7f44e 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.2.ebuild
index cc3da16e92a..246e2d0b631 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild
index cc3da16e92a..246e2d0b631 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild
index cc3da16e92a..246e2d0b631 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild
index 7d8e88bd8a8..8ff16bc2f0e 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.0_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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild
index 7b6466cd1f2..3820017b297 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild
index 5fd1173c5d1..a14d8457709 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild
index a34b7d5153c..076a00851b8 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.3-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild
index ad4b6a8fe7b..2fb8e3b40be 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index ad4b6a8fe7b..2fb8e3b40be 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild
index 51485e22900..5dde858dcbd 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.0_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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.1.ebuild
index c3e0bfeccf2..b48e6b322c8 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.2.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.2.ebuild
index 212311e7c45..6d2ab09405b 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.3.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.3.ebuild
index 212311e7c45..6d2ab09405b 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.3.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.4.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.4.ebuild
index 212311e7c45..6d2ab09405b 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.4.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-0.8.10.ebuild b/dev-util/buildbot/buildbot-0.8.10.ebuild
index e1cb6799b5d..87e8bcf233e 100644
--- a/dev-util/buildbot/buildbot-0.8.10.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index 625fca8d707..67cc0e8a8dc 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild
index 84329ac2bf9..00fe2ca44be 100644
--- a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.0_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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-0.9.1.ebuild b/dev-util/buildbot/buildbot-0.9.1.ebuild
index db873eff6ef..4da7f74abcb 100644
--- a/dev-util/buildbot/buildbot-0.9.1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-0.9.2.ebuild b/dev-util/buildbot/buildbot-0.9.2.ebuild
index 84b783fb5f4..d68e544a5ae 100644
--- a/dev-util/buildbot/buildbot-0.9.2.ebuild
+++ b/dev-util/buildbot/buildbot-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-0.9.3.ebuild b/dev-util/buildbot/buildbot-0.9.3.ebuild
index b4832530f8d..176bd7ef1bc 100644
--- a/dev-util/buildbot/buildbot-0.9.3.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-0.9.4.ebuild b/dev-util/buildbot/buildbot-0.9.4.ebuild
index 81e30b0d72f..91819509ee8 100644
--- a/dev-util/buildbot/buildbot-0.9.4.ebuild
+++ b/dev-util/buildbot/buildbot-0.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"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 51ba7e267f2..cd94d2d541a 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PYTHON_REQ_USE="sqlite"
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index c8e450002a7..968d4e1d564 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.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-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
index b310cbb0ffe..d04c99c8998 100644
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.2-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-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
index affd0712655..3f1b1336bc1 100644
--- a/dev-util/bustle/bustle-0.4.7-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.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-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 949a5450b0d..54de42069ea 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.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-util/byacc/byacc-20150711.ebuild b/dev-util/byacc/byacc-20150711.ebuild
index 3704998a178..8582eb55207 100644
--- a/dev-util/byacc/byacc-20150711.ebuild
+++ b/dev-util/byacc/byacc-20150711.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-util/byacc/byacc-20160606.ebuild b/dev-util/byacc/byacc-20160606.ebuild
index 2e126b88e88..517dee17460 100644
--- a/dev-util/byacc/byacc-20160606.ebuild
+++ b/dev-util/byacc/byacc-20160606.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-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
index 042cb9f8efb..42aea3c007e 100644
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ b/dev-util/byacc/byacc-20170201.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-util/cargo/cargo-0.15.0.ebuild b/dev-util/cargo/cargo-0.15.0.ebuild
index 7f134b34782..f7214d12211 100644
--- a/dev-util/cargo/cargo-0.15.0.ebuild
+++ b/dev-util/cargo/cargo-0.15.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-util/cargo/cargo-0.16.0.ebuild b/dev-util/cargo/cargo-0.16.0.ebuild
index ffa321bf05a..f6c33784ed0 100644
--- a/dev-util/cargo/cargo-0.16.0.ebuild
+++ b/dev-util/cargo/cargo-0.16.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-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 1d931816c82..c16137f9236 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-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-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index efe8cefe292..11b0a8f8f69 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-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-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index dc22603a48d..c715f64e47b 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.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-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 9f4c4595a89..c5105d8669b 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.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-util/catalyst/catalyst-3.0_rc1.ebuild b/dev-util/catalyst/catalyst-3.0_rc1.ebuild
index 3c319b4ef3a..920665f9a5e 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0_rc1.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-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index badd60cac66..d17b3bd6a5f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
index cc0257509e7..75cfad98387 100644
--- a/dev-util/catfish/catfish-1.2.2.ebuild
+++ b/dev-util/catfish/catfish-1.2.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/catkin/catkin-0.7.6-r1.ebuild b/dev-util/catkin/catkin-0.7.6-r1.ebuild
index 6af6a63b964..2ddba0a419c 100644
--- a/dev-util/catkin/catkin-0.7.6-r1.ebuild
+++ b/dev-util/catkin/catkin-0.7.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
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 6af6a63b964..2ddba0a419c 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.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-util/ccache/ccache-3.2.4.ebuild b/dev-util/ccache/ccache-3.2.4.ebuild
index f93724ad9ca..3108ac512f5 100644
--- a/dev-util/ccache/ccache-3.2.4.ebuild
+++ b/dev-util/ccache/ccache-3.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-util/ccache/ccache-3.2.5.ebuild b/dev-util/ccache/ccache-3.2.5.ebuild
index b2a931e2bc1..8eae63e9070 100644
--- a/dev-util/ccache/ccache-3.2.5.ebuild
+++ b/dev-util/ccache/ccache-3.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="5"
diff --git a/dev-util/cccc/cccc-3.1.5.ebuild b/dev-util/cccc/cccc-3.1.5.ebuild
index e0fb42320fd..07042e9343c 100644
--- a/dev-util/cccc/cccc-3.1.5.ebuild
+++ b/dev-util/cccc/cccc-3.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-util/ccglue/ccglue-0.3.1.ebuild b/dev-util/ccglue/ccglue-0.3.1.ebuild
index fe123eccc0c..2b3f07348a8 100644
--- a/dev-util/ccglue/ccglue-0.3.1.ebuild
+++ b/dev-util/ccglue/ccglue-0.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=4
diff --git a/dev-util/ccglue/ccglue-0.6.0.ebuild b/dev-util/ccglue/ccglue-0.6.0.ebuild
index 6f14bd92d6e..60c9355974f 100644
--- a/dev-util/ccglue/ccglue-0.6.0.ebuild
+++ b/dev-util/ccglue/ccglue-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=4
diff --git a/dev-util/cdiff/cdiff-0.9.7.ebuild b/dev-util/cdiff/cdiff-0.9.7.ebuild
index 77a6c1d1d2d..7072a25903f 100644
--- a/dev-util/cdiff/cdiff-0.9.7.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.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-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
index aa9e6a4b124..31fe9df52ef 100644
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.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-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 835e95bb333..1337df42cc8 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.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-util/cflow/cflow-1.4.ebuild b/dev-util/cflow/cflow-1.4.ebuild
index 6e6f0d30048..d34006c749e 100644
--- a/dev-util/cflow/cflow-1.4.ebuild
+++ b/dev-util/cflow/cflow-1.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-util/cgdb/cgdb-0.6.6.ebuild b/dev-util/cgdb/cgdb-0.6.6.ebuild
index a94139115be..5778250bac4 100644
--- a/dev-util/cgdb/cgdb-0.6.6.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.6.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-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
index 612d748becc..fd2095ed0c6 100644
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.7.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-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index a6f37b95cb6..a34ddbb21ba 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.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-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index b974589789b..51a20f68cec 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.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-util/cgvg/cgvg-1.6.2.ebuild b/dev-util/cgvg/cgvg-1.6.2.ebuild
index e7876bed414..412a794f183 100644
--- a/dev-util/cgvg/cgvg-1.6.2.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A tiny version of cscope that is much more useful in certian instances"
HOMEPAGE="http://uzix.org/cgvg.html"
diff --git a/dev-util/checkbashisms/checkbashisms-2.16.13.ebuild b/dev-util/checkbashisms/checkbashisms-2.16.13.ebuild
index 4b11f8d42e0..99f3a4a0a11 100644
--- a/dev-util/checkbashisms/checkbashisms-2.16.13.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.16.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-util/checkbashisms/checkbashisms-2.17.0.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.0.ebuild
index d163fdf1d32..9efc819ffc0 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.0.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.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"
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.1.ebuild
index d163fdf1d32..9efc819ffc0 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.1.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.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-util/checkstyle/checkstyle-5.5-r1.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index abf2bf85be7..0a6ea6e2d6c 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-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-util/checkstyle/checkstyle-7.2.ebuild b/dev-util/checkstyle/checkstyle-7.2.ebuild
index 083d43d1617..5099ac96535 100644
--- a/dev-util/checkstyle/checkstyle-7.2.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.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-util/cligh/cligh-0.1_p20120630.ebuild b/dev-util/cligh/cligh-0.1_p20120630.ebuild
index eca700869ad..2727bd726c2 100644
--- a/dev-util/cligh/cligh-0.1_p20120630.ebuild
+++ b/dev-util/cligh/cligh-0.1_p20120630.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/cligh/cligh-0.2.ebuild b/dev-util/cligh/cligh-0.2.ebuild
index 27fc0f9e5af..88c4d2017c4 100644
--- a/dev-util/cligh/cligh-0.2.ebuild
+++ b/dev-util/cligh/cligh-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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index b517f437331..73bf26eecb3 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python3_4 )
diff --git a/dev-util/clion/clion-1.2.4.143.1186.ebuild b/dev-util/clion/clion-1.2.4.143.1186.ebuild
index 7c4ad6683a0..220bd4a563d 100644
--- a/dev-util/clion/clion-1.2.4.143.1186.ebuild
+++ b/dev-util/clion/clion-1.2.4.143.1186.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 versionator
diff --git a/dev-util/clion/clion-2016.2.1.ebuild b/dev-util/clion/clion-2016.2.1.ebuild
index 8061d4e1b08..98f5b2ec620 100644
--- a/dev-util/clion/clion-2016.2.1.ebuild
+++ b/dev-util/clion/clion-2016.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-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
index 41730b64e4e..6d04d597b45 100644
--- a/dev-util/cloc/cloc-1.64.ebuild
+++ b/dev-util/cloc/cloc-1.64.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/cloc/cloc-1.66.ebuild b/dev-util/cloc/cloc-1.66.ebuild
index c4ad14f1d26..34dbcf97600 100644
--- a/dev-util/cloc/cloc-1.66.ebuild
+++ b/dev-util/cloc/cloc-1.66.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/cloc/cloc-1.70.ebuild b/dev-util/cloc/cloc-1.70.ebuild
index 26f902fadf8..3dd2d991090 100644
--- a/dev-util/cloc/cloc-1.70.ebuild
+++ b/dev-util/cloc/cloc-1.70.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-util/cloc/cloc-1.72.ebuild b/dev-util/cloc/cloc-1.72.ebuild
index 4e53d062f91..d80628622fd 100644
--- a/dev-util/cloc/cloc-1.72.ebuild
+++ b/dev-util/cloc/cloc-1.72.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-util/cmake-fedora/cmake-fedora-2.7.1.ebuild b/dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild
index 0df6cc62996..bce26ebcb7d 100644
--- a/dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild
+++ b/dev-util/cmake-fedora/cmake-fedora-2.7.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-util/cmake/cmake-3.6.3.ebuild b/dev-util/cmake/cmake-3.6.3.ebuild
index 03ba5a67d5d..4bd1a8e867d 100644
--- a/dev-util/cmake/cmake-3.6.3.ebuild
+++ b/dev-util/cmake/cmake-3.6.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-util/cmake/cmake-3.7.2.ebuild b/dev-util/cmake/cmake-3.7.2.ebuild
index b1800163e33..472dc373c01 100644
--- a/dev-util/cmake/cmake-3.7.2.ebuild
+++ b/dev-util/cmake/cmake-3.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=6
diff --git a/dev-util/cmake/cmake-3.8.0_rc1.ebuild b/dev-util/cmake/cmake-3.8.0_rc1.ebuild
index f38893c17bf..60d04535120 100644
--- a/dev-util/cmake/cmake-3.8.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.8.0_rc1.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-util/cmdtest/cmdtest-0.16.ebuild b/dev-util/cmdtest/cmdtest-0.16.ebuild
index b4eba5aa966..be5040f8f4b 100644
--- a/dev-util/cmdtest/cmdtest-0.16.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.16.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-util/cmdtest/cmdtest-0.18.ebuild b/dev-util/cmdtest/cmdtest-0.18.ebuild
index f9176a6de53..658bc7c8066 100644
--- a/dev-util/cmdtest/cmdtest-0.18.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.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
diff --git a/dev-util/cmdtest/cmdtest-0.27.ebuild b/dev-util/cmdtest/cmdtest-0.27.ebuild
index d393a783a3f..f8c1a62ae13 100644
--- a/dev-util/cmdtest/cmdtest-0.27.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.27.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-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
index 1b1b621caf6..750f48b72d2 100644
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ b/dev-util/cmocka/cmocka-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$
EAPI=5
diff --git a/dev-util/cmocka/cmocka-1.1.0.ebuild b/dev-util/cmocka/cmocka-1.1.0.ebuild
index c1e08ee42a4..ef8e1bc27d2 100644
--- a/dev-util/cmocka/cmocka-1.1.0.ebuild
+++ b/dev-util/cmocka/cmocka-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=6
diff --git a/dev-util/cmt/cmt-1.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
index f2224b21f6d..c36fd4ad8f2 100644
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ b/dev-util/cmt/cmt-1.26.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-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
index 00a59c29530..2b39af1f209 100644
--- a/dev-util/coccigrep/coccigrep-1.13.ebuild
+++ b/dev-util/coccigrep/coccigrep-1.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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index 96d6dfbc974..1b67ee46e79 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 70d5c9185cc..4e0d8f5af5c 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-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=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild
index 0e8814367bf..9f14a95f0a1 100644
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
WX_GTK_VER="2.8"
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 6504279fb35..4592ffeead9 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
WX_GTK_VER="2.8"
diff --git a/dev-util/colm/colm-0.12.0.ebuild b/dev-util/colm/colm-0.12.0.ebuild
index 3a2f4d7e72d..8f41d2cc7f5 100644
--- a/dev-util/colm/colm-0.12.0.ebuild
+++ b/dev-util/colm/colm-0.12.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-util/colm/colm-0.13.0.3.ebuild b/dev-util/colm/colm-0.13.0.3.ebuild
index 083075e5117..09e5b6d203e 100644
--- a/dev-util/colm/colm-0.13.0.3.ebuild
+++ b/dev-util/colm/colm-0.13.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=6
diff --git a/dev-util/colm/colm-0.13.0.4.ebuild b/dev-util/colm/colm-0.13.0.4.ebuild
index f0a0f82b2e2..0f3b4d2459f 100644
--- a/dev-util/colm/colm-0.13.0.4.ebuild
+++ b/dev-util/colm/colm-0.13.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=6
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 3ba6a054195..1cd7062570f 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-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
inherit eutils
diff --git a/dev-util/comparator/comparator-2.10.ebuild b/dev-util/comparator/comparator-2.10.ebuild
index 8ff562c0f6d..d331167b3ea 100644
--- a/dev-util/comparator/comparator-2.10.ebuild
+++ b/dev-util/comparator/comparator-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/complexity/complexity-1.10.ebuild b/dev-util/complexity/complexity-1.10.ebuild
index 71a664fdb86..889a7534845 100644
--- a/dev-util/complexity/complexity-1.10.ebuild
+++ b/dev-util/complexity/complexity-1.10.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-util/conan/conan-0.17.1.ebuild b/dev-util/conan/conan-0.17.1.ebuild
index 8c640cb0b4d..1ba26be6a28 100644
--- a/dev-util/conan/conan-0.17.1.ebuild
+++ b/dev-util/conan/conan-0.17.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-util/conan/conan-0.19.1.ebuild b/dev-util/conan/conan-0.19.1.ebuild
index 1b13e32feaa..89476460fd1 100644
--- a/dev-util/conan/conan-0.19.1.ebuild
+++ b/dev-util/conan/conan-0.19.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-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
index 8fc5cbb66b9..feb7b9d738c 100644
--- a/dev-util/confix-wrapper/confix-wrapper-0.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
HOMEPAGE="http://confix.sourceforge.net"
diff --git a/dev-util/confix/confix-2.3.5-r2.ebuild b/dev-util/confix/confix-2.3.5-r2.ebuild
index 1cf1e20b8da..319f49c5d0e 100644
--- a/dev-util/confix/confix-2.3.5-r2.ebuild
+++ b/dev-util/confix/confix-2.3.5-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-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
index 13df620e9fe..3cedd69d846 100644
--- a/dev-util/confix/confix-9999.ebuild
+++ b/dev-util/confix/confix-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/cookiecutter/cookiecutter-1.5.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.5.0.ebuild
index e56a33a6a7a..e7927137e0c 100644
--- a/dev-util/cookiecutter/cookiecutter-1.5.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.5.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-util/cookiecutter/cookiecutter-1.5.1.ebuild b/dev-util/cookiecutter/cookiecutter-1.5.1.ebuild
index 926ded11eb7..f105e8075c8 100644
--- a/dev-util/cookiecutter/cookiecutter-1.5.1.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.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=6
diff --git a/dev-util/cppcheck/cppcheck-1.72.ebuild b/dev-util/cppcheck/cppcheck-1.72.ebuild
index 072c279ac09..0f4dcbf95d9 100644
--- a/dev-util/cppcheck/cppcheck-1.72.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.72.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-util/cppcheck/cppcheck-1.75.ebuild b/dev-util/cppcheck/cppcheck-1.75.ebuild
index a2ccde1cc6d..ab82e77f822 100644
--- a/dev-util/cppcheck/cppcheck-1.75.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.75.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/cppcheck/cppcheck-1.77.ebuild b/dev-util/cppcheck/cppcheck-1.77.ebuild
index 0a476417362..fcdd220729f 100644
--- a/dev-util/cppcheck/cppcheck-1.77.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.77.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-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 6d7c5dc6c75..39b211e7423 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/cppi/cppi-1.18.ebuild b/dev-util/cppi/cppi-1.18.ebuild
index 5e5503ee1ce..899b2b873c8 100644
--- a/dev-util/cppi/cppi-1.18.ebuild
+++ b/dev-util/cppi/cppi-1.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
index 598ac2c550e..4dce91f1de2 100644
--- a/dev-util/cpptest/cpptest-1.1.2.ebuild
+++ b/dev-util/cpptest/cpptest-1.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils
diff --git a/dev-util/cppunit/cppunit-1.13.1.ebuild b/dev-util/cppunit/cppunit-1.13.1.ebuild
index e19b495ca26..c2af554846c 100644
--- a/dev-util/cppunit/cppunit-1.13.1.ebuild
+++ b/dev-util/cppunit/cppunit-1.13.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-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
index ffc6505c32f..5798b407c7c 100644
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.13.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-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
index b7284cac972..b33a4568396 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-9999.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-util/cpputest/cpputest-3.7.2.ebuild b/dev-util/cpputest/cpputest-3.7.2.ebuild
index ca7ab012cd4..e53a045bc41 100644
--- a/dev-util/cpputest/cpputest-3.7.2.ebuild
+++ b/dev-util/cpputest/cpputest-3.7.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
inherit autotools-utils
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index d2635804e8f..b9814132f06 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.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-util/cproto/cproto-4.7e.ebuild b/dev-util/cproto/cproto-4.7e.ebuild
index 8fa53517126..d6872afcc95 100644
--- a/dev-util/cproto/cproto-4.7e.ebuild
+++ b/dev-util/cproto/cproto-4.7e.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_PV="4_7e"
MY_P=${PN}-${MY_PV}
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
index bd00c30608c..846f7fc1247 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P=test_proc-20July2006
DESCRIPTION="huge collection of /proc/cpuinfo files"
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
index e5baf46f57c..dc2b3c6aef4 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20070104.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P=test_proc-${PV:6:2}January${PV:0:4}
DESCRIPTION="huge collection of /proc/cpuinfo files"
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 0cf7e6aae23..6f6a5bd6334 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.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-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index f80dc095688..e58431cd89f 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-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=6
diff --git a/dev-util/crash/crash-6.1.4.ebuild b/dev-util/crash/crash-6.1.4.ebuild
index 2db78c120f2..552bb1430a4 100644
--- a/dev-util/crash/crash-6.1.4.ebuild
+++ b/dev-util/crash/crash-6.1.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-util/crash/crash-7.0.0.ebuild b/dev-util/crash/crash-7.0.0.ebuild
index 2db78c120f2..552bb1430a4 100644
--- a/dev-util/crash/crash-7.0.0.ebuild
+++ b/dev-util/crash/crash-7.0.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-util/crash/crash-7.0.3.ebuild b/dev-util/crash/crash-7.0.3.ebuild
index 2db78c120f2..552bb1430a4 100644
--- a/dev-util/crash/crash-7.0.3.ebuild
+++ b/dev-util/crash/crash-7.0.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-util/crash/crash-7.0.7.ebuild b/dev-util/crash/crash-7.0.7.ebuild
index eb56a94ae70..e16819baaf0 100644
--- a/dev-util/crash/crash-7.0.7.ebuild
+++ b/dev-util/crash/crash-7.0.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-util/creduce/creduce-2.4.0.ebuild b/dev-util/creduce/creduce-2.4.0.ebuild
index 6db964a6b2a..ce791f0d6e5 100644
--- a/dev-util/creduce/creduce-2.4.0.ebuild
+++ b/dev-util/creduce/creduce-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-util/creduce/creduce-2.5.0.ebuild b/dev-util/creduce/creduce-2.5.0.ebuild
index dccdb323e0b..b92b782f27b 100644
--- a/dev-util/creduce/creduce-2.5.0.ebuild
+++ b/dev-util/creduce/creduce-2.5.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-util/creduce/creduce-2.6.0.ebuild b/dev-util/creduce/creduce-2.6.0.ebuild
index d3808e8330e..b5fa9ce9a2b 100644
--- a/dev-util/creduce/creduce-2.6.0.ebuild
+++ b/dev-util/creduce/creduce-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-util/creduce/creduce-9999.ebuild b/dev-util/creduce/creduce-9999.ebuild
index 99bc484b5a9..4979bd2911a 100644
--- a/dev-util/creduce/creduce-9999.ebuild
+++ b/dev-util/creduce/creduce-9999.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-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index 601e3d4ebe9..96ee8532b7b 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-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-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index a62cc632bd6..cc6a6c15981 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-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-util/csup/csup-20060318.ebuild b/dev-util/csup/csup-20060318.ebuild
index 5a44ca644f5..7aa63bfffd1 100644
--- a/dev-util/csup/csup-20060318.ebuild
+++ b/dev-util/csup/csup-20060318.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs eutils
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
index 187ea69d587..6d5301ed2d2 100644
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.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-util/ctags/ctags-5.8-r1.ebuild b/dev-util/ctags/ctags-5.8-r1.ebuild
index 140de8362d1..96d0d72a400 100644
--- a/dev-util/ctags/ctags-5.8-r1.ebuild
+++ b/dev-util/ctags/ctags-5.8-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-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild
index de4c1087cc3..041da0cb484 100644
--- a/dev-util/ctags/ctags-5.8.ebuild
+++ b/dev-util/ctags/ctags-5.8.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-util/ctags/ctags-5.8_p20140919.ebuild b/dev-util/ctags/ctags-5.8_p20140919.ebuild
index 68d4e2d3d35..9417b98d1c5 100644
--- a/dev-util/ctags/ctags-5.8_p20140919.ebuild
+++ b/dev-util/ctags/ctags-5.8_p20140919.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-util/cucumber-core/cucumber-core-1.4.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.4.0.ebuild
index 5fd5ff6d400..758ecf9e03b 100644
--- a/dev-util/cucumber-core/cucumber-core-1.4.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
index 209ecc70b64..55c601f4e19 100644
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-1.5.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
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.3.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.3.ebuild
index 150049a3e9a..50a3f2e1ba1 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.4.3.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.4.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.4.ebuild
index d553521a6ea..daea01d3219 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.4.4.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.4.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild
index f505564931b..049436501e4 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.4.5.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.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
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
index c6ebfe9d649..698eb7f6fc9 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.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
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/dev-util/cucumber/cucumber-1.3.17.ebuild b/dev-util/cucumber/cucumber-1.3.17.ebuild
index f5f48d59d0a..beb6bc09881 100644
--- a/dev-util/cucumber/cucumber-1.3.17.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.17.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
index 7ecbac46f1b..2b555a4d19c 100644
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20-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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index 9eea50babe1..dda772a62bb 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.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
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/dev-util/cucumber/cucumber-2.4.0.ebuild b/dev-util/cucumber/cucumber-2.4.0.ebuild
index c594dfd784c..5ae2501fb6d 100644
--- a/dev-util/cucumber/cucumber-2.4.0.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.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
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
index 19aeace2416..1522a3e1412 100644
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p2-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
inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 338a266f758..297393113af 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.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 autotools eutils flag-o-matic multilib-minimal toolchain-funcs
diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
index bcd27c82a79..8f333cb5c84 100644
--- a/dev-util/cutils/cutils-1.6-r4.ebuild
+++ b/dev-util/cutils/cutils-1.6-r4.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-util/cwdiff/cwdiff-0.2.8.ebuild b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
index 860a9929d8e..88eb1087bfb 100644
--- a/dev-util/cwdiff/cwdiff-0.2.8.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.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
diff --git a/dev-util/cwdiff/cwdiff-0.3.0.ebuild b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
index eaf721e87f4..ee48ba792c4 100644
--- a/dev-util/cwdiff/cwdiff-0.3.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.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-util/cwdiff/cwdiff-0.3.1.ebuild b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
index eaf721e87f4..ee48ba792c4 100644
--- a/dev-util/cwdiff/cwdiff-0.3.1.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.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-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
index 70d032f2d04..d557ff0b388 100644
--- a/dev-util/cwdiff/cwdiff-0.4.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.4.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-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
index c0667660f59..efe999c2870 100644
--- a/dev-util/cwdiff/cwdiff-9999.ebuild
+++ b/dev-util/cwdiff/cwdiff-9999.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-util/cyclo/cyclo-2.1.0.ebuild b/dev-util/cyclo/cyclo-2.1.0.ebuild
index 4f7bcdc4eb6..7f3353155ed 100644
--- a/dev-util/cyclo/cyclo-2.1.0.ebuild
+++ b/dev-util/cyclo/cyclo-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-util/d-feet/d-feet-0.3.10.ebuild b/dev-util/d-feet/d-feet-0.3.10.ebuild
index 495327f140c..c6c1fed25f0 100644
--- a/dev-util/d-feet/d-feet-0.3.10.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.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"
GCONF_DEBUG="no"
diff --git a/dev-util/d-feet/d-feet-0.3.11.ebuild b/dev-util/d-feet/d-feet-0.3.11.ebuild
index d7baaab4571..9e41db97b30 100644
--- a/dev-util/d-feet/d-feet-0.3.11.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
index e3f9c5589b5..c793d9f0af5 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-util/ddd/ddd-3.3.12-r3.ebuild b/dev-util/ddd/ddd-3.3.12-r3.ebuild
index c8df3b46e67..bed46086f11 100644
--- a/dev-util/ddd/ddd-3.3.12-r3.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 7be529ce753..4ff17ef3f78 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.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-util/debhelper/debhelper-10.2.4.ebuild b/dev-util/debhelper/debhelper-10.2.4.ebuild
index 8ec834feabc..b776562d411 100644
--- a/dev-util/debhelper/debhelper-10.2.4.ebuild
+++ b/dev-util/debhelper/debhelper-10.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=6
inherit eutils toolchain-funcs
diff --git a/dev-util/debhelper/debhelper-10.2.5.ebuild b/dev-util/debhelper/debhelper-10.2.5.ebuild
index 8ec834feabc..b776562d411 100644
--- a/dev-util/debhelper/debhelper-10.2.5.ebuild
+++ b/dev-util/debhelper/debhelper-10.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils toolchain-funcs
diff --git a/dev-util/debhelper/debhelper-9.20150101.ebuild b/dev-util/debhelper/debhelper-9.20150101.ebuild
index cc2ce4d478d..bf3df9d520c 100644
--- a/dev-util/debhelper/debhelper-9.20150101.ebuild
+++ b/dev-util/debhelper/debhelper-9.20150101.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 5c9256dcc75..f7998659965 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.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 eutils toolchain-funcs
diff --git a/dev-util/debootstrap/debootstrap-1.0.87.ebuild b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
index 33447f8009d..f6101e3687d 100644
--- a/dev-util/debootstrap/debootstrap-1.0.87.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils
diff --git a/dev-util/debootstrap/debootstrap-1.0.88.ebuild b/dev-util/debootstrap/debootstrap-1.0.88.ebuild
index ca56b016577..bc776f72548 100644
--- a/dev-util/debootstrap/debootstrap-1.0.88.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.88.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils
diff --git a/dev-util/debugedit/debugedit-5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
index 9521ea75886..5f091555b4e 100644
--- a/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
+++ b/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# To recreate this tarball, just grab latest rpm5 release:
# http://rpm5.org/files/rpm/
diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
index f665a0f9e71..b6951999aa8 100644
--- a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/dejagnu/dejagnu-1.5.ebuild b/dev-util/dejagnu/dejagnu-1.5.ebuild
index fc710a80124..acb79530f29 100644
--- a/dev-util/dejagnu/dejagnu-1.5.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="framework for testing other programs"
HOMEPAGE="https://www.gnu.org/software/dejagnu/"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
index ebf6e599641..6395ef51445 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit elisp-common eutils
diff --git a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
index 9a0592bac24..082b0fc72d9 100644
--- a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
+++ b/dev-util/deskzilla/deskzilla-1.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=5
diff --git a/dev-util/devhelp/devhelp-3.20.0.ebuild b/dev-util/devhelp/devhelp-3.20.0.ebuild
index f8787d18a2e..037d1945dcb 100644
--- a/dev-util/devhelp/devhelp-3.20.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.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
# gedit-3.8 is python3 only, this also per:
diff --git a/dev-util/devhelp/devhelp-3.22.0.ebuild b/dev-util/devhelp/devhelp-3.22.0.ebuild
index 361119e7e39..d0cb303da34 100644
--- a/dev-util/devhelp/devhelp-3.22.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.22.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
# gedit-3.8 is python3 only, this also per:
diff --git a/dev-util/dialog/dialog-1.3.20160828.ebuild b/dev-util/dialog/dialog-1.3.20160828.ebuild
index 02501b963bd..13ab611835b 100644
--- a/dev-util/dialog/dialog-1.3.20160828.ebuild
+++ b/dev-util/dialog/dialog-1.3.20160828.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils multilib versionator
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 6fb010126a8..7e7ae2ee659 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils multilib versionator
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index 52393215d0a..0902b00c14f 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-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$
EAPI=6
diff --git a/dev-util/difffilter/difffilter-0.3.3.ebuild b/dev-util/difffilter/difffilter-0.3.3.ebuild
index e13939ddd58..ec2d6786e05 100644
--- a/dev-util/difffilter/difffilter-0.3.3.ebuild
+++ b/dev-util/difffilter/difffilter-0.3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index 8140c1405c4..d0628ec89c7 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.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-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.61.ebuild
index a884865936e..eb958d03c0b 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.61.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-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8.ebuild
index f1ea525ddd8..93a43809a4d 100644
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ b/dev-util/diffuse/diffuse-0.4.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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
index 00f9db57c92..7750c5d249f 100644
--- a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
+++ b/dev-util/dirdiff/dirdiff-2.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-util/dissembler/dissembler-0.9-r1.ebuild b/dev-util/dissembler/dissembler-0.9-r1.ebuild
index 6f8ac3e5e0c..0635a8c2aac 100644
--- a/dev-util/dissembler/dissembler-0.9-r1.ebuild
+++ b/dev-util/dissembler/dissembler-0.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=6
diff --git a/dev-util/distro-info-data/distro-info-data-0.29.ebuild b/dev-util/distro-info-data/distro-info-data-0.29.ebuild
index b5f813609e3..b47f4ef5ba6 100644
--- a/dev-util/distro-info-data/distro-info-data-0.29.ebuild
+++ b/dev-util/distro-info-data/distro-info-data-0.29.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-util/distro-info-data/distro-info-data-0.32.ebuild b/dev-util/distro-info-data/distro-info-data-0.32.ebuild
index 56323ac1a43..81be8e5f7e2 100644
--- a/dev-util/distro-info-data/distro-info-data-0.32.ebuild
+++ b/dev-util/distro-info-data/distro-info-data-0.32.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-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
index 8c1510c3dcc..ebcfaf5ea72 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.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-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
index a3b1429a3cc..9029df2aefe 100644
--- a/dev-util/dmake/dmake-4.12.2.ebuild
+++ b/dev-util/dmake/dmake-4.12.2.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-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
index 0840a019355..c40e9462e0e 100644
--- a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.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
diff --git a/dev-util/dogtail/dogtail-0.9.9.ebuild b/dev-util/dogtail/dogtail-0.9.9.ebuild
index eed8b12f2fb..4ec73406853 100644
--- a/dev-util/dogtail/dogtail-0.9.9.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.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-util/doxy-coverage/doxy-coverage-151229.ebuild b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
index 3f7910be37f..e643001f331 100644
--- a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
+++ b/dev-util/doxy-coverage/doxy-coverage-151229.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-util/dput-ng/dput-ng-1.10.ebuild b/dev-util/dput-ng/dput-ng-1.10.ebuild
index ef5b6e1d40c..2192829fcc8 100644
--- a/dev-util/dput-ng/dput-ng-1.10.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/drone-ui/drone-ui-0_pre20170103.ebuild b/dev-util/drone-ui/drone-ui-0_pre20170103.ebuild
index 6444620268b..643c081ad6f 100644
--- a/dev-util/drone-ui/drone-ui-0_pre20170103.ebuild
+++ b/dev-util/drone-ui/drone-ui-0_pre20170103.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 golang-build golang-vcs-snapshot
diff --git a/dev-util/drone/drone-0.5.0_pre20170219.ebuild b/dev-util/drone/drone-0.5.0_pre20170219.ebuild
index 14350c78c03..7b93db3eeb5 100644
--- a/dev-util/drone/drone-0.5.0_pre20170219.ebuild
+++ b/dev-util/drone/drone-0.5.0_pre20170219.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 golang-build golang-vcs-snapshot
diff --git a/dev-util/drone/drone-0.5.0_pre20170224.ebuild b/dev-util/drone/drone-0.5.0_pre20170224.ebuild
index 6aacddd70cf..cb457972398 100644
--- a/dev-util/drone/drone-0.5.0_pre20170224.ebuild
+++ b/dev-util/drone/drone-0.5.0_pre20170224.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 golang-build golang-vcs-snapshot
diff --git a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild b/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
index 122c404c8a8..341fd711b33 100644
--- a/dev-util/dropwatch/dropwatch-1.4-r1.ebuild
+++ b/dev-util/dropwatch/dropwatch-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-util/dropwatch/dropwatch-1.4_p20150706.ebuild b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
index 69c033d45dd..f4d2002b7f7 100644
--- a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
+++ b/dev-util/dropwatch/dropwatch-1.4_p20150706.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-util/duma/duma-2.5.13.ebuild b/dev-util/duma/duma-2.5.13.ebuild
index 0c3c41620aa..5098d942b1e 100644
--- a/dev-util/duma/duma-2.5.13.ebuild
+++ b/dev-util/duma/duma-2.5.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils flag-o-matic multilib toolchain-funcs versionator
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
index 9d70cc039fa..f44643877e1 100644
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.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 toolchain-funcs versionator
diff --git a/dev-util/dwarves/dwarves-1.10_p20140618.ebuild b/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
index 3add4107f72..61d921299db 100644
--- a/dev-util/dwarves/dwarves-1.10_p20140618.ebuild
+++ b/dev-util/dwarves/dwarves-1.10_p20140618.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-util/dwarves/dwarves-1.10_p20160519.ebuild b/dev-util/dwarves/dwarves-1.10_p20160519.ebuild
index 7cfdb6a4381..6463e149b08 100644
--- a/dev-util/dwarves/dwarves-1.10_p20160519.ebuild
+++ b/dev-util/dwarves/dwarves-1.10_p20160519.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/dwarves/dwarves-1.10_p20160630.ebuild b/dev-util/dwarves/dwarves-1.10_p20160630.ebuild
index 7cfdb6a4381..6463e149b08 100644
--- a/dev-util/dwarves/dwarves-1.10_p20160630.ebuild
+++ b/dev-util/dwarves/dwarves-1.10_p20160630.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index 115786873e8..d53c42c3577 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.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-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
index ddaef1270d2..cd45b24397a 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.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-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index 6eabe853103..bc7474f29de 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-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
inherit eutils toolchain-funcs
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
index 2b92cfd729c..1e8e68705b5 100644
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
+++ b/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.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-util/egypt/egypt-1.10.ebuild b/dev-util/egypt/egypt-1.10.ebuild
index 877ae1e2107..5001a75c53a 100644
--- a/dev-util/egypt/egypt-1.10.ebuild
+++ b/dev-util/egypt/egypt-1.10.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-util/electron/electron-0.36.12-r5.ebuild b/dev-util/electron/electron-0.36.12-r5.ebuild
index 869e4d29bee..56930e985ab 100644
--- a/dev-util/electron/electron-0.36.12-r5.ebuild
+++ b/dev-util/electron/electron-0.36.12-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/electron/electron-0.37.8-r2.ebuild b/dev-util/electron/electron-0.37.8-r2.ebuild
index 3e175472a44..2674c00b984 100644
--- a/dev-util/electron/electron-0.37.8-r2.ebuild
+++ b/dev-util/electron/electron-0.37.8-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/electron/electron-1.3.13-r1.ebuild b/dev-util/electron/electron-1.3.13-r1.ebuild
index f12aaca6029..a278ad63d28 100644
--- a/dev-util/electron/electron-1.3.13-r1.ebuild
+++ b/dev-util/electron/electron-1.3.13-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"
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
index 2e6562628b3..7e9fab33ac2 100644
--- a/dev-util/elfkickers/elfkickers-3.0a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.0a.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-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
index dbeb2f2abb9..57d7594f539 100644
--- a/dev-util/elfkickers/elfkickers-3.1.ebuild
+++ b/dev-util/elfkickers/elfkickers-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="6"
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
index f9a73350444..e40bc9b228e 100644
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ b/dev-util/emilpro/emilpro-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-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index 0e6496c8c48..3cad6fafde7 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/eric/eric-16.12.ebuild b/dev-util/eric/eric-16.12.ebuild
index ca9846fcc02..bd6787b0351 100644
--- a/dev-util/eric/eric-16.12.ebuild
+++ b/dev-util/eric/eric-16.12.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-util/eric/eric-17.01.ebuild b/dev-util/eric/eric-17.01.ebuild
index ca9846fcc02..bd6787b0351 100644
--- a/dev-util/eric/eric-17.01.ebuild
+++ b/dev-util/eric/eric-17.01.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-util/fatrace/fatrace-0.11.ebuild b/dev-util/fatrace/fatrace-0.11.ebuild
index 0248271af9e..00fc54446d8 100644
--- a/dev-util/fatrace/fatrace-0.11.ebuild
+++ b/dev-util/fatrace/fatrace-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-util/fatrace/fatrace-0.12.ebuild b/dev-util/fatrace/fatrace-0.12.ebuild
index 8375595b970..2f7b0af07d1 100644
--- a/dev-util/fatrace/fatrace-0.12.ebuild
+++ b/dev-util/fatrace/fatrace-0.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-util/febootstrap/febootstrap-2.11.ebuild b/dev-util/febootstrap/febootstrap-2.11.ebuild
index a7eadb541aa..1942833286e 100644
--- a/dev-util/febootstrap/febootstrap-2.11.ebuild
+++ b/dev-util/febootstrap/febootstrap-2.11.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-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild
index 7a565ba2c3f..1bcd65423a1 100644
--- a/dev-util/fhist/fhist-1.16.ebuild
+++ b/dev-util/fhist/fhist-1.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="File history and comparison tools"
HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
index f9ee56c2a55..c23d28e436b 100644
--- a/dev-util/fhist/fhist-1.19.ebuild
+++ b/dev-util/fhist/fhist-1.19.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-util/fhist/fhist-1.21.ebuild b/dev-util/fhist/fhist-1.21.ebuild
index d3a2b031b68..1f783dcb8d3 100644
--- a/dev-util/fhist/fhist-1.21.ebuild
+++ b/dev-util/fhist/fhist-1.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-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
index 6b8031832df..2498e2e3a9e 100644
--- a/dev-util/findbugs/findbugs-3.0.1.ebuild
+++ b/dev-util/findbugs/findbugs-3.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-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index 0a7ab4c8b84..1a33b2b8831 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-util/flawfinder/flawfinder-1.31.ebuild b/dev-util/flawfinder/flawfinder-1.31.ebuild
index a190d31bdcd..6faab65e58a 100644
--- a/dev-util/flawfinder/flawfinder-1.31.ebuild
+++ b/dev-util/flawfinder/flawfinder-1.31.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
index 15495163947..45b6c476157 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs versionator
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
index 8347727de84..10f581a6233 100644
--- a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
+++ b/dev-util/ftnchek/ftnchek-3.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-util/fuzz/fuzz-0.6-r1.ebuild b/dev-util/fuzz/fuzz-0.6-r1.ebuild
index 1f30085de2e..88242637434 100644
--- a/dev-util/fuzz/fuzz-0.6-r1.ebuild
+++ b/dev-util/fuzz/fuzz-0.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
diff --git a/dev-util/gcovr/gcovr-3.2.ebuild b/dev-util/gcovr/gcovr-3.2.ebuild
index fb677519a62..bb265088973 100644
--- a/dev-util/gcovr/gcovr-3.2.ebuild
+++ b/dev-util/gcovr/gcovr-3.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-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
index e1b5f06c933..251ed7ac20a 100644
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ b/dev-util/gcovr/gcovr-3.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-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild
index 71620932472..8f616163f4e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.48.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"
GNOME_ORG_MODULE="glib"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
index 1679e7194c9..7834f0c7fcd 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.50.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"
GNOME_ORG_MODULE="glib"
diff --git a/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild
index 014f709f04f..5362d11ca59 100644
--- a/dev-util/geany-plugins/geany-plugins-1.28-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.28-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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/geany/geany-1.28.ebuild b/dev-util/geany/geany-1.28.ebuild
index 90aa86331bd..7facaa6aa9b 100644
--- a/dev-util/geany/geany-1.28.ebuild
+++ b/dev-util/geany/geany-1.28.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils fdo-mime gnome2-utils
diff --git a/dev-util/geany/geany-1.29-r1.ebuild b/dev-util/geany/geany-1.29-r1.ebuild
index 9831b85c4d9..0c3f943e427 100644
--- a/dev-util/geany/geany-1.29-r1.ebuild
+++ b/dev-util/geany/geany-1.29-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 fdo-mime gnome2-utils
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
index 303741a06e5..42baab7891b 100644
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.22.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
inherit eutils autotools
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
index 61674847f29..e0586738819 100644
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ b/dev-util/gertty/gertty-1.3.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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index 61674847f29..e0586738819 100644
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ b/dev-util/gertty/gertty-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=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/glade/glade-3.20.0.ebuild b/dev-util/glade/glade-3.20.0.ebuild
index 3e7202a1d8e..b348eaba59a 100644
--- a/dev-util/glade/glade-3.20.0.ebuild
+++ b/dev-util/glade/glade-3.20.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
GNOME2_LA_PUNT="yes"
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index 231f788a13e..dcefb9fac0a 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.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-util/gnome-devel-docs/gnome-devel-docs-3.20.2.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.20.2.ebuild
index ef6cdcdc51a..a5ff1a5d4ea 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.20.2.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.20.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 gnome2
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild
index 0cddd3fb954..46a3a62fbb2 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.22.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
inherit gnome2
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index 5aabc207283..27f6942ffb2 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/dev-util/google-perftools/google-perftools-1.8.3.ebuild b/dev-util/google-perftools/google-perftools-1.8.3.ebuild
index d43b4921384..7440a1c1f1c 100644
--- a/dev-util/google-perftools/google-perftools-1.8.3.ebuild
+++ b/dev-util/google-perftools/google-perftools-1.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=4
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
index 36a588001a3..c0b175dcf38 100644
--- a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
+++ b/dev-util/google-perftools/google-perftools-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
diff --git a/dev-util/google-perftools/google-perftools-2.5.ebuild b/dev-util/google-perftools/google-perftools-2.5.ebuild
index c732471b040..432fce8f0c2 100644
--- a/dev-util/google-perftools/google-perftools-2.5.ebuild
+++ b/dev-util/google-perftools/google-perftools-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=5
diff --git a/dev-util/gource/gource-0.44.ebuild b/dev-util/gource/gource-0.44.ebuild
index 96fc7efe63e..550da48c6ac 100644
--- a/dev-util/gource/gource-0.44.ebuild
+++ b/dev-util/gource/gource-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=6
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index e06d5d4801d..f10a26e67e5 100644
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.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-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 2e2f6068908..3553aebc5a5 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-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-util/gprof2dot/gprof2dot-0_p20130517.ebuild b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
index 8816ef8ef64..18b3edde7ae 100644
--- a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/dev-util/gquilt/gquilt-0.25-r1.ebuild b/dev-util/gquilt/gquilt-0.25-r1.ebuild
index 695d0173f1a..ce0e5f51b9c 100644
--- a/dev-util/gquilt/gquilt-0.25-r1.ebuild
+++ b/dev-util/gquilt/gquilt-0.25-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-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
index 64fedd83d30..d1c6022be4f 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-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
GNOME_ORG_MODULE="gtk+"
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31.ebuild
index 3a59d91cb70..1271ee7146b 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME_ORG_MODULE="gtk+"
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index a8f04a11eb5..d765b7b51bb 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-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
GNOME_ORG_MODULE="gtk-doc"
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 4a31ec9e85b..f94ffdbd5bc 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.20.9.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.20.9.ebuild
index b4ade9af8e8..e27c9d0d831 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.20.9.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.20.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-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild
index ecbb58a2f85..a53d8b9e655 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.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
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index 96391d36307..45bb021ef3a 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.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-util/howdoi/howdoi-1.1.9.ebuild b/dev-util/howdoi/howdoi-1.1.9.ebuild
index 278ac126837..64922e33790 100644
--- a/dev-util/howdoi/howdoi-1.1.9.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.9.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-util/huc/huc-0.1-r1.ebuild b/dev-util/huc/huc-0.1-r1.ebuild
index a4d168abdb3..bcbd9fd8a2b 100644
--- a/dev-util/huc/huc-0.1-r1.ebuild
+++ b/dev-util/huc/huc-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$
EAPI=6
diff --git a/dev-util/huc/huc-0.1.ebuild b/dev-util/huc/huc-0.1.ebuild
index ef3eb84a525..26a394cef73 100644
--- a/dev-util/huc/huc-0.1.ebuild
+++ b/dev-util/huc/huc-0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/dev-util/hxd/hxd-0.70.02-r1.ebuild b/dev-util/hxd/hxd-0.70.02-r1.ebuild
index 8e23f0b3e44..f26130940c8 100644
--- a/dev-util/hxd/hxd-0.70.02-r1.ebuild
+++ b/dev-util/hxd/hxd-0.70.02-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-util/hxtools/hxtools-20121125-r1.ebuild b/dev-util/hxtools/hxtools-20121125-r1.ebuild
index 1b279507e36..6f624335e2d 100644
--- a/dev-util/hxtools/hxtools-20121125-r1.ebuild
+++ b/dev-util/hxtools/hxtools-20121125-r1.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-util/icemon/icemon-20140102.ebuild b/dev-util/icemon/icemon-20140102.ebuild
index fcbe450144b..02edb48197f 100644
--- a/dev-util/icemon/icemon-20140102.ebuild
+++ b/dev-util/icemon/icemon-20140102.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-util/icmake/icmake-7.22.01.ebuild b/dev-util/icmake/icmake-7.22.01.ebuild
index f82ff689123..ccb9d9c74ef 100644
--- a/dev-util/icmake/icmake-7.22.01.ebuild
+++ b/dev-util/icmake/icmake-7.22.01.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-util/icmake/icmake-9.00.00.ebuild b/dev-util/icmake/icmake-9.00.00.ebuild
index 4953897a93f..2fd35d977fc 100644
--- a/dev-util/icmake/icmake-9.00.00.ebuild
+++ b/dev-util/icmake/icmake-9.00.00.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-util/icmake/icmake-9.02.02.ebuild b/dev-util/icmake/icmake-9.02.02.ebuild
index 5a56d3185fa..5fb89298061 100644
--- a/dev-util/icmake/icmake-9.02.02.ebuild
+++ b/dev-util/icmake/icmake-9.02.02.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-util/idea-community/idea-community-2016.3.3.163.11103.6.ebuild b/dev-util/idea-community/idea-community-2016.3.3.163.11103.6.ebuild
index 6273cac6254..a4f2eb0c798 100644
--- a/dev-util/idea-community/idea-community-2016.3.3.163.11103.6.ebuild
+++ b/dev-util/idea-community/idea-community-2016.3.3.163.11103.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
inherit eutils versionator
diff --git a/dev-util/idea-ultimate/idea-ultimate-2016.3.1.163.9166.29.ebuild b/dev-util/idea-ultimate/idea-ultimate-2016.3.1.163.9166.29.ebuild
index bda2c0d6ebc..92e22802b3d 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2016.3.1.163.9166.29.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.3.1.163.9166.29.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 versionator
diff --git a/dev-util/idea-ultimate/idea-ultimate-2016.3.3.163.11103.6.ebuild b/dev-util/idea-ultimate/idea-ultimate-2016.3.3.163.11103.6.ebuild
index 3feac002dd5..088e87ce25b 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2016.3.3.163.11103.6.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.3.3.163.11103.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
inherit eutils versionator
diff --git a/dev-util/idutils/idutils-4.2.ebuild b/dev-util/idutils/idutils-4.2.ebuild
index c1d2ada8bf2..06fe5867b62 100644
--- a/dev-util/idutils/idutils-4.2.ebuild
+++ b/dev-util/idutils/idutils-4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils elisp-common
diff --git a/dev-util/idutils/idutils-4.5.ebuild b/dev-util/idutils/idutils-4.5.ebuild
index f23fbe927a9..ed33adb9246 100644
--- a/dev-util/idutils/idutils-4.5.ebuild
+++ b/dev-util/idutils/idutils-4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils elisp-common
diff --git a/dev-util/idutils/idutils-4.6.ebuild b/dev-util/idutils/idutils-4.6.ebuild
index b3dddfef08a..31f8419d488 100644
--- a/dev-util/idutils/idutils-4.6.ebuild
+++ b/dev-util/idutils/idutils-4.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit elisp-common eutils
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
index 5989feebd9f..5199159f060 100644
--- a/dev-util/igprof/igprof-5.9.11.ebuild
+++ b/dev-util/igprof/igprof-5.9.11.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-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
index 20f90f7f5f8..7291ee8d470 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.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-util/include-what-you-use/include-what-you-use-3.5.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.5.ebuild
index 6f3bfe796ec..5ae300882cc 100644
--- a/dev-util/include-what-you-use/include-what-you-use-3.5.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-3.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
inherit eutils cmake-utils flag-o-matic
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild
index ff33319fc6b..d8dd0992d75 100644
--- a/dev-util/include-what-you-use/include-what-you-use-3.6.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-3.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
inherit eutils cmake-utils flag-o-matic
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.7-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.7-r1.ebuild
index 4adfce3bdf4..f69d32a01b0 100644
--- a/dev-util/include-what-you-use/include-what-you-use-3.7-r1.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-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=6
inherit cmake-utils flag-o-matic
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.8.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.8.ebuild
index 4fbc1d111b1..49c8b483e86 100644
--- a/dev-util/include-what-you-use/include-what-you-use-3.8.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-3.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
inherit cmake-utils flag-o-matic
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild
index 60635bac75c..c4dcc6b85fc 100644
--- a/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-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=6
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index acfb221508c..778fe8b8c99 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-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-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
index acfed9be595..fdf2132e353 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.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-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index 1db1d939248..062e89a9698 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-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-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild
index 39c7701a3aa..ce380d8f20a 100644
--- a/dev-util/intltool/intltool-0.50.2-r1.ebuild
+++ b/dev-util/intltool/intltool-0.50.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
inherit eutils
diff --git a/dev-util/intltool/intltool-0.51.0-r1.ebuild b/dev-util/intltool/intltool-0.51.0-r1.ebuild
index 23916277cb6..f431362b7ad 100644
--- a/dev-util/intltool/intltool-0.51.0-r1.ebuild
+++ b/dev-util/intltool/intltool-0.51.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
inherit eutils
diff --git a/dev-util/intltool/intltool-0.51.0.ebuild b/dev-util/intltool/intltool-0.51.0.ebuild
index 791ec3ea733..cfd5ea16f0c 100644
--- a/dev-util/intltool/intltool-0.51.0.ebuild
+++ b/dev-util/intltool/intltool-0.51.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
inherit eutils
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild
index 6a988f3f49d..a7e86e1dd3d 100644
--- a/dev-util/its4/its4-1.1.1.ebuild
+++ b/dev-util/its4/its4-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="ITS4: Software Security Tool"
HOMEPAGE="http://www.cigital.com/its4/"
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index a5e01ec02a1..adf8ad6b64c 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-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-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
index 119137a9418..741bb261158 100644
--- a/dev-util/jarwizard/jarwizard-2.50.ebuild
+++ b/dev-util/jarwizard/jarwizard-2.50.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-util/jay/jay-1.1.1-r2.ebuild b/dev-util/jay/jay-1.1.1-r2.ebuild
index 8a5b980d446..38a0681abbb 100644
--- a/dev-util/jay/jay-1.1.1-r2.ebuild
+++ b/dev-util/jay/jay-1.1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit mono java-pkg-opt-2 toolchain-funcs
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
index 5fbf3448304..a39ec9d566c 100644
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ b/dev-util/jconfig/jconfig-2.8-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 source"
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
index 5fbf3448304..a39ec9d566c 100644
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ b/dev-util/jconfig/jconfig-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$
JAVA_PKG_IUSE="doc source"
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index 9239eac455e..22792d15895 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-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-util/jenkins-bin/jenkins-bin-1.651.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.651.2.ebuild
index 88dc7f8565d..3b7b5614110 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.651.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.651.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-util/jenkins-bin/jenkins-bin-2.32.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.32.2.ebuild
index b980e9eb3f0..296fff22b7a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.32.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.32.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
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.45.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.45.ebuild
index 6c54e862f88..bec7ad71bb6 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.45.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.45.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-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
index 1dccf974b48..3eed5d63829 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-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-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
index 826b15c701c..b96e4f88d75 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index cc506f9d284..32de18e3ea3 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.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-util/kcov/kcov-33.ebuild b/dev-util/kcov/kcov-33.ebuild
index dd882915342..7f1e7488e3b 100644
--- a/dev-util/kcov/kcov-33.ebuild
+++ b/dev-util/kcov/kcov-33.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-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
index b4cf68c4d7c..eec056058ef 100644
--- a/dev-util/kcov/kcov-9999.ebuild
+++ b/dev-util/kcov/kcov-9999.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-util/kdbg/kdbg-2.5.6.ebuild b/dev-util/kdbg/kdbg-2.5.6.ebuild
index e49d06c56b9..aa9c80870c2 100644
--- a/dev-util/kdbg/kdbg-2.5.6.ebuild
+++ b/dev-util/kdbg/kdbg-2.5.6.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-util/kdbg/kdbg-2.9.0.ebuild b/dev-util/kdbg/kdbg-2.9.0.ebuild
index 3e259df0034..09d174ff0b3 100644
--- a/dev-util/kdbg/kdbg-2.9.0.ebuild
+++ b/dev-util/kdbg/kdbg-2.9.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-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
index a0a2a19da3e..e0d777c6863 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.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
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
index a7f02ab8b94..f637e82f765 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.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-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
index b760d48239c..10f9ce96831 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.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
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0.ebuild
index 2d2b02b94ae..4eb6d60cc55 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-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=6
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
index d2014573e96..fd248d24646 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.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-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild
index ce64afc0c51..a0fa10fe886 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.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-util/kdevelop-php/kdevelop-php-1.7.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
index 50ae3d9cb3e..98ccacb1808 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.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-util/kdevelop-php/kdevelop-php-1.7.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild
index 63c7b4227e5..89a4ae569a0 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.4.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-util/kdevelop-php/kdevelop-php-5.0.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.0.3.ebuild
index 687041ba887..580be6bd215 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.0.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-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=6
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
index e0db81fd8dc..1f714e4c885 100644
--- a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-1.7.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-util/kdevelop-python/kdevelop-python-1.7.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.4.ebuild
index 7db10d15240..1b6dbabc087 100644
--- a/dev-util/kdevelop-python/kdevelop-python-1.7.4.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-1.7.4.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-util/kdevelop-python/kdevelop-python-5.0.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.0.3.ebuild
index 5c64de719a0..61ee5559db9 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.0.3.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-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=6
diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild b/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild
index 09297d49da0..1897935d51f 100644
--- a/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.0.ebuild
+++ b/dev-util/kdevelop-qmake/kdevelop-qmake-1.7.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-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild
index e5ac39a64b2..0c159dd7909 100644
--- a/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild
+++ b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.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-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
index 0ea90f0894c..a29d626d8ab 100644
--- a/dev-util/kdevelop/kdevelop-4.7.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.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-util/kdevelop/kdevelop-4.7.4.ebuild b/dev-util/kdevelop/kdevelop-4.7.4.ebuild
index 232b066a706..9aa9f098d04 100644
--- a/dev-util/kdevelop/kdevelop-4.7.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.4.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-util/kdevelop/kdevelop-5.0.3.ebuild b/dev-util/kdevelop/kdevelop-5.0.3.ebuild
index 8248c024e0c..30ff3f9fa93 100644
--- a/dev-util/kdevelop/kdevelop-5.0.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-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=6
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
index e56305bcac8..8995d98d88a 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.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=5
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.4.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.4.ebuild
index 6b6d2b11ecd..56160444682 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.4.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.4.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-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
index 0c1e18998ff..4236dbcab34 100644
--- a/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-5.0.3-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
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild
index 69d50717c20..5b1492bb6d1 100644
--- a/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-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=6
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
index ed8b2b4de07..b724f138a4c 100644
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ b/dev-util/kelbt/kelbt-0.15.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-util/kscope/kscope-1.9.4-r2.ebuild b/dev-util/kscope/kscope-1.9.4-r2.ebuild
index f433dafdf7c..a1d3783410e 100644
--- a/dev-util/kscope/kscope-1.9.4-r2.ebuild
+++ b/dev-util/kscope/kscope-1.9.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-util/kup/kup-0.3.4-r1.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild
index b4681218e06..54b8b1a1e82 100644
--- a/dev-util/kup/kup-0.3.4-r1.ebuild
+++ b/dev-util/kup/kup-0.3.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=6
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index 63d71732d42..83edb27798a 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.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-util/lcov/lcov-1.13.ebuild b/dev-util/lcov/lcov-1.13.ebuild
index 5e3eadb9d2b..df666327287 100644
--- a/dev-util/lcov/lcov-1.13.ebuild
+++ b/dev-util/lcov/lcov-1.13.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-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
index ae20a944fe6..d46f47b86bf 100644
--- a/dev-util/lcov/lcov-1.9-r1.ebuild
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild b/dev-util/leaktracer/leaktracer-2.4-r3.ebuild
index 36b01910ef8..9312217fb98 100644
--- a/dev-util/leaktracer/leaktracer-2.4-r3.ebuild
+++ b/dev-util/leaktracer/leaktracer-2.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=6
inherit toolchain-funcs
diff --git a/dev-util/linklint/linklint-2.3.5.ebuild b/dev-util/linklint/linklint-2.3.5.ebuild
index ecb42b532f1..b2b7b1a9e14 100644
--- a/dev-util/linklint/linklint-2.3.5.ebuild
+++ b/dev-util/linklint/linklint-2.3.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-util/lldb/lldb-4.0.0_rc2.ebuild b/dev-util/lldb/lldb-4.0.0_rc2.ebuild
index 0f7bd4f0b5e..199b5a600e8 100644
--- a/dev-util/lldb/lldb-4.0.0_rc2.ebuild
+++ b/dev-util/lldb/lldb-4.0.0_rc2.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-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 3a0deeaf921..b059e6abc02 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.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-util/lockrun/lockrun-20120508.ebuild b/dev-util/lockrun/lockrun-20120508.ebuild
index 5e7e1ef7e0d..70d5bafe59d 100644
--- a/dev-util/lockrun/lockrun-20120508.ebuild
+++ b/dev-util/lockrun/lockrun-20120508.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/dev-util/lsuio/lsuio-0.2.0.ebuild b/dev-util/lsuio/lsuio-0.2.0.ebuild
index 8b34a6d283b..729c2ba0c5d 100644
--- a/dev-util/lsuio/lsuio-0.2.0.ebuild
+++ b/dev-util/lsuio/lsuio-0.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/ltrace/ltrace-0.5.3.1.ebuild b/dev-util/ltrace/ltrace-0.5.3.1.ebuild
index ccce4ab374b..19c5e2777c6 100644
--- a/dev-util/ltrace/ltrace-0.5.3.1.ebuild
+++ b/dev-util/ltrace/ltrace-0.5.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils autotools
diff --git a/dev-util/ltrace/ltrace-0.7.2.ebuild b/dev-util/ltrace/ltrace-0.7.2.ebuild
index d5421cb395a..d48cad4075c 100644
--- a/dev-util/ltrace/ltrace-0.7.2.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.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-util/ltrace/ltrace-0.7.3.ebuild b/dev-util/ltrace/ltrace-0.7.3.ebuild
index 3ed1b8fd29d..39885943783 100644
--- a/dev-util/ltrace/ltrace-0.7.3.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.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-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 22394b2c64e..7305b4cba13 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.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 autotools eutils
diff --git a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
index 374c4d933dc..d7f32b7b99d 100644
--- a/dev-util/lttng-modules/lttng-modules-2.6.4.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.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-util/lttng-modules/lttng-modules-2.7.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
index df739dd2de5..816b2459295 100644
--- a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-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=5
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
index 374c4d933dc..d7f32b7b99d 100644
--- a/dev-util/lttng-modules/lttng-modules-2.7.4.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.7.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-util/lttng-modules/lttng-modules-2.8.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild
index 374c4d933dc..d7f32b7b99d 100644
--- a/dev-util/lttng-modules/lttng-modules-2.8.0.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.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-util/lttng-tools/lttng-tools-2.6.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
index 7f5af9aa935..9f1c5e6a680 100644
--- a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.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-util/lttng-tools/lttng-tools-2.7.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
index 939dea84364..37b1fe1b01d 100644
--- a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-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=5
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
index 7f5af9aa935..9f1c5e6a680 100644
--- a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.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-util/lttng-tools/lttng-tools-2.8.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
index 7f5af9aa935..9f1c5e6a680 100644
--- a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.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-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
index c3f261f5db6..b5983a546e8 100644
--- a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.6.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-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
index 47c99d708de..dc493ad0c9d 100644
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-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=5
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
index c3f261f5db6..b5983a546e8 100644
--- a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.7.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-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index c3f261f5db6..b5983a546e8 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-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-util/makeheaders/makeheaders-0_p4.ebuild b/dev-util/makeheaders/makeheaders-0_p4.ebuild
index 8196522e2d8..c7433fcbeb3 100644
--- a/dev-util/makeheaders/makeheaders-0_p4.ebuild
+++ b/dev-util/makeheaders/makeheaders-0_p4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/dev-util/makepp/makepp-1.18.ebuild b/dev-util/makepp/makepp-1.18.ebuild
index dd21a8e6983..3fa99977dce 100644
--- a/dev-util/makepp/makepp-1.18.ebuild
+++ b/dev-util/makepp/makepp-1.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/makepp/makepp-1.40.1a.ebuild b/dev-util/makepp/makepp-1.40.1a.ebuild
index b4a9c7cdf94..da21b106b42 100644
--- a/dev-util/makepp/makepp-1.40.1a.ebuild
+++ b/dev-util/makepp/makepp-1.40.1a.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/dev-util/makepp/makepp-1.50_pre110621.ebuild b/dev-util/makepp/makepp-1.50_pre110621.ebuild
index 7c48c4b1a67..d19d34f743b 100644
--- a/dev-util/makepp/makepp-1.50_pre110621.ebuild
+++ b/dev-util/makepp/makepp-1.50_pre110621.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-util/makepp/makepp-2.0-r1.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
index d51fbff2573..a8d44bd7fca 100644
--- a/dev-util/makepp/makepp-2.0-r1.ebuild
+++ b/dev-util/makepp/makepp-2.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-util/makepp/makepp-2.0.98.4.ebuild b/dev-util/makepp/makepp-2.0.98.4.ebuild
index f022a189b35..1ecf18f24d1 100644
--- a/dev-util/makepp/makepp-2.0.98.4.ebuild
+++ b/dev-util/makepp/makepp-2.0.98.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-util/makepp/makepp-2.0.98.5.ebuild b/dev-util/makepp/makepp-2.0.98.5.ebuild
index f022a189b35..1ecf18f24d1 100644
--- a/dev-util/makepp/makepp-2.0.98.5.ebuild
+++ b/dev-util/makepp/makepp-2.0.98.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/dev-util/mdds/mdds-1.2.2.ebuild b/dev-util/mdds/mdds-1.2.2.ebuild
index 4cac987a4f9..87734073a01 100644
--- a/dev-util/mdds/mdds-1.2.2.ebuild
+++ b/dev-util/mdds/mdds-1.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=6
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 867cc265884..cbc8fcb3af6 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.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-util/meld/meld-3.16.4.ebuild b/dev-util/meld/meld-3.16.4.ebuild
index 68d78323aaf..98a3b175b5c 100644
--- a/dev-util/meld/meld-3.16.4.ebuild
+++ b/dev-util/meld/meld-3.16.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
PYTHON_REQ_USE="xml"
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
index d51343f70dd..99e0512870e 100644
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/meson/meson-0.36.0.ebuild b/dev-util/meson/meson-0.36.0.ebuild
index 434f110c80c..d965f3c5798 100644
--- a/dev-util/meson/meson-0.36.0.ebuild
+++ b/dev-util/meson/meson-0.36.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
PYTHON_COMPAT=( python3_{4,5} )
diff --git a/dev-util/meson/meson-0.37.1.ebuild b/dev-util/meson/meson-0.37.1.ebuild
index e91bcea1ae2..4a98372fa7d 100644
--- a/dev-util/meson/meson-0.37.1.ebuild
+++ b/dev-util/meson/meson-0.37.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
PYTHON_COMPAT=( python3_{4,5} )
diff --git a/dev-util/meson/meson-0.38.0.ebuild b/dev-util/meson/meson-0.38.0.ebuild
index f0a050e91bd..898271b1e2c 100644
--- a/dev-util/meson/meson-0.38.0.ebuild
+++ b/dev-util/meson/meson-0.38.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
PYTHON_COMPAT=( python3_{4,5} )
diff --git a/dev-util/meson/meson-0.38.1.ebuild b/dev-util/meson/meson-0.38.1.ebuild
index f0a050e91bd..898271b1e2c 100644
--- a/dev-util/meson/meson-0.38.1.ebuild
+++ b/dev-util/meson/meson-0.38.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
PYTHON_COMPAT=( python3_{4,5} )
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index f0a050e91bd..898271b1e2c 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_{4,5} )
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
index d5a267fb472..a32340f19d0 100644
--- a/dev-util/min-cscope/min-cscope-16.1.0.ebuild
+++ b/dev-util/min-cscope/min-cscope-16.1.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
inherit cmake-utils flag-o-matic
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
index cda4ddde95f..fb7b3aaaadb 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export CBUILD=${CBUILD:-${CHOST}}
export CTARGET=${CTARGET:-${CHOST}}
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
index d2d718235aa..21f0e6d6c3b 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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"
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index 48faa5919b3..d456e763daa 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
index 8d414d7a8c7..29cc5a87519 100644
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-4.0.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="4"
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
index b7755236a41..ce8f87cddc9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.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-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
index b7755236a41..ce8f87cddc9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.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-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
index b7755236a41..ce8f87cddc9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.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-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
index f0836e69a1c..b298a1a5304 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.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-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
index f738c15fccb..2fc6dd78d67 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.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-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
index 67e224be076..8b0d38b204c 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.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
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
index 4fb06efc8d8..408aa8d8e7b 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.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-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index 0ac7754415a..bd39c2af294 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ b/dev-util/molecule-core/molecule-core-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="6"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
index 6dde2b7c17a..5d59c6a1c11 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-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="6"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
diff --git a/dev-util/molecule/molecule-2.ebuild b/dev-util/molecule/molecule-2.ebuild
index 04b6d3e03f6..d03edd9c576 100644
--- a/dev-util/molecule/molecule-2.ebuild
+++ b/dev-util/molecule/molecule-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-util/monkeystudio/monkeystudio-1.9.0.4-r1.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.4-r1.ebuild
index 151d5e9b625..c7fc6f17e63 100644
--- a/dev-util/monkeystudio/monkeystudio-1.9.0.4-r1.ebuild
+++ b/dev-util/monkeystudio/monkeystudio-1.9.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=5
LANGS="be es fr ru"
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
index f7e61ef67b4..5b31fd4fba7 100644
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ b/dev-util/mpatch/mpatch-0.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-util/mutrace/mutrace-0.2-r1.ebuild b/dev-util/mutrace/mutrace-0.2-r1.ebuild
index 9c305d8c385..a9728aa1ec2 100644
--- a/dev-util/mutrace/mutrace-0.2-r1.ebuild
+++ b/dev-util/mutrace/mutrace-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
inherit eutils
diff --git a/dev-util/nemiver/nemiver-0.9.6.ebuild b/dev-util/nemiver/nemiver-0.9.6.ebuild
index e0b09424ca0..fc9c1fb2667 100644
--- a/dev-util/nemiver/nemiver-0.9.6.ebuild
+++ b/dev-util/nemiver/nemiver-0.9.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/dev-util/netbeans/netbeans-8.0.2.ebuild b/dev-util/netbeans/netbeans-8.0.2.ebuild
index 938d5daf476..ffda722d6f7 100644
--- a/dev-util/netbeans/netbeans-8.0.2.ebuild
+++ b/dev-util/netbeans/netbeans-8.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="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-util/netbeans/netbeans-8.1.ebuild b/dev-util/netbeans/netbeans-8.1.ebuild
index 6c0f15cc0ab..ba0ae8921ae 100644
--- a/dev-util/netbeans/netbeans-8.1.ebuild
+++ b/dev-util/netbeans/netbeans-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="4"
inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
index 5c2df57efe9..394a478b276 100644
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ b/dev-util/netbeans/netbeans-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-util/ninja-ide/ninja-ide-2.3.ebuild b/dev-util/ninja-ide/ninja-ide-2.3.ebuild
index 32468e2e1be..25ed510722d 100644
--- a/dev-util/ninja-ide/ninja-ide-2.3.ebuild
+++ b/dev-util/ninja-ide/ninja-ide-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# XXX: tests
diff --git a/dev-util/ninja/ninja-1.6.0.ebuild b/dev-util/ninja/ninja-1.6.0.ebuild
index 529cff7e594..bd3e3430592 100644
--- a/dev-util/ninja/ninja-1.6.0.ebuild
+++ b/dev-util/ninja/ninja-1.6.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
diff --git a/dev-util/ninja/ninja-1.7.1.ebuild b/dev-util/ninja/ninja-1.7.1.ebuild
index 91be4dfcc70..9397166c1c2 100644
--- a/dev-util/ninja/ninja-1.7.1.ebuild
+++ b/dev-util/ninja/ninja-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=5
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
index c2fd24561c9..dad01c87ed7 100644
--- a/dev-util/ninja/ninja-1.7.2.ebuild
+++ b/dev-util/ninja/ninja-1.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=6
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 0d4a854441b..b64c0495515 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.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-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
index eed597dbad3..0d960081529 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.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-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
index 5d2031cfc1a..f3d256ec6cd 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.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-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
index 0ba088ad923..4015cff5dca 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.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=6
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
index 93d3e4d7c1e..531968d4941 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.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-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
index 5767c7b332a..ef4a9179a9b 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-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-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
index 17fbe5f6b77..7122efbeae9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-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-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
index e6cce2406f7..a2b6467f6c9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.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=6
diff --git a/dev-util/objconv/objconv-2.32_pre20131127.ebuild b/dev-util/objconv/objconv-2.32_pre20131127.ebuild
index 768dcd53c44..e9288020b18 100644
--- a/dev-util/objconv/objconv-2.32_pre20131127.ebuild
+++ b/dev-util/objconv/objconv-2.32_pre20131127.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-util/objconv/objconv-2.42.ebuild b/dev-util/objconv/objconv-2.42.ebuild
index d9c1ec4835a..f4aa2421d77 100644
--- a/dev-util/objconv/objconv-2.42.ebuild
+++ b/dev-util/objconv/objconv-2.42.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild b/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
index 9d0cb99bbfe..5a275bb4cb2 100644
--- a/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.ebuild
+++ b/dev-util/obs-service-cpanspec/obs-service-cpanspec-20130318.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-util/obs-service-download_files/obs-service-download_files-20130716.ebuild b/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
index 81ca749033b..3ef73e967e0 100644
--- a/dev-util/obs-service-download_files/obs-service-download_files-20130716.ebuild
+++ b/dev-util/obs-service-download_files/obs-service-download_files-20130716.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-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild b/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
index 81ca749033b..3ef73e967e0 100644
--- a/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.ebuild
+++ b/dev-util/obs-service-download_src_package/obs-service-download_src_package-20130318.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-util/obs-service-download_url/obs-service-download_url-20130318.ebuild b/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
index 81ca749033b..3ef73e967e0 100644
--- a/dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
+++ b/dev-util/obs-service-download_url/obs-service-download_url-20130318.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-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild b/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
index 853d4f69e4e..a3976408f7c 100644
--- a/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
+++ b/dev-util/obs-service-extract_file/obs-service-extract_file-20130318.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-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild b/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
index fcaff17616d..96be738c15f 100644
--- a/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.ebuild
+++ b/dev-util/obs-service-format_spec_file/obs-service-format_spec_file-20130618.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-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild b/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
index 96f46d002cd..c5cb32134a8 100644
--- a/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
+++ b/dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.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-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild b/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
index a7a9bc43650..4ae8a446b50 100644
--- a/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.ebuild
+++ b/dev-util/obs-service-git_tarballs/obs-service-git_tarballs-0.1.7.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-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild b/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
index 92b73e2bc1d..a2acafce99b 100644
--- a/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
+++ b/dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.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-util/obs-service-meta/obs-service-meta-1.ebuild b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
index 28caab8f8a9..8ecafcd3040 100644
--- a/dev-util/obs-service-meta/obs-service-meta-1.ebuild
+++ b/dev-util/obs-service-meta/obs-service-meta-1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/obs-service-meta/obs-service-meta-2.ebuild b/dev-util/obs-service-meta/obs-service-meta-2.ebuild
index bc4374a7ac5..baa4befba8c 100644
--- a/dev-util/obs-service-meta/obs-service-meta-2.ebuild
+++ b/dev-util/obs-service-meta/obs-service-meta-2.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-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild b/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
index 0d429922398..e7c8f22f7f8 100644
--- a/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.ebuild
+++ b/dev-util/obs-service-rearchive/obs-service-rearchive-20130802.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-util/obs-service-recompress/obs-service-recompress-0.2.ebuild b/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
index b6e377507e4..31af6a9e891 100644
--- a/dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
+++ b/dev-util/obs-service-recompress/obs-service-recompress-0.2.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-util/obs-service-set_version/obs-service-set_version-0.3.ebuild b/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
index d81c2c863c0..9e7ca4b56d9 100644
--- a/dev-util/obs-service-set_version/obs-service-set_version-0.3.ebuild
+++ b/dev-util/obs-service-set_version/obs-service-set_version-0.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-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild b/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
index a6b258ed79e..8a85f2cb822 100644
--- a/dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
+++ b/dev-util/obs-service-source_validator/obs-service-source_validator-0.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-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild b/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
index 089980b9d24..d3d82662a49 100644
--- a/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
+++ b/dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.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-util/obs-service-update_source/obs-service-update_source-20130802.ebuild b/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
index 1749f92e2e1..0ca3539359e 100644
--- a/dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
+++ b/dev-util/obs-service-update_source/obs-service-update_source-20130802.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-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild b/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
index 8d026087a52..47d7404b6f4 100644
--- a/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
+++ b/dev-util/obs-service-verify_file/obs-service-verify_file-20130403.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-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
index 7af85b32597..46e34cdb6a5 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.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-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
index e364d1fadc7..daa7fd04918 100644
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
index 63b43bc9256..d4cb3e85905 100644
--- a/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.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-util/oprofile/oprofile-0.9.9-r2.ebuild b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
index 24312e1afc6..022bec860ca 100644
--- a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-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 autotools eutils linux-info multilib user java-pkg-opt-2
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
index 5790525f734..0a53eda6145 100644
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-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"
inherit autotools eutils java-pkg-opt-2 linux-info multilib user
diff --git a/dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild b/dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild
index 7ddfcc03950..0c0f35aa14a 100644
--- a/dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild
+++ b/dev-util/oprofile/oprofile-1.2.0_pre20161027.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 autotools java-pkg-opt-2 linux-info user
diff --git a/dev-util/osc/osc-0.148.2.ebuild b/dev-util/osc/osc-0.148.2.ebuild
index 7f3ddc23e50..8213e108fbd 100644
--- a/dev-util/osc/osc-0.148.2.ebuild
+++ b/dev-util/osc/osc-0.148.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-util/osc/osc-0.152.0.ebuild b/dev-util/osc/osc-0.152.0.ebuild
index 7f3ddc23e50..8213e108fbd 100644
--- a/dev-util/osc/osc-0.152.0.ebuild
+++ b/dev-util/osc/osc-0.152.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-util/osc/osc-0.154.0.ebuild b/dev-util/osc/osc-0.154.0.ebuild
index 2cddd1301d5..a45e90722a4 100644
--- a/dev-util/osc/osc-0.154.0.ebuild
+++ b/dev-util/osc/osc-0.154.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-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index e394d17376f..063bcaaf95d 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.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-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
index c00ed284eb4..92c86cecf1a 100644
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ b/dev-util/patchelf/patchelf-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-util/patchelf/patchelf-0.9.ebuild b/dev-util/patchelf/patchelf-0.9.ebuild
index 71ca6a2b829..47264579ddd 100644
--- a/dev-util/patchelf/patchelf-0.9.ebuild
+++ b/dev-util/patchelf/patchelf-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=6
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 9bd77bb5385..7cccfbdbbac 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.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=5
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 6985427c81c..9fd8a638544 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.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=6
diff --git a/dev-util/peg/peg-0.1.13.ebuild b/dev-util/peg/peg-0.1.13.ebuild
index 646390c7c4b..9d17112ee19 100644
--- a/dev-util/peg/peg-0.1.13.ebuild
+++ b/dev-util/peg/peg-0.1.13.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-util/peg/peg-0.1.15-r1.ebuild b/dev-util/peg/peg-0.1.15-r1.ebuild
index 0179513b794..f9bd88d83f9 100644
--- a/dev-util/peg/peg-0.1.15-r1.ebuild
+++ b/dev-util/peg/peg-0.1.15-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-util/peg/peg-0.1.15.ebuild b/dev-util/peg/peg-0.1.15.ebuild
index 34c064feade..69f02c21d1e 100644
--- a/dev-util/peg/peg-0.1.15.ebuild
+++ b/dev-util/peg/peg-0.1.15.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-util/peg/peg-0.1.9.ebuild b/dev-util/peg/peg-0.1.9.ebuild
index f64f511f9aa..6f8f2b50b21 100644
--- a/dev-util/peg/peg-0.1.9.ebuild
+++ b/dev-util/peg/peg-0.1.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-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
index 17af61726e9..7e3b25854f5 100644
--- a/dev-util/perf/perf-3.12.ebuild
+++ b/dev-util/perf/perf-3.12.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-util/perf/perf-3.13.1-r1.ebuild b/dev-util/perf/perf-3.13.1-r1.ebuild
index e11af3b191f..74721ec01d5 100644
--- a/dev-util/perf/perf-3.13.1-r1.ebuild
+++ b/dev-util/perf/perf-3.13.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-util/perf/perf-3.15.5.ebuild b/dev-util/perf/perf-3.15.5.ebuild
index ee4515c3c91..c1a18149065 100644
--- a/dev-util/perf/perf-3.15.5.ebuild
+++ b/dev-util/perf/perf-3.15.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-util/perf/perf-4.1.5-r1.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild
index f502d106da3..9f0b9a9070e 100644
--- a/dev-util/perf/perf-4.1.5-r1.ebuild
+++ b/dev-util/perf/perf-4.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-util/perf/perf-4.4.4.ebuild b/dev-util/perf/perf-4.4.4.ebuild
index 18dd89e94a1..03931c69b0c 100644
--- a/dev-util/perf/perf-4.4.4.ebuild
+++ b/dev-util/perf/perf-4.4.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-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index b516617b259..3f7ee923738 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.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-util/pida/pida-0.6.2-r1.ebuild b/dev-util/pida/pida-0.6.2-r1.ebuild
index b1ed21bdac5..d0e6e3feeb8 100644
--- a/dev-util/pida/pida-0.6.2-r1.ebuild
+++ b/dev-util/pida/pida-0.6.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-util/pkgcheck/pkgcheck-0.5.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
index 280d17e8faa..7f6377c90e1 100644
--- a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index a4ed7362bef..7e1fffdd38a 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
index d6ae412ad15..ee11d235bf9 100644
--- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.11.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-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
index d6ae412ad15..ee11d235bf9 100644
--- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.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-util/pkgconf/pkgconf-1.0.1.ebuild b/dev-util/pkgconf/pkgconf-1.0.1.ebuild
index b8f22c92540..5764b260339 100644
--- a/dev-util/pkgconf/pkgconf-1.0.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.0.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-util/pkgconf/pkgconf-1.0.2.ebuild b/dev-util/pkgconf/pkgconf-1.0.2.ebuild
index 7a996304b97..1c9f2c9d73f 100644
--- a/dev-util/pkgconf/pkgconf-1.0.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.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
diff --git a/dev-util/pkgconf/pkgconf-1.1.0.ebuild b/dev-util/pkgconf/pkgconf-1.1.0.ebuild
index b79fd5fa023..c5974f386d1 100644
--- a/dev-util/pkgconf/pkgconf-1.1.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.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
diff --git a/dev-util/pkgconf/pkgconf-1.2.2.ebuild b/dev-util/pkgconf/pkgconf-1.2.2.ebuild
index b79fd5fa023..c5974f386d1 100644
--- a/dev-util/pkgconf/pkgconf-1.2.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.2.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
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index b79fd5fa023..c5974f386d1 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.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-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
index df7679ccfaf..ff2fbadd47b 100644
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-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-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
index 3a6f2ceacaf..e47abefe303 100644
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-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-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index 3a1501cafcb..fa88e9d4844 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-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-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index d7fc8d85f22..d0e46a835ce 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-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-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 42c8fd16d60..9d40e8bcf4d 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.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-util/pkgconfig/pkgconfig-0.29.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.ebuild
index d1b58da3bac..7c8437f5e9a 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.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-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 67353528d85..e7d7b4fd983 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.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-util/plan9port/plan9port-20140306-r3.ebuild b/dev-util/plan9port/plan9port-20140306-r3.ebuild
index 50a2ce47d7c..7941d8ace30 100644
--- a/dev-util/plan9port/plan9port-20140306-r3.ebuild
+++ b/dev-util/plan9port/plan9port-20140306-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-util/ply/ply-0_pre20160313.ebuild b/dev-util/ply/ply-0_pre20160313.ebuild
index 5a9e47c534f..46367c55cfc 100644
--- a/dev-util/ply/ply-0_pre20160313.ebuild
+++ b/dev-util/ply/ply-0_pre20160313.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-util/pmd/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
index 53712ef7ac4..2974d1385e4 100644
--- a/dev-util/pmd/pmd-4.2.5.ebuild
+++ b/dev-util/pmd/pmd-4.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="doc source test"
diff --git a/dev-util/premake/premake-3.7.ebuild b/dev-util/premake/premake-3.7.ebuild
index 3fa26bbfadb..91026f3efad 100644
--- a/dev-util/premake/premake-3.7.ebuild
+++ b/dev-util/premake/premake-3.7.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-util/premake/premake-4.3-r1.ebuild b/dev-util/premake/premake-4.3-r1.ebuild
index 9d37258756c..7aba60fc21e 100644
--- a/dev-util/premake/premake-4.3-r1.ebuild
+++ b/dev-util/premake/premake-4.3-r1.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-util/pretrace/pretrace-0.4.ebuild b/dev-util/pretrace/pretrace-0.4.ebuild
index bfda4821ff9..00fe92568f8 100644
--- a/dev-util/pretrace/pretrace-0.4.ebuild
+++ b/dev-util/pretrace/pretrace-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils multilib
diff --git a/dev-util/promu/promu-0.1.0_p20161031.ebuild b/dev-util/promu/promu-0.1.0_p20161031.ebuild
index 39628ec3af7..054a46da0f4 100644
--- a/dev-util/promu/promu-0.1.0_p20161031.ebuild
+++ b/dev-util/promu/promu-0.1.0_p20161031.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 golang-build golang-vcs-snapshot
diff --git a/dev-util/promu/promu-0.1.0_p20170130.ebuild b/dev-util/promu/promu-0.1.0_p20170130.ebuild
index 3498fca47c7..aa65b9a54de 100644
--- a/dev-util/promu/promu-0.1.0_p20170130.ebuild
+++ b/dev-util/promu/promu-0.1.0_p20170130.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit golang-build golang-vcs-snapshot
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index e275b7f89fc..77fec34a5bd 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild b/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild
index cb0964f7dd9..2b1fc89caea 100644
--- a/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2016.3.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=6
diff --git a/dev-util/pycharm-professional/pycharm-professional-2016.2.3-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2016.2.3-r1.ebuild
index 81907f26e39..e7a6891d126 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2016.2.3-r1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2016.2.3-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
diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild
index e5c00884214..48554c80581 100644
--- a/dev-util/qbs/qbs-1.4.5.ebuild
+++ b/dev-util/qbs/qbs-1.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=6
diff --git a/dev-util/qbs/qbs-1.5.2.ebuild b/dev-util/qbs/qbs-1.5.2.ebuild
index 930b211f112..5f4b6e25c99 100644
--- a/dev-util/qbs/qbs-1.5.2.ebuild
+++ b/dev-util/qbs/qbs-1.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=6
diff --git a/dev-util/qbs/qbs-1.6.1.ebuild b/dev-util/qbs/qbs-1.6.1.ebuild
index 930b211f112..5f4b6e25c99 100644
--- a/dev-util/qbs/qbs-1.6.1.ebuild
+++ b/dev-util/qbs/qbs-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=6
diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
index 930b211f112..5f4b6e25c99 100644
--- a/dev-util/qbs/qbs-1.7.0.ebuild
+++ b/dev-util/qbs/qbs-1.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-util/qfsm/qfsm-0.54.0.ebuild b/dev-util/qfsm/qfsm-0.54.0.ebuild
index de83220dad2..a0901a6be50 100644
--- a/dev-util/qfsm/qfsm-0.54.0.ebuild
+++ b/dev-util/qfsm/qfsm-0.54.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-util/qmtest/qmtest-2.4.1-r1.ebuild b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
index 5c2930b2a38..e0108e74a84 100644
--- a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
+++ b/dev-util/qmtest/qmtest-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=5
diff --git a/dev-util/qstlink2/qstlink2-1.0.3.ebuild b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
index 78707c9dd8f..addd107df2f 100644
--- a/dev-util/qstlink2/qstlink2-1.0.3.ebuild
+++ b/dev-util/qstlink2/qstlink2-1.0.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-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
index d8d0ee71827..bdd72d31598 100644
--- a/dev-util/quilt/quilt-0.50.ebuild
+++ b/dev-util/quilt/quilt-0.50.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit bash-completion-r1 eutils
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
index c21b11099d8..ea76c38419c 100644
--- a/dev-util/quilt/quilt-0.63.ebuild
+++ b/dev-util/quilt/quilt-0.63.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-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 7990a886d54..4a4042e9a2f 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.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-util/radare2/radare2-0.10.6.ebuild b/dev-util/radare2/radare2-0.10.6.ebuild
index 9fd06adebfc..17b40b0741f 100644
--- a/dev-util/radare2/radare2-0.10.6.ebuild
+++ b/dev-util/radare2/radare2-0.10.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
inherit eutils
diff --git a/dev-util/radare2/radare2-1.0.2.ebuild b/dev-util/radare2/radare2-1.0.2.ebuild
index 9fd06adebfc..17b40b0741f 100644
--- a/dev-util/radare2/radare2-1.0.2.ebuild
+++ b/dev-util/radare2/radare2-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
inherit eutils
diff --git a/dev-util/radare2/radare2-1.1.0.ebuild b/dev-util/radare2/radare2-1.1.0.ebuild
index a7480ac46e8..93ff4e14e4e 100644
--- a/dev-util/radare2/radare2-1.1.0.ebuild
+++ b/dev-util/radare2/radare2-1.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=5
inherit eutils
diff --git a/dev-util/radare2/radare2-1.2.0.ebuild b/dev-util/radare2/radare2-1.2.0.ebuild
index 7b5edbe8b2c..fa1392fa116 100644
--- a/dev-util/radare2/radare2-1.2.0.ebuild
+++ b/dev-util/radare2/radare2-1.2.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-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 673932b9ce3..cda7b0773b9 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.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-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index 1ca0a9eff99..a1780800f7f 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-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=4
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index 7b12d524129..b84d1800255 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.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-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index 2f153c15a80..250f214fbee 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.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-util/ragel/ragel-7.0.0.9.ebuild b/dev-util/ragel/ragel-7.0.0.9.ebuild
index c1a5c5439f6..fdeef9c2737 100644
--- a/dev-util/ragel/ragel-7.0.0.9.ebuild
+++ b/dev-util/ragel/ragel-7.0.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=6
diff --git a/dev-util/rats/rats-2.1-r2.ebuild b/dev-util/rats/rats-2.1-r2.ebuild
index 492229ddc7c..161aeea514e 100644
--- a/dev-util/rats/rats-2.1-r2.ebuild
+++ b/dev-util/rats/rats-2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
inherit eutils
diff --git a/dev-util/rats/rats-2.3.ebuild b/dev-util/rats/rats-2.3.ebuild
index a8b2c1fd6d2..8ac08e699ee 100644
--- a/dev-util/rats/rats-2.3.ebuild
+++ b/dev-util/rats/rats-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=3
inherit eutils
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild
index e536a6cfee8..1c49b7c4df4 100644
--- a/dev-util/rats/rats-2.4.ebuild
+++ b/dev-util/rats/rats-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=3
inherit eutils
diff --git a/dev-util/rbtools/rbtools-0.7.6.ebuild b/dev-util/rbtools/rbtools-0.7.6.ebuild
index aeffa4bf6a6..2540be626d1 100644
--- a/dev-util/rbtools/rbtools-0.7.6.ebuild
+++ b/dev-util/rbtools/rbtools-0.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=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/rbtools/rbtools-0.7.8.ebuild b/dev-util/rbtools/rbtools-0.7.8.ebuild
index e93de73912e..35ccbd937dd 100644
--- a/dev-util/rbtools/rbtools-0.7.8.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/rbtools/rbtools-0.7.9.ebuild b/dev-util/rbtools/rbtools-0.7.9.ebuild
index e93de73912e..35ccbd937dd 100644
--- a/dev-util/rbtools/rbtools-0.7.9.ebuild
+++ b/dev-util/rbtools/rbtools-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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/re2c/re2c-0.13.5-r1.ebuild b/dev-util/re2c/re2c-0.13.5-r1.ebuild
index 0be8c7ca048..d04be68e9eb 100644
--- a/dev-util/re2c/re2c-0.13.5-r1.ebuild
+++ b/dev-util/re2c/re2c-0.13.5-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-util/re2c/re2c-0.13.6.ebuild b/dev-util/re2c/re2c-0.13.6.ebuild
index 7143c25ead7..f7f5d822888 100644
--- a/dev-util/re2c/re2c-0.13.6.ebuild
+++ b/dev-util/re2c/re2c-0.13.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-util/re2c/re2c-0.13.7.5.ebuild b/dev-util/re2c/re2c-0.13.7.5.ebuild
index e2a4a7455d3..464d202d147 100644
--- a/dev-util/re2c/re2c-0.13.7.5.ebuild
+++ b/dev-util/re2c/re2c-0.13.7.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-util/re2c/re2c-0.14.2.ebuild b/dev-util/re2c/re2c-0.14.2.ebuild
index 02d5ba97c2c..07586b7630b 100644
--- a/dev-util/re2c/re2c-0.14.2.ebuild
+++ b/dev-util/re2c/re2c-0.14.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-util/re2c/re2c-0.14.3.ebuild b/dev-util/re2c/re2c-0.14.3.ebuild
index 157b0dc75cc..29d4a3d15a9 100644
--- a/dev-util/re2c/re2c-0.14.3.ebuild
+++ b/dev-util/re2c/re2c-0.14.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-util/re2c/re2c-0.15.2.ebuild b/dev-util/re2c/re2c-0.15.2.ebuild
index 91b774e208c..77ec6097fe7 100644
--- a/dev-util/re2c/re2c-0.15.2.ebuild
+++ b/dev-util/re2c/re2c-0.15.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-util/re2c/re2c-0.15.3.ebuild b/dev-util/re2c/re2c-0.15.3.ebuild
index 91b774e208c..77ec6097fe7 100644
--- a/dev-util/re2c/re2c-0.15.3.ebuild
+++ b/dev-util/re2c/re2c-0.15.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-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild
index acd8ca8c17c..958239c7622 100644
--- a/dev-util/re2c/re2c-0.16.ebuild
+++ b/dev-util/re2c/re2c-0.16.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-util/rebar/rebar-2.6.1.ebuild b/dev-util/rebar/rebar-2.6.1.ebuild
index bb802c09fd4..3ca90ef6ba8 100644
--- a/dev-util/rebar/rebar-2.6.1.ebuild
+++ b/dev-util/rebar/rebar-2.6.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-util/rebar/rebar-2.6.2.ebuild b/dev-util/rebar/rebar-2.6.2.ebuild
index 96d706c7398..3f512e87afd 100644
--- a/dev-util/rebar/rebar-2.6.2.ebuild
+++ b/dev-util/rebar/rebar-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-util/rebar/rebar-2.6.3.ebuild b/dev-util/rebar/rebar-2.6.3.ebuild
index bc8437bccf4..6e91c65845b 100644
--- a/dev-util/rebar/rebar-2.6.3.ebuild
+++ b/dev-util/rebar/rebar-2.6.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-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index bc8437bccf4..6e91c65845b 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.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-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
index 704155ca4e0..2e3e14fec72 100644
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG=no
diff --git a/dev-util/rej/rej-0.16.ebuild b/dev-util/rej/rej-0.16.ebuild
index 9900e5cfb3a..82d14beb6e2 100644
--- a/dev-util/rej/rej-0.16.ebuild
+++ b/dev-util/rej/rej-0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A utility for solving diff/patch rejects"
HOMEPAGE="http://ftp.suse.com/pub/people/mason/rej/"
diff --git a/dev-util/reswrap/reswrap-3.2.0.ebuild b/dev-util/reswrap/reswrap-3.2.0.ebuild
index a87c8b2bf98..1364323f908 100644
--- a/dev-util/reswrap/reswrap-3.2.0.ebuild
+++ b/dev-util/reswrap/reswrap-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
FOX_COMPONENT="utils"
FOX_PV="1.4.12"
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
index 5d46475007c..538220c273d 100644
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ b/dev-util/reswrap/reswrap-4.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
FOX_COMPONENT="utils"
FOX_PV="1.6.40"
diff --git a/dev-util/rosdep/rosdep-0.11.5.ebuild b/dev-util/rosdep/rosdep-0.11.5.ebuild
index d9dcb386872..463cc83cafb 100644
--- a/dev-util/rosdep/rosdep-0.11.5.ebuild
+++ b/dev-util/rosdep/rosdep-0.11.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
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index d9dcb386872..463cc83cafb 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index a8606a6650d..42178438216 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index a8606a6650d..42178438216 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
index 16ee65e6b41..36abfaddc7f 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
index 5f2d9b5e22b..d0f79b54db5 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.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=5
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index 46c883aa883..25e5e2395ac 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 46c883aa883..25e5e2395ac 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild
index e132c996927..4ae624edfd7 100644
--- a/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-8.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild
index c7c761061db..f9b678d0483 100644
--- a/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-8.3.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-util/rpmdevtools/rpmdevtools-8.5.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.5.ebuild
index c570e9e7f48..4fe6f89fdf5 100644
--- a/dev-util/rpmdevtools/rpmdevtools-8.5.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-8.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-util/rr/rr-4.5.0.ebuild b/dev-util/rr/rr-4.5.0.ebuild
index 7ce3d96f009..4c58f36c34f 100644
--- a/dev-util/rr/rr-4.5.0.ebuild
+++ b/dev-util/rr/rr-4.5.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-util/rustfmt/rustfmt-0.5.0.ebuild b/dev-util/rustfmt/rustfmt-0.5.0.ebuild
index a84908e85e1..9c3a89dc0ac 100644
--- a/dev-util/rustfmt/rustfmt-0.5.0.ebuild
+++ b/dev-util/rustfmt/rustfmt-0.5.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-util/sasm/sasm-2.2.ebuild b/dev-util/sasm/sasm-2.2.ebuild
index 84d291de9ea..023b24aab05 100644
--- a/dev-util/sasm/sasm-2.2.ebuild
+++ b/dev-util/sasm/sasm-2.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-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
index 84d291de9ea..023b24aab05 100644
--- a/dev-util/sasm/sasm-9999.ebuild
+++ b/dev-util/sasm/sasm-9999.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-util/scala-ide/scala-ide-4.1.0.ebuild b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
index e5cbe8d3bae..9563ac9cecd 100644
--- a/dev-util/scala-ide/scala-ide-4.1.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.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
inherit java-pkg-opt-2
diff --git a/dev-util/scala-ide/scala-ide-4.3.0.ebuild b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
index d42e6d0d566..4fe500b2db6 100644
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.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
inherit java-pkg-opt-2
diff --git a/dev-util/scanmem/scanmem-0.15.2.ebuild b/dev-util/scanmem/scanmem-0.15.2.ebuild
index 21567313195..c582a034fca 100644
--- a/dev-util/scanmem/scanmem-0.15.2.ebuild
+++ b/dev-util/scanmem/scanmem-0.15.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/scanmem/scanmem-0.15.3.ebuild b/dev-util/scanmem/scanmem-0.15.3.ebuild
index 1ddc4936ea0..036313e7dd5 100644
--- a/dev-util/scanmem/scanmem-0.15.3.ebuild
+++ b/dev-util/scanmem/scanmem-0.15.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
index 086a43745ff..003cb75a064 100644
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-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-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 66dd8472505..280d789e520 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-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-util/scons/scons-2.3.5.ebuild b/dev-util/scons/scons-2.3.5.ebuild
index b31b56fdb64..2c581c3b0cb 100644
--- a/dev-util/scons/scons-2.3.5.ebuild
+++ b/dev-util/scons/scons-2.3.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
PYTHON_COMPAT=( python2_7 pypy )
diff --git a/dev-util/scons/scons-2.4.1.ebuild b/dev-util/scons/scons-2.4.1.ebuild
index 16e929f136c..66593a37e8a 100644
--- a/dev-util/scons/scons-2.4.1.ebuild
+++ b/dev-util/scons/scons-2.4.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
PYTHON_COMPAT=( python2_7 pypy )
diff --git a/dev-util/scons/scons-2.5.0.ebuild b/dev-util/scons/scons-2.5.0.ebuild
index 2608af092e1..1229463da8c 100644
--- a/dev-util/scons/scons-2.5.0.ebuild
+++ b/dev-util/scons/scons-2.5.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
PYTHON_COMPAT=( python2_7 pypy )
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 2608af092e1..1229463da8c 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.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=6
PYTHON_COMPAT=( python2_7 pypy )
diff --git a/dev-util/sel/sel-0.08.4-r1.ebuild b/dev-util/sel/sel-0.08.4-r1.ebuild
index 81da6fc2c26..2faa3e43c54 100644
--- a/dev-util/sel/sel-0.08.4-r1.ebuild
+++ b/dev-util/sel/sel-0.08.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/dev-util/sel/sel-0.08.4.ebuild b/dev-util/sel/sel-0.08.4.ebuild
index 41dd5287616..e0e7ce2b3de 100644
--- a/dev-util/sel/sel-0.08.4.ebuild
+++ b/dev-util/sel/sel-0.08.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/dev-util/serialtalk/serialtalk-1.2.ebuild b/dev-util/serialtalk/serialtalk-1.2.ebuild
index df713f0530d..59c9ad0a3ef 100644
--- a/dev-util/serialtalk/serialtalk-1.2.ebuild
+++ b/dev-util/serialtalk/serialtalk-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-util/serialtalk/serialtalk-9999.ebuild b/dev-util/serialtalk/serialtalk-9999.ebuild
index df713f0530d..59c9ad0a3ef 100644
--- a/dev-util/serialtalk/serialtalk-9999.ebuild
+++ b/dev-util/serialtalk/serialtalk-9999.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-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
index 4f0d4727097..94a64a1fb57 100644
--- a/dev-util/setconf/setconf-0.6.6.ebuild
+++ b/dev-util/setconf/setconf-0.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
index 25e4712455e..bd589375e9c 100644
--- a/dev-util/setconf/setconf-0.6.7.ebuild
+++ b/dev-util/setconf/setconf-0.6.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/sgb/sgb-20030623.ebuild b/dev-util/sgb/sgb-20030623.ebuild
index a3bef58406f..c38c0897475 100644
--- a/dev-util/sgb/sgb-20030623.ebuild
+++ b/dev-util/sgb/sgb-20030623.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils multilib
diff --git a/dev-util/shards/shards-0.6.1.ebuild b/dev-util/shards/shards-0.6.1.ebuild
index 95311f68cb7..313c82834ab 100644
--- a/dev-util/shards/shards-0.6.1.ebuild
+++ b/dev-util/shards/shards-0.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=6
diff --git a/dev-util/shards/shards-0.6.2.ebuild b/dev-util/shards/shards-0.6.2.ebuild
index c892d771300..6a29317bdb1 100644
--- a/dev-util/shards/shards-0.6.2.ebuild
+++ b/dev-util/shards/shards-0.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=6
diff --git a/dev-util/shards/shards-0.6.3.ebuild b/dev-util/shards/shards-0.6.3.ebuild
index c892d771300..6a29317bdb1 100644
--- a/dev-util/shards/shards-0.6.3.ebuild
+++ b/dev-util/shards/shards-0.6.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-util/shards/shards-0.6.4.ebuild b/dev-util/shards/shards-0.6.4.ebuild
index c892d771300..6a29317bdb1 100644
--- a/dev-util/shards/shards-0.6.4.ebuild
+++ b/dev-util/shards/shards-0.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=6
diff --git a/dev-util/shards/shards-0.7.1.ebuild b/dev-util/shards/shards-0.7.1.ebuild
index 826681b8ad5..38b42f417a5 100644
--- a/dev-util/shards/shards-0.7.1.ebuild
+++ b/dev-util/shards/shards-0.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-util/shc/shc-3.8.9.ebuild b/dev-util/shc/shc-3.8.9.ebuild
index 6b911aa3f4c..78178e4f1ae 100644
--- a/dev-util/shc/shc-3.8.9.ebuild
+++ b/dev-util/shc/shc-3.8.9.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-util/shellcheck/shellcheck-0.4.4.ebuild b/dev-util/shellcheck/shellcheck-0.4.4.ebuild
index f30ea704a53..22146ef9d1c 100644
--- a/dev-util/shellcheck/shellcheck-0.4.4.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.4.4.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-util/shellcheck/shellcheck-0.4.5.ebuild b/dev-util/shellcheck/shellcheck-0.4.5.ebuild
index e254a4514c0..19f437b98c8 100644
--- a/dev-util/shellcheck/shellcheck-0.4.5.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.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=6
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
index 8df679d4e66..d4035c20b50 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.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-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
index 4d9b5378589..217aa1e52dd 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.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-util/shelltestrunner/shelltestrunner-1.3.5.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
index 07e5b02740d..e570b6f65de 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.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-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
index e59fe48c496..a1bba5a8346 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.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-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
index a0e7a5dc2e1..6fc14e68ba4 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.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=6
diff --git a/dev-util/shunit2/shunit2-2.1.6-r1.ebuild b/dev-util/shunit2/shunit2-2.1.6-r1.ebuild
index 3bcda1db293..dd75e0e1c24 100644
--- a/dev-util/shunit2/shunit2-2.1.6-r1.ebuild
+++ b/dev-util/shunit2/shunit2-2.1.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="6"
diff --git a/dev-util/skipfish/skipfish-2.10_beta.ebuild b/dev-util/skipfish/skipfish-2.10_beta.ebuild
index 33a3521e3cf..81bb804912a 100644
--- a/dev-util/skipfish/skipfish-2.10_beta.ebuild
+++ b/dev-util/skipfish/skipfish-2.10_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
inherit toolchain-funcs vcs-snapshot versionator
diff --git a/dev-util/smem/smem-20071119_p1.ebuild b/dev-util/smem/smem-20071119_p1.ebuild
index 514016d25bc..8aebbaeaf09 100644
--- a/dev-util/smem/smem-20071119_p1.ebuild
+++ b/dev-util/smem/smem-20071119_p1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A tool to parse smaps statistics"
HOMEPAGE="http://bmaurer.blogspot.de/2006/03/memory-usage-with-smaps.html"
diff --git a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild b/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
index 99172ccbc78..11686c55373 100644
--- a/dev-util/source-highlight/source-highlight-3.1.7-r2.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.7-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"
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 99bb2f47a67..26e96bfbcc6 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.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=6
diff --git a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild b/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild
index 00dca1d9765..61a6579ab75 100644
--- a/dev-util/spec-cleaner/spec-cleaner-0.8.9.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-0.8.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-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 00dca1d9765..61a6579ab75 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.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-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
index abe3bdd6db0..6ca82e6056a 100644
--- a/dev-util/splint/splint-3.1.2-r1.ebuild
+++ b/dev-util/splint/splint-3.1.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
inherit autotools
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index a9b6345ab97..1549f142bdb 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.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
inherit autotools eutils
diff --git a/dev-util/squashdelta/squashdelta-0.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.ebuild
index 93cd33b1bd3..180041a23e5 100644
--- a/dev-util/squashdelta/squashdelta-0.1.ebuild
+++ b/dev-util/squashdelta/squashdelta-0.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-util/squashdelta/squashdelta-9999.ebuild b/dev-util/squashdelta/squashdelta-9999.ebuild
index cff993df4e7..604593938f0 100644
--- a/dev-util/squashdelta/squashdelta-9999.ebuild
+++ b/dev-util/squashdelta/squashdelta-9999.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-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
index cafb308e5c6..3a58b27ca43 100644
--- a/dev-util/squashmerge/squashmerge-0.1.ebuild
+++ b/dev-util/squashmerge/squashmerge-0.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-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
index c886eb5768c..aab7b0ee6be 100644
--- a/dev-util/squashmerge/squashmerge-9999.ebuild
+++ b/dev-util/squashmerge/squashmerge-9999.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-util/staruml-bin/staruml-bin-2.8.0.ebuild b/dev-util/staruml-bin/staruml-bin-2.8.0.ebuild
index cca6bdf1d55..02cc5c0be46 100644
--- a/dev-util/staruml-bin/staruml-bin-2.8.0.ebuild
+++ b/dev-util/staruml-bin/staruml-bin-2.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=6
diff --git a/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild b/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
index a253f9c7b25..d8a17384024 100644
--- a/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
+++ b/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This is the 1.0.7 release:
# https://code.google.com/p/stressapptest/source/detail?r=44
diff --git a/dev-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
index 011fb0ee677..d830848e790 100644
--- a/dev-util/stubgen/stubgen-2.08.ebuild
+++ b/dev-util/stubgen/stubgen-2.08.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/dev-util/suse-build/suse-build-2014.09.18.ebuild b/dev-util/suse-build/suse-build-2014.09.18.ebuild
index e7b4c90ed9f..2004765f0bf 100644
--- a/dev-util/suse-build/suse-build-2014.09.18.ebuild
+++ b/dev-util/suse-build/suse-build-2014.09.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
diff --git a/dev-util/suse-build/suse-build-2015.11.05.ebuild b/dev-util/suse-build/suse-build-2015.11.05.ebuild
index 2e11350682f..ec79073f6d9 100644
--- a/dev-util/suse-build/suse-build-2015.11.05.ebuild
+++ b/dev-util/suse-build/suse-build-2015.11.05.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-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index 2e11350682f..ec79073f6d9 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.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-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
index bb62c2cda59..ebf368135bb 100644
--- a/dev-util/synopsis/synopsis-0.13.ebuild
+++ b/dev-util/synopsis/synopsis-0.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-util/sysdig/sysdig-0.12.1.ebuild b/dev-util/sysdig/sysdig-0.12.1.ebuild
index 5fec6bf3492..338c09f7d60 100644
--- a/dev-util/sysdig/sysdig-0.12.1.ebuild
+++ b/dev-util/sysdig/sysdig-0.12.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-util/sysdig/sysdig-0.13.0.ebuild b/dev-util/sysdig/sysdig-0.13.0.ebuild
index 5fec6bf3492..338c09f7d60 100644
--- a/dev-util/sysdig/sysdig-0.13.0.ebuild
+++ b/dev-util/sysdig/sysdig-0.13.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-util/sysdig/sysdig-0.14.0.ebuild b/dev-util/sysdig/sysdig-0.14.0.ebuild
index 5fec6bf3492..338c09f7d60 100644
--- a/dev-util/sysdig/sysdig-0.14.0.ebuild
+++ b/dev-util/sysdig/sysdig-0.14.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-util/sysprof/sysprof-1.2.0.ebuild b/dev-util/sysprof/sysprof-1.2.0.ebuild
index 35162926bcf..3e631342464 100644
--- a/dev-util/sysprof/sysprof-1.2.0.ebuild
+++ b/dev-util/sysprof/sysprof-1.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="4"
diff --git a/dev-util/sysprof/sysprof-3.22.2.ebuild b/dev-util/sysprof/sysprof-3.22.2.ebuild
index 1cf63bb968d..2559293fb09 100644
--- a/dev-util/sysprof/sysprof-3.22.2.ebuild
+++ b/dev-util/sysprof/sysprof-3.22.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-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
index 52ce740ddf7..e1f823c3cbd 100644
--- a/dev-util/systemtap/systemtap-2.4-r1.ebuild
+++ b/dev-util/systemtap/systemtap-2.4-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-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
index c4e9a361a6e..2691f98d6ed 100644
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ b/dev-util/systemtap/systemtap-2.9.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-util/systemtap/systemtap-3.1.ebuild b/dev-util/systemtap/systemtap-3.1.ebuild
index 21c32f92945..94540f06502 100644
--- a/dev-util/systemtap/systemtap-3.1.ebuild
+++ b/dev-util/systemtap/systemtap-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-util/tailor/tailor-0.9.35-r1.ebuild b/dev-util/tailor/tailor-0.9.35-r1.ebuild
index 015cbb75782..baf62a2442b 100644
--- a/dev-util/tailor/tailor-0.9.35-r1.ebuild
+++ b/dev-util/tailor/tailor-0.9.35-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-util/ticpp/ticpp-0_p20120423.ebuild b/dev-util/ticpp/ticpp-0_p20120423.ebuild
index b1749956a03..bb4f925a7ac 100644
--- a/dev-util/ticpp/ticpp-0_p20120423.ebuild
+++ b/dev-util/ticpp/ticpp-0_p20120423.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-util/ticpp/ticpp-9999.ebuild b/dev-util/ticpp/ticpp-9999.ebuild
index 358a188d264..4b63f1ecff2 100644
--- a/dev-util/ticpp/ticpp-9999.ebuild
+++ b/dev-util/ticpp/ticpp-9999.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-util/tinlink/tinlink-1.0.0.ebuild b/dev-util/tinlink/tinlink-1.0.0.ebuild
index 020ea0575c7..42806808b6e 100644
--- a/dev-util/tinlink/tinlink-1.0.0.ebuild
+++ b/dev-util/tinlink/tinlink-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/dev-util/tkdiff/tkdiff-4.2.ebuild b/dev-util/tkdiff/tkdiff-4.2.ebuild
index a7aeb5834d9..cc4994205d4 100644
--- a/dev-util/tkdiff/tkdiff-4.2.ebuild
+++ b/dev-util/tkdiff/tkdiff-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=6
diff --git a/dev-util/tmake/tmake-2.12.ebuild b/dev-util/tmake/tmake-2.12.ebuild
index ea928efec1e..751d77e7700 100644
--- a/dev-util/tmake/tmake-2.12.ebuild
+++ b/dev-util/tmake/tmake-2.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
index 5bb6a80bba4..e7790e344ab 100644
--- a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.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
PYTHON_COMPAT=(python2_7)
diff --git a/dev-util/trace-cmd/trace-cmd-2.6.ebuild b/dev-util/trace-cmd/trace-cmd-2.6.ebuild
index 93f769ad1ae..a93b9ac2a09 100644
--- a/dev-util/trace-cmd/trace-cmd-2.6.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-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=6
PYTHON_COMPAT=(python2_7)
diff --git a/dev-util/treecc/treecc-0.3.10.ebuild b/dev-util/treecc/treecc-0.3.10.ebuild
index adf5a3bf534..126876138c1 100644
--- a/dev-util/treecc/treecc-0.3.10.ebuild
+++ b/dev-util/treecc/treecc-0.3.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="compiler-compiler tool for aspect-oriented programming"
HOMEPAGE="https://www.gnu.org/software/dotgnu"
diff --git a/dev-util/trinity/trinity-1.5.ebuild b/dev-util/trinity/trinity-1.5.ebuild
index baab1988db2..2bde7475f29 100644
--- a/dev-util/trinity/trinity-1.5.ebuild
+++ b/dev-util/trinity/trinity-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
diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.6.ebuild
index 86d54f41a64..3e03a8edb64 100644
--- a/dev-util/trinity/trinity-1.6.ebuild
+++ b/dev-util/trinity/trinity-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-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
index 9eb8f227433..2e263c788ce 100644
--- a/dev-util/trinity/trinity-9999.ebuild
+++ b/dev-util/trinity/trinity-9999.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-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
index a1d1896d696..4eba479be66 100644
--- a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
+++ b/dev-util/txt2regex/txt2regex-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-util/umockdev/umockdev-0.8.11.ebuild b/dev-util/umockdev/umockdev-0.8.11.ebuild
index c9789b21cd0..13f33629b5a 100644
--- a/dev-util/umockdev/umockdev-0.8.11.ebuild
+++ b/dev-util/umockdev/umockdev-0.8.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/dev-util/uncrustify/uncrustify-0.59.ebuild b/dev-util/uncrustify/uncrustify-0.59.ebuild
index 6f874035c45..38fc0c4aa6b 100644
--- a/dev-util/uncrustify/uncrustify-0.59.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.59.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/dev-util/uncrustify/uncrustify-0.64.ebuild b/dev-util/uncrustify/uncrustify-0.64.ebuild
index 85c17ea949d..aff1f3ec884 100644
--- a/dev-util/uncrustify/uncrustify-0.64.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.64.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-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index 85c17ea949d..aff1f3ec884 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.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-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 5d3b0e50eb9..784d2244c3b 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index aeda647752a..f28f46c74f5 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-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
inherit toolchain-funcs
diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild
index 165e24a6912..c069af0d8a7 100644
--- a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild
+++ b/dev-util/universalindentgui/universalindentgui-1.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
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/usb-robot/usb-robot-0.2.0.ebuild b/dev-util/usb-robot/usb-robot-0.2.0.ebuild
index 9fd3a060efa..81f343715d5 100644
--- a/dev-util/usb-robot/usb-robot-0.2.0.ebuild
+++ b/dev-util/usb-robot/usb-robot-0.2.0.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-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index b36dfc6a5fe..37b51b87fa2 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.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"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
diff --git a/dev-util/valgrind/valgrind-3.11.0.ebuild b/dev-util/valgrind/valgrind-3.11.0.ebuild
index b91a2a23d42..064f668d01b 100644
--- a/dev-util/valgrind/valgrind-3.11.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.11.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"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild b/dev-util/valgrind/valgrind-3.12.0.ebuild
index c88c83cffa9..6afaad873e0 100644
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.12.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"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
diff --git a/dev-util/valkyrie/valkyrie-2.0.0.ebuild b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
index a6d6206cab5..23baa922541 100644
--- a/dev-util/valkyrie/valkyrie-2.0.0.ebuild
+++ b/dev-util/valkyrie/valkyrie-2.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=3
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
index 9d413cfc8c3..79ca83807f9 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta4-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-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
index 23ce8ed0bc8..0f0138431e9 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.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=6
diff --git a/dev-util/vint/vint-0.3.11.ebuild b/dev-util/vint/vint-0.3.11.ebuild
index 3f2da3fab58..c72fbde4744 100644
--- a/dev-util/vint/vint-0.3.11.ebuild
+++ b/dev-util/vint/vint-0.3.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
diff --git a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
index 7cf84e8bbd0..6de44bc09c0 100644
--- a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.0-r1.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-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
index acf995d6f0e..3920d2a42ab 100644
--- a/dev-util/visual-regexp/visual-regexp-3.1.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.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-util/visualvm/visualvm-1.3.8-r1.ebuild b/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
index c3175a3a6e9..95b49586df6 100644
--- a/dev-util/visualvm/visualvm-1.3.8-r1.ebuild
+++ b/dev-util/visualvm/visualvm-1.3.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-util/vmtouch/vmtouch-1.0.2.ebuild b/dev-util/vmtouch/vmtouch-1.0.2.ebuild
index fe580a1ce2b..9678761838e 100644
--- a/dev-util/vmtouch/vmtouch-1.0.2.ebuild
+++ b/dev-util/vmtouch/vmtouch-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-util/vmtouch/vmtouch-1.2.0.ebuild b/dev-util/vmtouch/vmtouch-1.2.0.ebuild
index fdf230f6bac..e043a354abd 100644
--- a/dev-util/vmtouch/vmtouch-1.2.0.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.2.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-util/vtable-dumper/vtable-dumper-1.2.ebuild b/dev-util/vtable-dumper/vtable-dumper-1.2.ebuild
index 2e09266525e..420b8915e24 100644
--- a/dev-util/vtable-dumper/vtable-dumper-1.2.ebuild
+++ b/dev-util/vtable-dumper/vtable-dumper-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-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
index a2e2340206a..c04ebdcfad7 100644
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ b/dev-util/w32api/w32api-3.17.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export CBUILD=${CBUILD:-${CHOST}}
export CTARGET=${CTARGET:-${CHOST}}
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
index 00ec0adbd64..0d8deb3895a 100644
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ b/dev-util/w32api/w32api-4.0.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="4"
diff --git a/dev-util/watchr/watchr-0.7.ebuild b/dev-util/watchr/watchr-0.7.ebuild
index 7d17ba4810f..608285211cd 100644
--- a/dev-util/watchr/watchr-0.7.ebuild
+++ b/dev-util/watchr/watchr-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
USE_RUBY="ruby20 ruby21"
diff --git a/dev-util/weblint/weblint-1.020.ebuild b/dev-util/weblint/weblint-1.020.ebuild
index 2118af3f963..ae5c54c0448 100644
--- a/dev-util/weblint/weblint-1.020.ebuild
+++ b/dev-util/weblint/weblint-1.020.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="syntax and minimal style checker for HTML by Neil Bowers"
SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
index 338dbea7b82..882087ccd78 100644
--- a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
+++ b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils versionator
diff --git a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild b/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
index ec29cdb7b28..c01948942f7 100644
--- a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
+++ b/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.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 versionator
diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild
index 86e6b60f8e3..7f39cee5619 100644
--- a/dev-util/weka/weka-3.7.13.ebuild
+++ b/dev-util/weka/weka-3.7.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-util/weka/weka-3.8.0.ebuild b/dev-util/weka/weka-3.8.0.ebuild
index abef102e8c5..134f1ad611b 100644
--- a/dev-util/weka/weka-3.8.0.ebuild
+++ b/dev-util/weka/weka-3.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="6"
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 4b3cf63a4d2..65b4804e13c 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-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-util/wsta/wsta-0.4.1.ebuild b/dev-util/wsta/wsta-0.4.1.ebuild
index 2557c80640f..fa80786d78e 100644
--- a/dev-util/wsta/wsta-0.4.1.ebuild
+++ b/dev-util/wsta/wsta-0.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-util/wsta/wsta-0.5.0.ebuild b/dev-util/wsta/wsta-0.5.0.ebuild
index 2557c80640f..fa80786d78e 100644
--- a/dev-util/wsta/wsta-0.5.0.ebuild
+++ b/dev-util/wsta/wsta-0.5.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-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
index d0ba332e328..68bf771bb16 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index d0ba332e328..68bf771bb16 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild b/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
index 6f1bc4bfec4..e307c940a1e 100644
--- a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
+++ b/dev-util/wxglade/wxglade-0.6.3-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-util/xdelta/xdelta-1.1.4-r1.ebuild b/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
index ea8d4249278..61d044c28e8 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit autotools eutils toolchain-funcs
diff --git a/dev-util/xdelta/xdelta-3.0.10.ebuild b/dev-util/xdelta/xdelta-3.0.10.ebuild
index ae0d71a3e9f..a9d48c005d7 100644
--- a/dev-util/xdelta/xdelta-3.0.10.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.10.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-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 1805b84342b..7afc64d6873 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.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
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index 0f36010c552..1203efc69ce 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.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=6
PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
index 81e959e49d0..c3a780d7fb7 100644
--- a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
+++ b/dev-util/xesam-tools/xesam-tools-0.7.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-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
index 6bfcb860873..4c0525833be 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.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
inherit xfconf
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
index e853bfe620a..c0b6bcefc27 100644
--- a/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
+++ b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
index daa9c508023..89968bf87ef 100644
--- a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
+++ b/dev-util/xmlindent/xmlindent-0.2.17-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-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
index 897ce7252ce..e5a189229ee 100644
--- a/dev-util/xxdi/xxdi-1.0.0.ebuild
+++ b/dev-util/xxdi/xxdi-1.0.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-util/xxdiff/xxdiff-4.0.1-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
index 7bce1f0c047..253a5704bce 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.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-util/xxdiff/xxdiff-4.0.1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
index 85ea7c93924..9ba26ac0ea3 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.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-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
index d49672cca0b..ead20c6c329 100644
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-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-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
index 395b5d6091e..4d0ba31f56e 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.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=6
diff --git a/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild b/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
index dbc74962d33..c3ae956f568 100644
--- a/dev-util/yuicompressor/yuicompressor-2.4.8-r2.ebuild
+++ b/dev-util/yuicompressor/yuicompressor-2.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