bootstrap: Replace prebuilt imports by pkgconfig

33 files changed, 116 insertions, 285 deletions

diff --git a/TARGETS b/TARGETS
index 8b807c08..b7f78851 100644
--- a/TARGETS
+++ b/TARGETS
@@ -18,6 +18,7 @@
     , "SOURCE_DATE_EPOCH"
     , "TARGET_ARCH"
     , "VERSION_EXTRA_SUFFIX"
+    , "PKG_CONFIG_ARGS"
     ]
   , "config_doc":
     { "ARCH":
@@ -83,6 +84,7 @@
     , "BUILD_STATIC_BINARY"
     , "SOURCE_DATE_EPOCH"
     , "VERSION_EXTRA_SUFFIX"
+    , "PKG_CONFIG_ARGS"
     ]
   }
 , "just":
diff --git a/bin/bootstrap.py b/bin/bootstrap.py
index e62dc85b..73c9dd00 100755
--- a/bin/bootstrap.py
+++ b/bin/bootstrap.py
@@ -225,27 +225,27 @@ def config_to_local(*, repos_file, link_targets_file):
         if not isinstance(repo_desc, dict):
             repo_desc = {}
         if repo_desc.get("type") in ["archive", "zip"]:
-            local_bootstrap = desc.get("local_bootstrap", {})
+            pkg_bootstrap = desc.get("pkg_bootstrap", {})
             desc["repository"] = {
                 "type": "file",
                 "path": os.path.normpath(
                     os.path.join(
                         LOCALBASE,
-                        local_bootstrap.get("local_path", ".")))
+                        pkg_bootstrap.get("local_path", ".")))
             }
-            if "link_dirs" in local_bootstrap:
+            if "link_dirs" in pkg_bootstrap:
                 link = []
-                for entry in local_bootstrap["link_dirs"]:
+                for entry in pkg_bootstrap["link_dirs"]:
                     link += ["-L", os.path.join(LOCALBASE, entry)]
                     global_link_dirs.add(entry)
-                link += local_bootstrap.get("link", [])
-                local_bootstrap["link"] = link
-            desc["bootstrap"] = local_bootstrap
-            if "local_bootstrap" in desc:
-                del desc["local_bootstrap"]
+                link += pkg_bootstrap.get("link", [])
+                pkg_bootstrap["link"] = link
+            desc["bootstrap"] = pkg_bootstrap
+            if "pkg_bootstrap" in desc:
+                del desc["pkg_bootstrap"]
         if repo_desc.get("type") == "file":
-            local_bootstrap = desc.get("local_bootstrap", {})
-            if local_bootstrap.get("local_path") and NON_LOCAL_DEPS:
+            pkg_bootstrap = desc.get("pkg_bootstrap", {})
+            if pkg_bootstrap.get("local_path") and NON_LOCAL_DEPS:
                 # local layer gets changed, keep a copy
                 backup_name = "ORIGINAL: " + repo
                 backup_layers[backup_name] = {
@@ -255,11 +255,11 @@ def config_to_local(*, repos_file, link_targets_file):
                 changed_file_roots[repo] = backup_name
             desc["repository"] = {
                 "type": "file",
-                "path": local_bootstrap.get("local_path", desc["repository"].get("path"))
+                "path": pkg_bootstrap.get("local_path", desc["repository"].get("path"))
             }
-            desc["bootstrap"] = local_bootstrap
-            if "local_bootstrap" in desc:
-                del desc["local_bootstrap"]
+            desc["bootstrap"] = pkg_bootstrap
+            if "pkg_bootstrap" in desc:
+                del desc["pkg_bootstrap"]
 
     # For repos that we didn't change to local, make file roots point
     # to the original version, so that, in particular, the original
diff --git a/etc/import.prebuilt/TARGETS.bazel_remote_apis b/etc/import.pkgconfig/TARGETS.bazel_remote_apis
index 8f846701..9c16e433 100644
--- a/etc/import.prebuilt/TARGETS.bazel_remote_apis
+++ b/etc/import.pkgconfig/TARGETS.bazel_remote_apis
@@ -1,13 +1,13 @@
 { "semver_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["semver_proto"]
-  , "srcs": ["build/bazel/semver/semver.proto"]
+  , "srcs": [["include", "semver_proto_file"]]
   }
-, "remote_execution_proto impl":
+, "remote_execution_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["remote_execution_proto"]
   , "service": ["yes"]
-  , "srcs": ["build/bazel/remote/execution/v2/remote_execution.proto"]
+  , "srcs": [["include", "remote_execution_proto_file"]]
   , "deps":
     [ "semver_proto"
     , ["@", "google_apis", "", "google_api_annotations_proto"]
@@ -16,14 +16,4 @@
     , ["@", "google_apis", "", "google_rpc_status_proto"]
     ]
   }
