diff --git a/dev-crystal/athena-negotiation/athena-negotiation-0.1.5.ebuild b/dev-crystal/athena-negotiation/athena-negotiation-0.1.5-r1.ebuild
similarity index 100%
rename from dev-crystal/athena-negotiation/athena-negotiation-0.1.5.ebuild
rename to dev-crystal/athena-negotiation/athena-negotiation-0.1.5-r1.ebuild
diff --git a/dev-crystal/athena-negotiation/athena-negotiation-0.2.0.ebuild b/dev-crystal/athena-negotiation/athena-negotiation-0.2.0-r1.ebuild
similarity index 100%
rename from dev-crystal/athena-negotiation/athena-negotiation-0.2.0.ebuild
rename to dev-crystal/athena-negotiation/athena-negotiation-0.2.0-r1.ebuild
diff --git a/dev-crystal/athena-spec/athena-spec-0.3.11.ebuild b/dev-crystal/athena-spec/athena-spec-0.3.11-r1.ebuild
similarity index 100%
rename from dev-crystal/athena-spec/athena-spec-0.3.11.ebuild
rename to dev-crystal/athena-spec/athena-spec-0.3.11-r1.ebuild
diff --git a/dev-crystal/athena-spec/athena-spec-0.4.0.ebuild b/dev-crystal/athena-spec/athena-spec-0.4.0-r1.ebuild
similarity index 100%
rename from dev-crystal/athena-spec/athena-spec-0.4.0.ebuild
rename to dev-crystal/athena-spec/athena-spec-0.4.0-r1.ebuild
diff --git a/dev-crystal/backtracer/backtracer-1.2.2.ebuild b/dev-crystal/backtracer/backtracer-1.2.2-r1.ebuild
similarity index 100%
rename from dev-crystal/backtracer/backtracer-1.2.2.ebuild
rename to dev-crystal/backtracer/backtracer-1.2.2-r1.ebuild
diff --git a/dev-crystal/backtracer/backtracer-1.2.4.ebuild b/dev-crystal/backtracer/backtracer-1.2.4-r1.ebuild
similarity index 100%
rename from dev-crystal/backtracer/backtracer-1.2.4.ebuild
rename to dev-crystal/backtracer/backtracer-1.2.4-r1.ebuild
diff --git a/dev-crystal/crystal-db/crystal-db-0.13.1.ebuild b/dev-crystal/crystal-db/crystal-db-0.13.1-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-db/crystal-db-0.13.1.ebuild
rename to dev-crystal/crystal-db/crystal-db-0.13.1-r1.ebuild
diff --git a/dev-crystal/crystal-db/crystal-db-0.14.0.ebuild b/dev-crystal/crystal-db/crystal-db-0.14.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-db/crystal-db-0.14.0.ebuild
rename to dev-crystal/crystal-db/crystal-db-0.14.0-r1.ebuild
diff --git a/dev-crystal/crystal-fnv/crystal-fnv-0.1.3.ebuild b/dev-crystal/crystal-fnv/crystal-fnv-0.1.3-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-fnv/crystal-fnv-0.1.3.ebuild
rename to dev-crystal/crystal-fnv/crystal-fnv-0.1.3-r1.ebuild
diff --git a/dev-crystal/crystal-html5/crystal-html5-0.4.0.ebuild b/dev-crystal/crystal-html5/crystal-html5-0.4.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-html5/crystal-html5-0.4.0.ebuild
rename to dev-crystal/crystal-html5/crystal-html5-0.4.0-r1.ebuild
diff --git a/dev-crystal/crystal-html5/crystal-html5-0.5.0.ebuild b/dev-crystal/crystal-html5/crystal-html5-0.5.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-html5/crystal-html5-0.5.0.ebuild
rename to dev-crystal/crystal-html5/crystal-html5-0.5.0-r1.ebuild
diff --git a/dev-crystal/crystal-pg/crystal-pg-0.28.0.ebuild b/dev-crystal/crystal-pg/crystal-pg-0.28.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-pg/crystal-pg-0.28.0.ebuild
rename to dev-crystal/crystal-pg/crystal-pg-0.28.0-r1.ebuild
diff --git a/dev-crystal/crystal-pg/crystal-pg-0.29.0-r1.ebuild b/dev-crystal/crystal-pg/crystal-pg-0.29.0-r2.ebuild
similarity index 100%
rename from dev-crystal/crystal-pg/crystal-pg-0.29.0-r1.ebuild
rename to dev-crystal/crystal-pg/crystal-pg-0.29.0-r2.ebuild
diff --git a/dev-crystal/crystal-sqlite3/crystal-sqlite3-0.21.0.ebuild b/dev-crystal/crystal-sqlite3/crystal-sqlite3-0.21.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-sqlite3/crystal-sqlite3-0.21.0.ebuild
rename to dev-crystal/crystal-sqlite3/crystal-sqlite3-0.21.0-r1.ebuild
diff --git a/dev-crystal/crystal-sqlite3/crystal-sqlite3-0.22.0.ebuild b/dev-crystal/crystal-sqlite3/crystal-sqlite3-0.22.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-sqlite3/crystal-sqlite3-0.22.0.ebuild
rename to dev-crystal/crystal-sqlite3/crystal-sqlite3-0.22.0-r1.ebuild
diff --git a/dev-crystal/crystal-xpath2/crystal-xpath2-0.1.3.ebuild b/dev-crystal/crystal-xpath2/crystal-xpath2-0.1.3-r1.ebuild
similarity index 100%
rename from dev-crystal/crystal-xpath2/crystal-xpath2-0.1.3.ebuild
rename to dev-crystal/crystal-xpath2/crystal-xpath2-0.1.3-r1.ebuild
diff --git a/dev-crystal/crystar/crystar-0.3.1.ebuild b/dev-crystal/crystar/crystar-0.3.1-r1.ebuild
similarity index 100%
rename from dev-crystal/crystar/crystar-0.3.1.ebuild
rename to dev-crystal/crystar/crystar-0.3.1-r1.ebuild
diff --git a/dev-crystal/crystar/crystar-0.4.0.ebuild b/dev-crystal/crystar/crystar-0.4.0-r1.ebuild
similarity index 100%
rename from dev-crystal/crystar/crystar-0.4.0.ebuild
rename to dev-crystal/crystar/crystar-0.4.0-r1.ebuild
diff --git a/dev-crystal/exception_page/exception_page-0.4.1.ebuild b/dev-crystal/exception_page/exception_page-0.4.1-r1.ebuild
similarity index 100%
rename from dev-crystal/exception_page/exception_page-0.4.1.ebuild
rename to dev-crystal/exception_page/exception_page-0.4.1-r1.ebuild
diff --git a/dev-crystal/exception_page/exception_page-0.5.0.ebuild b/dev-crystal/exception_page/exception_page-0.5.0-r1.ebuild
similarity index 100%
rename from dev-crystal/exception_page/exception_page-0.5.0.ebuild
rename to dev-crystal/exception_page/exception_page-0.5.0-r1.ebuild
diff --git a/dev-crystal/habitat/habitat-0.4.9.ebuild b/dev-crystal/habitat/habitat-0.4.9-r1.ebuild
similarity index 100%
rename from dev-crystal/habitat/habitat-0.4.9.ebuild
rename to dev-crystal/habitat/habitat-0.4.9-r1.ebuild
diff --git a/dev-crystal/http_proxy/http_proxy-0.12.0.ebuild b/dev-crystal/http_proxy/http_proxy-0.12.0-r1.ebuild
similarity index 100%
rename from dev-crystal/http_proxy/http_proxy-0.12.0.ebuild
rename to dev-crystal/http_proxy/http_proxy-0.12.0-r1.ebuild
diff --git a/dev-crystal/kemal/kemal-1.7.2.ebuild b/dev-crystal/kemal/kemal-1.7.2-r1.ebuild
similarity index 100%
rename from dev-crystal/kemal/kemal-1.7.2.ebuild
rename to dev-crystal/kemal/kemal-1.7.2-r1.ebuild
diff --git a/dev-crystal/kemal/kemal-1.7.3.ebuild b/dev-crystal/kemal/kemal-1.7.3-r1.ebuild
similarity index 100%
rename from dev-crystal/kemal/kemal-1.7.3.ebuild
rename to dev-crystal/kemal/kemal-1.7.3-r1.ebuild
diff --git a/dev-crystal/lucky_flow/lucky_flow-0.10.1.ebuild b/dev-crystal/lucky_flow/lucky_flow-0.10.1-r1.ebuild
similarity index 100%
rename from dev-crystal/lucky_flow/lucky_flow-0.10.1.ebuild
rename to dev-crystal/lucky_flow/lucky_flow-0.10.1-r1.ebuild
diff --git a/dev-crystal/protodec/protodec-0.1.5-r1.ebuild b/dev-crystal/protodec/protodec-0.1.5-r3.ebuild
similarity index 97%
rename from dev-crystal/protodec/protodec-0.1.5-r1.ebuild
rename to dev-crystal/protodec/protodec-0.1.5-r3.ebuild
index 9986432763..90f97c8d25 100644
--- a/dev-crystal/protodec/protodec-0.1.5-r1.ebuild
+++ b/dev-crystal/protodec/protodec-0.1.5-r3.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 DEPEND="
 	dev-libs/boehm-gc
 	dev-libs/libevent:=