-, "remote_execution_proto":
-  { "type": "export"
-  , "target": "remote_execution_proto impl"
-  , "doc":
-    [ "Remote Execution API"
-    , ""
-    , "The Remote Execution API is an API that, at its most general, allows clients"
-    , "to request execution of binaries on a remote system."
-    ]
-  }
 }
diff --git a/etc/import.pkgconfig/TARGETS.boringssl b/etc/import.pkgconfig/TARGETS.boringssl
new file mode 100644
index 00000000..d7596e4e
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.boringssl
@@ -0,0 +1,9 @@
+{ "ssl":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["libssl"]
+  }
+, "crypto":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["libcrypto"]
+  }
+}
diff --git a/etc/import.pkgconfig/TARGETS.cli11 b/etc/import.pkgconfig/TARGETS.cli11
new file mode 100644
index 00000000..8ad894c7
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.cli11
@@ -0,0 +1,3 @@
+{ "cli11":
+  {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["CLI11"]}
+}
diff --git a/etc/import.pkgconfig/TARGETS.fmt b/etc/import.pkgconfig/TARGETS.fmt
new file mode 100644
index 00000000..49b9bfce
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.fmt
@@ -0,0 +1,3 @@
+{ "fmt":
+  {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["fmt"]}
+}
diff --git a/etc/import.pkgconfig/TARGETS.git2 b/etc/import.pkgconfig/TARGETS.git2
new file mode 100644
index 00000000..9c70d4d5
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.git2
@@ -0,0 +1,5 @@
+{ "git2":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["libgit2"]
+  }
+}
diff --git a/etc/import.prebuilt/TARGETS.google_apis b/etc/import.pkgconfig/TARGETS.google_apis
index 66f66572..1e579e50 100644
--- a/etc/import.prebuilt/TARGETS.google_apis
+++ b/etc/import.pkgconfig/TARGETS.google_apis
@@ -1,30 +1,30 @@
 { "google_api_http_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_api_http_proto"]
-  , "srcs": ["google/api/http.proto"]
+  , "srcs": [["include", "google_api_http_proto_file"]]
   }
 , "google_api_annotations_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_api_annotations_proto"]
-  , "srcs": ["google/api/annotations.proto"]
+  , "srcs": [["include", "google_api_annotations_proto_file"]]
   , "deps": ["google_api_http_proto"]
   }
 , "google_bytestream_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_bytestream_proto"]
   , "service": ["yes"]
-  , "srcs": ["google/bytestream/bytestream.proto"]
+  , "srcs": [["include", "google_bytestream_proto_file"]]
   , "deps": ["google_api_annotations_proto"]
   }
 , "google_rpc_status_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_rpc_status_proto"]
-  , "srcs": ["google/rpc/status.proto"]
+  , "srcs": [["include", "google_rpc_status_proto_file"]]
   }
 , "google_longrunning_operations_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_longrunning_operations_proto"]
-  , "srcs": ["google/longrunning/operations.proto"]
+  , "srcs": [["include", "google_longrunning_operations_proto_file"]]
   , "service": ["yes"]
   , "deps":
     [ "google_api_annotations_proto"
diff --git a/etc/import.pkgconfig/TARGETS.grpc b/etc/import.pkgconfig/TARGETS.grpc
new file mode 100644
index 00000000..eb5bca6e
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.grpc
@@ -0,0 +1,10 @@
+{ "grpc_cpp_plugin": {"type": "install", "deps": [["bin", "grpc_cpp_plugin"]]}
+, "grpc++":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["grpc++"]
+  }
+, "grpc":
+  {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["grpc"]}
+, "gpr":
+  {"type": ["@", "rules", "CC/pkgconfig", "system_library"], "name": ["gpr"]}
+}
diff --git a/etc/import.pkgconfig/TARGETS.gsl b/etc/import.pkgconfig/TARGETS.gsl
new file mode 100644
index 00000000..e73040f5
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.gsl
@@ -0,0 +1,5 @@
+{ "gsl-lite":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["gsl-lite"]
+  }
+}
diff --git a/etc/import.pkgconfig/TARGETS.json b/etc/import.pkgconfig/TARGETS.json
new file mode 100644
index 00000000..9e4ff515
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.json
@@ -0,0 +1,5 @@
+{ "json":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["nlohmann_json"]
+  }
+}
diff --git a/etc/import.pkgconfig/TARGETS.protobuf b/etc/import.pkgconfig/TARGETS.protobuf
new file mode 100644
index 00000000..bd67145a
--- /dev/null
+++ b/etc/import.pkgconfig/TARGETS.protobuf
@@ -0,0 +1,19 @@
+{ "protoc": {"type": "install", "deps": [["bin", "protoc"]]}
+, "libprotoc":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["libprotoc"]
+  }
+, "libprotobuf":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["protobuf"]
+  }
+, "libprotobuf_lite":
+  { "type": ["@", "rules", "CC/pkgconfig", "system_library"]
+  , "name": ["protobuf-lite"]
+  }
+, "toolchain":
+  { "type": "install"
+  , "files": {"bin/protoc": "protoc"}
+  , "deps": [["TREE", null, "include/google/protobuf"]]
+  }
+}
diff --git a/etc/import.pkgconfig/bin/TARGETS.grpc b/etc/import.pkgconfig/bin/TARGETS.grpc
new file mode 100644
index 00000000..b30f33b0
--- /dev/null
+++ b/etc/import.pkgconfig/bin/TARGETS.grpc
@@ -0,0 +1,3 @@
+{ "grpc_cpp_plugin":
+  {"type": "install", "deps": [["FILE", null, "grpc_cpp_plugin"]]}
+}
diff --git a/etc/import.pkgconfig/bin/TARGETS.protobuf b/etc/import.pkgconfig/bin/TARGETS.protobuf
new file mode 100644
index 00000000..31de4114
--- /dev/null
+++ b/etc/import.pkgconfig/bin/TARGETS.protobuf
@@ -0,0 +1 @@
+{"protoc": {"type": "install", "deps": [["FILE", null, "protoc"]]}}
diff --git a/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis b/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis
new file mode 100644
index 00000000..6b4bcf21
--- /dev/null
+++ b/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis
@@ -0,0 +1,7 @@
+{ "semver_proto_file":
+  {"type": "install", "deps": ["build/bazel/semver/semver.proto"]}
+, "remote_execution_proto_file":
+  { "type": "install"
+  , "deps": ["build/bazel/remote/execution/v2/remote_execution.proto"]
+  }
+}
diff --git a/etc/import.pkgconfig/include/TARGETS.google_apis b/etc/import.pkgconfig/include/TARGETS.google_apis
new file mode 100644
index 00000000..5f7500ae
--- /dev/null
+++ b/etc/import.pkgconfig/include/TARGETS.google_apis
@@ -0,0 +1,11 @@
+{ "google_api_http_proto_file":
+  {"type": "install", "deps": ["google/api/http.proto"]}
+, "google_api_annotations_proto_file":
+  {"type": "install", "deps": ["google/api/annotations.proto"]}
+, "google_bytestream_proto_file":
+  {"type": "install", "deps": ["google/bytestream/bytestream.proto"]}
+, "google_rpc_status_proto_file":
+  {"type": "install", "deps": ["google/rpc/status.proto"]}
+, "google_longrunning_operations_proto_file":
+  {"type": "install", "deps": ["google/longrunning/operations.proto"]}
+}
diff --git a/etc/import.prebuilt/TARGETS.absl b/etc/import.prebuilt/TARGETS.absl
deleted file mode 100644
index 293ef7a8..00000000
--- a/etc/import.prebuilt/TARGETS.absl
+++ /dev/null
@@ -1,21 +0,0 @@
-{ "absl":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["absl"]
-  , "private-ldflags":
-    [ "-lbad_optional_access"
-    , "-lstr_format_internal"
-    , "-ltime"
-    , "-lstrings"
-    , "-lstrings_internal"
-    , "-lbase"
-    , "-ldynamic_annotations"
-    , "-lspinlock_wait"
-    , "-lthrow_delegate"
-    , "-lraw_logging_internal"
-    , "-llog_severity"
-    , "-lint128"
-    , "-ltime_zone"
-    , "-lcivil_time"
-    ]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.boringssl b/etc/import.prebuilt/TARGETS.boringssl
deleted file mode 100644
index a58a406f..00000000
--- a/etc/import.prebuilt/TARGETS.boringssl
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "crypto":
-  { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": [["TREE", null, "."]]
-  , "stage": ["openssl"]
-  , "private-ldflags": ["-lcrypto"]
-  }
-, "ssl":
-  { "type": ["@", "rules", "CC", "library"]
-  , "private-ldflags": ["-lssl"]
-  , "deps": ["crypto"]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.cli11 b/etc/import.prebuilt/TARGETS.cli11
deleted file mode 100644
index c178e0dd..00000000
--- a/etc/import.prebuilt/TARGETS.cli11
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "cli11":
-  { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": [["TREE", null, "."]]
-  , "stage": ["CLI"]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.fmt b/etc/import.prebuilt/TARGETS.fmt
deleted file mode 100644
index 4c49c84b..00000000
--- a/etc/import.prebuilt/TARGETS.fmt
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "fmt":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["fmt"]
-  , "stage": ["fmt"]
-  , "hdrs": [["TREE", null, "."]]
-  , "private-ldflags": ["-lfmt"]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.git2 b/etc/import.prebuilt/TARGETS.git2
deleted file mode 100644
index 09d0ebba..00000000
--- a/etc/import.prebuilt/TARGETS.git2
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "git2":
-  { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": ["git2.h", ["TREE", null, "git2"]]
-  , "private-ldflags":
-    [ "-lgit2"
-    , "-lutil_os_unix"
-    , "-lutil_hash_openssl"
-    , "-lgit2_pcre"
-    , "-lgit2_http_parser"
-    , "-pthread"
-    ]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.grpc b/etc/import.prebuilt/TARGETS.grpc
deleted file mode 100644
index ff2ff176..00000000
--- a/etc/import.prebuilt/TARGETS.grpc
+++ /dev/null
@@ -1,91 +0,0 @@
-{ "grpc++":
-  { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": [["include", "grpcpp"]]
-  , "private-ldflags":
-    [ "-lgrpc++"
-    , "-lgrpc++_base"
-    , "-lgrpc"
-    , "-lcensus"
-    , "-lgrpc_lb_policy_pick_first"
-    , "-lgrpc_lb_policy_priority"
-    , "-lgrpc_lb_policy_round_robin"
-    , "-lgrpc_lb_policy_weighted_target"
-    , "-lgrpc_client_idle_filter"
-    , "-lgrpc_max_age_filter"
-    , "-lgrpc_resolver_dns_ares"
-    , "-lares"
-    , "-laddress_sorting"
-    , "-lgrpc_resolver_dns_native"
-    , "-lgrpc_resolver_dns_selection"
-    , "-lgrpc_resolver_sockaddr"
-    , "-lgrpc_transport_chttp2_server_insecure"
-    , "-lgrpc_transport_inproc"
-    , "-lgrpc_workaround_cronet_compression_filter"
-    , "-lgrpc_server_backward_compatibility"
-    , "-lgrpc_lb_policy_cds_secure"
-    , "-lgrpc_lb_policy_eds_secure"
-    , "-lgrpc_lb_address_filtering"
-    , "-lgrpc_lb_policy_grpclb_secure"
-    , "-lgrpc_grpclb_balancer_addresses"
-    , "-lgrpc_lb_upb"
-    , "-lgrpc_resolver_fake"
-    , "-lgrpc_lb_policy_lrs_secure"
-    , "-lgrpc_lb_policy_xds_routing"
-    , "-lgrpc_resolver_xds_secure"
-    , "-lgrpc_xds_client_secure"
-    , "-lenvoy_ads_upb"
-    , "-lenvoy_core_upb"
-    , "-lenvoy_type_upb"
-    , "-lenvoy_annotations_upb"
-    , "-ludpa_annotations_upb"
-    , "-lre2"
-    , "-lgrpc_transport_chttp2_client_secure"
-    , "-lgrpc_transport_chttp2_server_secure"
-    , "-lgrpc_transport_chttp2_server"
-    , "-lgrpc++_codegen_base_src"
-    , "-lgrpc_secure"
-    , "-ltsi"
-    , "-lalts_frame_protector"
-    , "-lalts_util"
-    , "-lalts_upb"
-    , "-lgrpc_transport_chttp2_client_insecure"
-    , "-lgrpc_transport_chttp2_client_connector"
-    , "-lgrpc_transport_chttp2"
-    , "-lgrpc_http_filters"
-    , "-lgrpc_message_size_filter"
-    , "-lgrpc_client_channel"
-    , "-lgrpc_client_authority_filter"
-    , "-lgrpc_deadline_filter"
-    , "-lgrpc_base"
-    , "-lgrpc_base_c"
-    , "-leventmanager_libuv"
-    , "-lgrpc_health_upb"
-    , "-ludpa_orca_upb"
-    , "-lproto_gen_validate_upb"
-    , "-lgoogle_api_upb"
-    , "-lupb"
-    , "-lupb_port"
-    , "-lgrpc_transport_chttp2_alpn"
-    , "-ltsi_interface"
-    , "-lgrpc_trace"
-    , "-lgpr_base"
-    ]
-  , "deps":
-    [ ["@", "absl", "", "absl"]
-    , ["@", "zlib", "", "zlib"]
-    , ["@", "libssl", "", "ssl"]
-    ]
-  }
-, "grpc++_codegen_proto":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["grpc++_codegen_proto"]
-  , "hdrs": [["include", "grpcpp"], ["include", "grpc++"], ["include", "grpc"]]
-  , "private-ldflags": ["-lgrpc++_codegen_base_src"]
-  , "deps": ["grpc++"]
-  }
-, "grpc++_codegen_base_src":
-  { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": [["include", "grpcpp"]]
-  , "private-ldflags": ["-lgrpc++_codegen_base_src"]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.gsl b/etc/import.prebuilt/TARGETS.gsl
deleted file mode 100644
index b8b6798f..00000000
--- a/etc/import.prebuilt/TARGETS.gsl
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "gsl-lite":
-  {"type": ["@", "rules", "CC", "library"], "hdrs": ["gsl-lite hdrs"]}
-, "gsl-lite hdrs":
-  { "type": "tree"
-  , "name": "gsl-lite"
-  , "deps": ["gsl", "gsl-lite.h", "gsl-lite.hpp", "gsl-lite-vc6.hpp"]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.json b/etc/import.prebuilt/TARGETS.json
deleted file mode 100644
index fcb2936b..00000000
--- a/etc/import.prebuilt/TARGETS.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "json": {"type": ["@", "rules", "CC", "library"], "hdrs": ["json headers"]}
-, "json headers":
-  {"type": "tree", "name": "nlohmann", "deps": [["TREE", null, "."]]}
-}
diff --git a/etc/import.prebuilt/TARGETS.protobuf b/etc/import.prebuilt/TARGETS.protobuf
deleted file mode 100644
index f375192d..00000000
--- a/etc/import.prebuilt/TARGETS.protobuf
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "protoc":
-  {"type": ["@", "rules", "data", "staged"], "srcs": [["bin", "protoc"]]}
-, "C++ runtime":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["protobuf"]
-  , "hdrs": [["include", "protobuf"]]
-  , "private-ldflags": ["-lprotobuf", "-lprotobuf_lite"]
-  }
-, "well_known_protos":
-  { "type": ["@", "rules", "data", "staged"]
-  , "srcs": [["proto/google/protobuf", "well_known_protos"]]
-  }
-}
diff --git a/etc/import.prebuilt/TARGETS.zlib b/etc/import.prebuilt/TARGETS.zlib
deleted file mode 100644
index 6f6d1049..00000000
--- a/etc/import.prebuilt/TARGETS.zlib
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "zlib":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["zlib"]
-  , "private-ldflags": ["-lzlib"]
-  }
-}
diff --git a/etc/import.prebuilt/bin/TARGETS.protobuf b/etc/import.prebuilt/bin/TARGETS.protobuf
deleted file mode 100644
index 0967ef42..00000000
--- a/etc/import.prebuilt/bin/TARGETS.protobuf
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/etc/import.prebuilt/include/TARGETS.grpc b/etc/import.prebuilt/include/TARGETS.grpc
deleted file mode 100644
index d310d8ea..00000000
--- a/etc/import.prebuilt/include/TARGETS.grpc
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "grpc":
-  {"type": ["@", "rules", "data", "staged"], "srcs": [["TREE", null, "grpc"]]}
-, "grpcpp":
-  { "type": ["@", "rules", "data", "staged"]
-  , "srcs": [["TREE", null, "grpcpp"]]
-  }
-, "grpc++":
-  { "type": ["@", "rules", "data", "staged"]
-  , "srcs": [["TREE", null, "grpcpp"]]
-  }
-}
diff --git a/etc/import.prebuilt/include/TARGETS.protobuf b/etc/import.prebuilt/include/TARGETS.protobuf
deleted file mode 100644
index 8c76bf6e..00000000
--- a/etc/import.prebuilt/include/TARGETS.protobuf
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "protobuf":
-  { "type": ["@", "rules", "data", "staged"]
-  , "srcs": [["TREE", null, "google/protobuf"]]
-  }
-}
diff --git a/etc/import.prebuilt/proto/google/protobuf/TARGETS.protobuf b/etc/import.prebuilt/proto/google/protobuf/TARGETS.protobuf
deleted file mode 100644
index ebdf4beb..00000000
--- a/etc/import.prebuilt/proto/google/protobuf/TARGETS.protobuf
+++ /dev/null
@@ -1,19 +0,0 @@
-{ "well_known_protos":
-  { "type": ["@", "rules", "data", "staged"]
-  , "srcs":
-    [ "any.proto"
-    , "api.proto"
-    , "compiler/plugin.proto"
-    , "descriptor.proto"
-    , "duration.proto"
-    , "empty.proto"
-    , "field_mask.proto"
-    , "source_context.proto"
-    , "struct.proto"
-    , "timestamp.proto"
-    , "type.proto"
-    , "wrappers.proto"
-    ]
-  , "stage": ["google", "protobuf"]
-  }
-}
diff --git a/etc/import.prebuilt/src/compiler/TARGETS.grpc b/etc/import.prebuilt/src/compiler/TARGETS.grpc
deleted file mode 100644
index e3a51445..00000000
--- a/etc/import.prebuilt/src/compiler/TARGETS.grpc
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "grpc_cpp_plugin":
-  { "type": "install"
-  , "files": {"grpc_cpp_plugin": ["", "bin/grpc_cpp_plugin"]}
-  }
-}
diff --git a/etc/repos.json b/etc/repos.json
index f3dbad6e..f6bfb68b 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -136,7 +136,7 @@
   , "import targets":
     { "repository":
       {"type": "file", "path": "etc/import", "pragma": {"to_git": true}}
-    , "local_bootstrap": {"local_path": "etc/import.prebuilt"}
+    , "pkg_bootstrap": {"local_path": "etc/import.pkgconfig"}
     }
   , "gsl-lite":
     { "repository":
@@ -150,7 +150,6 @@
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.gsl"
     , "bindings": {"rules": "rules"}
-    , "local_bootstrap": {"local_path": "include/gsl-lite"}
     }
   , "cli11":
     { "repository":
@@ -165,7 +164,6 @@
     , "target_file_name": "TARGETS.cli11"
     , "bindings": {"rules": "rules"}
     , "bootstrap": {"include_dir": "include/CLI", "include_name": "CLI"}
-    , "local_bootstrap": {"local_path": "include/CLI"}
     }
   , "json":
     { "repository":
@@ -180,7 +178,6 @@
     , "target_file_name": "TARGETS.json"
     , "bindings": {"rules": "rules"}
     , "bootstrap": {"include_name": "nlohmann"}
-    , "local_bootstrap": {"local_path": "include/nlohmann"}
     }
   , "fmt":
     { "repository":
@@ -199,8 +196,7 @@
       , "build": "cd src && {cxx} {cxxflags} -I ../include -c os.cc format.cc && {ar} cqs ../libfmt.a *.o"
       , "link": ["-lfmt"]
       }