-	dev-libs/libpcre
+	dev-libs/libpcre2:=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-crystal/radix/radix-0.4.1.ebuild b/dev-crystal/radix/radix-0.4.1-r1.ebuild
similarity index 100%
rename from dev-crystal/radix/radix-0.4.1.ebuild
rename to dev-crystal/radix/radix-0.4.1-r1.ebuild
diff --git a/dev-crystal/selenium/selenium-0.12.0.ebuild b/dev-crystal/selenium/selenium-0.12.0-r1.ebuild
similarity index 100%
rename from dev-crystal/selenium/selenium-0.12.0.ebuild
rename to dev-crystal/selenium/selenium-0.12.0-r1.ebuild
diff --git a/dev-crystal/selenium/selenium-0.12.1.ebuild b/dev-crystal/selenium/selenium-0.12.1-r1.ebuild
similarity index 100%
rename from dev-crystal/selenium/selenium-0.12.1.ebuild
rename to dev-crystal/selenium/selenium-0.12.1-r1.ebuild
diff --git a/dev-crystal/spectator/spectator-0.12.1.ebuild b/dev-crystal/spectator/spectator-0.12.1-r1.ebuild
similarity index 100%
rename from dev-crystal/spectator/spectator-0.12.1.ebuild
rename to dev-crystal/spectator/spectator-0.12.1-r1.ebuild
diff --git a/dev-crystal/spectator/spectator-0.12.2.ebuild b/dev-crystal/spectator/spectator-0.12.2-r1.ebuild
similarity index 100%
rename from dev-crystal/spectator/spectator-0.12.2.ebuild
rename to dev-crystal/spectator/spectator-0.12.2-r1.ebuild
diff --git a/dev-crystal/webdrivers/webdrivers-0.4.3-r1.ebuild b/dev-crystal/webdrivers/webdrivers-0.4.3-r2.ebuild
similarity index 100%
rename from dev-crystal/webdrivers/webdrivers-0.4.3-r1.ebuild
rename to dev-crystal/webdrivers/webdrivers-0.4.3-r2.ebuild
diff --git a/dev-crystal/webless/webless-0.1.0.ebuild b/dev-crystal/webless/webless-0.1.0-r1.ebuild
similarity index 100%
rename from dev-crystal/webless/webless-0.1.0.ebuild
rename to dev-crystal/webless/webless-0.1.0-r1.ebuild
diff --git a/dev-crystal/webless/webless-0.2.0.ebuild b/dev-crystal/webless/webless-0.2.0-r1.ebuild
similarity index 100%
rename from dev-crystal/webless/webless-0.2.0.ebuild
rename to dev-crystal/webless/webless-0.2.0-r1.ebuild
diff --git a/dev-crystal/webmock/webmock-0.14.0.ebuild b/dev-crystal/webmock/webmock-0.14.0-r1.ebuild
similarity index 100%
rename from dev-crystal/webmock/webmock-0.14.0.ebuild
rename to dev-crystal/webmock/webmock-0.14.0-r1.ebuild