-    , "local_bootstrap":
-      {"local_path": "include/fmt", "link": ["-lfmt"], "link_dirs": ["lib"]}
+    , "pkg_bootstrap": {"link": ["-lfmt"], "link_dirs": ["lib"]}
     }
   , "ssl":
     { "repository":
@@ -220,11 +216,7 @@
       , "include_dir": "src/include/openssl"
       , "include_name": "openssl"
       }
-    , "local_bootstrap":
-      { "local_path": "include/openssl"
-      , "link": ["-lcrypto", "-pthread"]
-      , "link_dirs": ["lib"]
-      }
+    , "pkg_bootstrap": {"link": ["-lcrypto", "-pthread"], "link_dirs": ["lib"]}
     }
   , "protobuf":
     { "repository":
@@ -238,7 +230,7 @@
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.protobuf"
     , "bindings": {"rules": "rules-protobuf", "zlib": "zlib"}
-    , "local_bootstrap":
+    , "pkg_bootstrap":
       { "copy":
         ["bin/protoc", "include/google/protobuf", "proto/google/protobuf"]
       }
@@ -254,12 +246,7 @@
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.bazel_remote_apis"
-    , "bindings":
-      { "rules": "rules-protobuf"
-      , "protoc": "protobuf"
-      , "google_apis": "google_apis"
-      }
-    , "local_bootstrap": {"local_path": "proto"}
+    , "bindings": {"rules": "rules", "google_apis": "google_apis"}
     }
   , "google_apis":
     { "repository":
@@ -272,9 +259,7 @@
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.google_apis"
-    , "bindings":
-      {"rules": "rules-protobuf", "protoc": "protobuf", "patches": "patches"}
-    , "local_bootstrap": {"local_path": "proto"}
+    , "bindings": {"rules": "rules", "patches": "patches"}
     }
   , "upb":
     { "repository":
@@ -377,7 +362,7 @@
       , "re2": "re2"
       , "cares": "com_github_cares_cares"
       }
-    , "local_bootstrap":
+    , "pkg_bootstrap":
       {"copy": ["bin/grpc_cpp_plugin", "include/grpc", "include/grpcpp"]}
     }
   , "com_github_libgit2_libgit2":
@@ -391,13 +376,9 @@
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.git2"
-    , "bindings":
-      { "rules": "rules-git2"
-      , "zlib": "zlib"
-      , "ssl": "ssl"
-      }
+    , "bindings": {"rules": "rules-git2", "zlib": "zlib", "ssl": "ssl"}
     , "bootstrap": {"include_dir": "include", "include_name": "."}
-    , "local_bootstrap": {"local_path": "include", "copy": ["git2.h", "git2"]}
+    , "pkg_bootstrap": {"copy": ["git2.h", "git2"]}
     }
   , "catch2":
     { "repository":
diff --git a/test/bootstrap/RULES b/test/bootstrap/RULES
index 9b9db26e..cd7ab137 100644
--- a/test/bootstrap/RULES
+++ b/test/bootstrap/RULES
@@ -133,7 +133,7 @@
               , "$1": {"type": "var", "name": "bins"}
               }
             , { "type": "to_subdir"
-              , "subdir": "proto"
+              , "subdir": "include"
               , "$1": {"type": "var", "name": "protos"}
               }
             , {"type": "var", "name": "deps"}