Remove top-level sequoia package

This runs into surprising interactions when trying to build member
packages with other than default feature set.

See https://gitlab.com/sequoia-pgp/sequoia/-/issues/575 for more info.

7 files changed, 17 insertions, 249 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 85ade65d..e5ac50f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1804,26 +1804,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
-name = "sequoia"
-version = "0.19.0"
-dependencies = [
- "buffered-reader",
- "sequoia-autocrypt",
- "sequoia-core",
- "sequoia-ffi",
- "sequoia-ffi-macros",
- "sequoia-guide",
- "sequoia-ipc",
- "sequoia-net",
- "sequoia-openpgp",
- "sequoia-openpgp-ffi",
- "sequoia-sop",
- "sequoia-sqv",
- "sequoia-store",
- "sequoia-tool",
-]
-
-[[package]]
 name = "sequoia-autocrypt"
 version = "0.19.0"
 dependencies = [
diff --git a/Cargo.toml b/Cargo.toml
index 1292c2d1..56ae3aa3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,46 +1,20 @@
-[package]
-name = "sequoia"
-description = "A cool new OpenPGP implementation"
-version = "0.19.0"
-authors = [
-    "Justus Winter <justus@sequoia-pgp.org>",
-    "Kai Michaelis <kai@sequoia-pgp.org>",
-    "Neal H. Walfield <neal@sequoia-pgp.org>",
-]
-documentation = "https://docs.sequoia-pgp.org/0.19.0/"
-homepage = "https://sequoia-pgp.org/"
-repository = "https://gitlab.com/sequoia-pgp/sequoia"
-readme = "README.md"
-keywords = ["cryptography", "openpgp", "pgp", "encryption", "signing"]
-categories = ["cryptography", "authentication", "email"]
-license = "GPL-2.0-or-later"
-edition = "2018"
-
-[badges]
-gitlab = { repository = "sequoia-pgp/sequoia" }
-maintenance = { status = "actively-developed" }
-
 [workspace]
-
-[dependencies]
-buffered-reader = { path = "buffered-reader", version = "0.18" }
-sequoia-openpgp = { path = "openpgp", version = "0.19" }
-sequoia-openpgp-ffi = { path = "openpgp-ffi", version = "0.19" }
-sequoia-autocrypt = { path = "autocrypt", version = "0.19" }
-sequoia-core = { path = "core", version = "0.19" }
-sequoia-ffi = { path = "ffi", version = "0.19" }
-sequoia-ffi-macros = { path = "ffi-macros", version = "0.19" }
-sequoia-ipc = { path = "ipc", version = "0.19" }
-sequoia-net = { path = "net", version = "0.19" }
-sequoia-store = { path = "store", version = "0.19" }
-sequoia-tool = { path = "tool", version = "0.19" }
-sequoia-sop = { path = "sop", version = "0.19" }
-sequoia-sqv = { path = "sqv", version = "0.19" }
-sequoia-guide = { path = "guide", version = "0.19" }
-
-[lib]
-name = "sequoia"
-path = "src/lib.rs"
+members = [
+    "autocrypt",
+    "buffered-reader",
+    "core",
+    "ffi",
+    "ffi-macros",
+    "guide",
+    "ipc",
+    "net",
+    "openpgp",
+    "openpgp-ffi",
+    "sop",
+    "sqv",
+    "store",
+    "tool",
+]
 
 [profile.release]
 debug = true
diff --git a/examples/guide-exploring-openpgp.rs b/examples/guide-exploring-openpgp.rs
deleted file mode 100644
index adfaede6..00000000
--- a/examples/guide-exploring-openpgp.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-//! https://sequoia-pgp.org/guide/exploring-openpgp/
-
-extern crate sequoia_openpgp as openpgp;
-use std::convert::TryFrom;
-use crate::openpgp::parse::Parse;
-use crate::openpgp::policy::StandardPolicy as P;
-
-fn main() -> openpgp::Result<()> {
-    let p = &P::new();
-
-    let cert =
-        "-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-         mQENBFpxtsABCADZcBa1Q3ZLZnju18o0+t8LoQuIIeyeUQ0H45y6xUqyrD5HSkVM
-         VGQs6IHLq70mAizBJ4VznUVqVOh/NhOlapXi6/TKpjHvttdg45o6Pgqa0Kx64luT
-         ZY+TEKyILcdBdhr3CzsEILnQst5jadgMvU9fnT/EkJIvxtWPlUzU5R7nnALO626x
-         2M5Pj3k0h3ZNHMmYQQtReX/RP/xUh2SfOYG6i/MCclIlee8BXHB9k0bW2NAX2W7H
-         rLDGPm1LzmyqxFGDvDvfPlYZ5nN2cbGsv3w75LDzv75kMhVnkZsrUjnHjVRzFq7q
-         fSIpxlvJMEMKSIJ/TFztQoOBO5OlBb5qzYPpABEBAAG0F+G8iM+BzrnPg8+Ezr/P
-         hM6tzrvOt8+CiQFUBBMBCAA+FiEEfcpYtU6xQxad3uFfJH9tq8hJFP4FAlpxtsAC
-         GwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQJH9tq8hJFP49hgf+
-         IKvec0RkD9EHSLFc6AKDm/knaI4AIH0isZTz9jRCF8H/j3h8QVUE+/0jtCcyvR6F
-         TGVSfO3pelDPYGIjDFI3aA6H/UlhZWzYRXZ+QQRrV0zwvLna3XjiW8ib3Ky+5bpQ
-         0uVeee30u+U3SnaCL9QB4+UvwVvAxRuk49Z0Q8TsRrQyQNYpeZDN7uNrvA134cf6
-         6pLUvzPG4lMLIvSXFuHou704EhT7NS3wAzFtjMrsLLieVqtbEi/kBaJTQSZQwjVB
-         sE/Z8lp1heKw/33Br3cB63n4cTf0FdoFywDBhCAMU7fKboU5xBpm5bQJ4ck6j6w+
-         BKG1FiQRR6PCUeb6GjxVOrkBDQRacbbAAQgAw538MMb/pRdpt7PTgBCedw+rU9fh
-         onZYKwmCO7wz5VrVf8zIVvWKxhX6fBTSAy8mxaYbeL/3woQ9Leuo8f0PQNs9zw1N
-         mdH+cnm2KQmL9l7/HQKMLgEAu/0C/q7ii/j8OMYitaMUyrwy+OzW3nCal/uJHIfj
-         bdKx29MbKgF/zaBs8mhTvf/Tu0rIVNDPEicwijDEolGSGebZxdGdHJA31uayMHDK
-         /mwySJViMZ8b+Lzc/dRgNbQoY6yjsjso7U9OZpQK1fooHOSQS6iLsSSsZLcGPD+7
-         m7j3jwq68SIJPMsu0O8hdjFWL4Cfj815CwptAxRGkp00CIusAabO7m8DzwARAQAB
-         iQE2BBgBCAAgFiEEfcpYtU6xQxad3uFfJH9tq8hJFP4FAlpxtsACGwwACgkQJH9t
-         q8hJFP5rmQgAoYOUXolTiQmWipJTdMG/VZ5X7mL8JiBWAQ11K1o01cZCMlziyHnJ
-         xJ6Mqjb6wAFpYBtqysJG/vfjc/XEoKgfFs7+zcuEnt41xJQ6tl/L0VTxs+tEwjZu
-         Rp/owB9GCkqN9+xNEnlH77TLW1UisW+l0F8CJ2WFOj4lk9rcXcLlEdGmXfWIlVCb
-         2/o0DD+HDNsF8nWHpDEy0mcajkgIUTvXQaDXKbccX6Wgep8dyBP7YucGmRPd9Z6H
-         bGeT3KvlJlH5kthQ9shsmT14gYwGMR6rKpNUXmlpetkjqUK7pGVaHGgJWUZ9QPGU
-         awwPdWWvZSyXJAPZ9lC5sTKwMJDwIxILug==
-         =lAie
-         -----END PGP PUBLIC KEY BLOCK-----";
-
-    // Parse the Cert.
-    let pile = openpgp::PacketPile::from_bytes(cert)?;
-
-    // Iterate over children.
-    for (i, p) in pile.children().enumerate() {
-        println!("{}: {:?}", i, p);
-    }
-
-    // Some space to make the output easier to parse.
-    println!();
-
-    // Parse into Cert.
-    let cert = openpgp::Cert::try_from(pile)?;
-    println!("Fingerprint: {}", cert.fingerprint());
-
-    // List userids.
-    for (i, ca) in cert.userids().with_policy(p, None).enumerate() {
-        println!("{}: UID: {}, {} self-signature(s), {} certification(s)",
-                 i, ca.userid(),
-                 ca.bundle().self_signatures().len(),
-                 ca.bundle().certifications().len());
-    }
-
-    // List subkeys.
-    for (i, ka) in cert.keys().with_policy(p, None).skip(1).enumerate() {
-        println!("{}: Fingerprint: {}, {} self-signature(s), {} certification(s)",
-                 i, ka.key().fingerprint(),
-                 ka.bundle().self_signatures().len(),
-                 ka.bundle().certifications().len());
-    }
-
-    Ok(())
-}
diff --git a/examples/guide-getting-started.rs b/examples/guide-getting-started.rs
deleted file mode 100644
index 03ccbfa5..00000000
--- a/examples/guide-getting-started.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! https://sequoia-pgp.org/guide/getting-started/
-
-extern crate sequoia_openpgp as openpgp;
-use std::io;
-
-fn main() -> openpgp::Result<()> {
-    let mut reader = openpgp::armor::Reader::from_bytes(
-       b"-----BEGIN PGP ARMORED FILE-----
-
-         SGVsbG8gd29ybGQhCg==
-         =XLsG
-         -----END PGP ARMORED FILE-----", None);
-
-    io::copy(&mut reader, &mut io::stdout())?;
-
-    Ok(())
-}
diff --git a/examples/guide-the-keystore.rs b/examples/guide-the-keystore.rs
deleted file mode 100644
index bf310d8e..00000000
--- a/examples/guide-the-keystore.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-//! https://sequoia-pgp.org/guide/the-keystore/
-
-extern crate sequoia_openpgp as openpgp;
-
-use sequoia::{core, store};
-use crate::openpgp::parse::Parse;
-
-fn main() -> openpgp::Result<()> {
-    let cert =
-        "-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-         mQENBFpxtsABCADZcBa1Q3ZLZnju18o0+t8LoQuIIeyeUQ0H45y6xUqyrD5HSkVM
-         VGQs6IHLq70mAizBJ4VznUVqVOh/NhOlapXi6/TKpjHvttdg45o6Pgqa0Kx64luT
-         ZY+TEKyILcdBdhr3CzsEILnQst5jadgMvU9fnT/EkJIvxtWPlUzU5R7nnALO626x
-         2M5Pj3k0h3ZNHMmYQQtReX/RP/xUh2SfOYG6i/MCclIlee8BXHB9k0bW2NAX2W7H
-         rLDGPm1LzmyqxFGDvDvfPlYZ5nN2cbGsv3w75LDzv75kMhVnkZsrUjnHjVRzFq7q
-         fSIpxlvJMEMKSIJ/TFztQoOBO5OlBb5qzYPpABEBAAG0F+G8iM+BzrnPg8+Ezr/P
-         hM6tzrvOt8+CiQFUBBMBCAA+FiEEfcpYtU6xQxad3uFfJH9tq8hJFP4FAlpxtsAC
-         GwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQJH9tq8hJFP49hgf+
-         IKvec0RkD9EHSLFc6AKDm/knaI4AIH0isZTz9jRCF8H/j3h8QVUE+/0jtCcyvR6F
-         TGVSfO3pelDPYGIjDFI3aA6H/UlhZWzYRXZ+QQRrV0zwvLna3XjiW8ib3Ky+5bpQ
-         0uVeee30u+U3SnaCL9QB4+UvwVvAxRuk49Z0Q8TsRrQyQNYpeZDN7uNrvA134cf6
-         6pLUvzPG4lMLIvSXFuHou704EhT7NS3wAzFtjMrsLLieVqtbEi/kBaJTQSZQwjVB
-         sE/Z8lp1heKw/33Br3cB63n4cTf0FdoFywDBhCAMU7fKboU5xBpm5bQJ4ck6j6w+
-         BKG1FiQRR6PCUeb6GjxVOrkBDQRacbbAAQgAw538MMb/pRdpt7PTgBCedw+rU9fh
-         onZYKwmCO7wz5VrVf8zIVvWKxhX6fBTSAy8mxaYbeL/3woQ9Leuo8f0PQNs9zw1N
-         mdH+cnm2KQmL9l7/HQKMLgEAu/0C/q7ii/j8OMYitaMUyrwy+OzW3nCal/uJHIfj
-         bdKx29MbKgF/zaBs8mhTvf/Tu0rIVNDPEicwijDEolGSGebZxdGdHJA31uayMHDK
-         /mwySJViMZ8b+Lzc/dRgNbQoY6yjsjso7U9OZpQK1fooHOSQS6iLsSSsZLcGPD+7
-         m7j3jwq68SIJPMsu0O8hdjFWL4Cfj815CwptAxRGkp00CIusAabO7m8DzwARAQAB
-         iQE2BBgBCAAgFiEEfcpYtU6xQxad3uFfJH9tq8hJFP4FAlpxtsACGwwACgkQJH9t
-         q8hJFP5rmQgAoYOUXolTiQmWipJTdMG/VZ5X7mL8JiBWAQ11K1o01cZCMlziyHnJ
-         xJ6Mqjb6wAFpYBtqysJG/vfjc/XEoKgfFs7+zcuEnt41xJQ6tl/L0VTxs+tEwjZu
-         Rp/owB9GCkqN9+xNEnlH77TLW1UisW+l0F8CJ2WFOj4lk9rcXcLlEdGmXfWIlVCb
-         2/o0DD+HDNsF8nWHpDEy0mcajkgIUTvXQaDXKbccX6Wgep8dyBP7YucGmRPd9Z6H
-         bGeT3KvlJlH5kthQ9shsmT14gYwGMR6rKpNUXmlpetkjqUK7pGVaHGgJWUZ9QPGU
-         awwPdWWvZSyXJAPZ9lC5sTKwMJDwIxILug==
-         =lAie
-         -----END PGP PUBLIC KEY BLOCK-----";
-
-    // Provide some context.
-    let ctx = core::Context::new()?;
-
-    // Parse Cert.
-    let cert = openpgp::Cert::from_bytes(cert)?;
-
-    // Open a mapping.
-    let mapping =
-        store::Mapping::open(&ctx, store::REALM_CONTACTS, "default")?;
-
-    // Store the Cert.
-    mapping.import("Ἀριστοτέλης", &cert)?;
-
-    // Now let's get it back.
-    let cert_ = mapping.lookup("Ἀριστοτέλης")?.cert()?;
-    assert_eq!(cert.fingerprint(), cert_.fingerprint());
-
-    Ok(())
-}
diff --git a/openpgp/tests/data/armor/README b/openpgp/tests/data/armor/README
index 4f28345a..7a734330 100644
--- a/openpgp/tests/data/armor/README
+++ b/openpgp/tests/data/armor/README
@@ -4,7 +4,7 @@ This directory contains test vectors for the armor module.
 
 These files are generated using:
 
-  (cd ../../../.. && cargo build -p openpgp --example wrap-literal)
+  (cd ../../../.. && cargo build -p sequoia-openpgp --example wrap-literal)
   for n in 0 1 2 3 47 48 49 50 51
   do
     dd if=/dev/urandom bs=1 count=$n \
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 2b764c9e..00000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//! A modular OpenPGP implementation.
-//!
-//! Sequoia consists of several modules.  This crate conveniently
-//! re-exports the other crates.
-//!
-//! # Example
-//!
-//! ```
-//! use std::io::Read;
-//! extern crate sequoia_openpgp as openpgp;
-//! # use std::io::Result;
-//! # fn main() { f().unwrap(); }
-//! # fn f() -> Result<()> {
-//!
-//! let mut reader = openpgp::armor::Reader::from_bytes(
-//!    b"-----BEGIN PGP ARMORED FILE-----
-//!
-//!      SGVsbG8gd29ybGQh
-//!      =s4Gu
-//!      -----END PGP ARMORED FILE-----", None);
-//!
-//! let mut content = String::new();
-//! reader.read_to_string(&mut content)?;
-//! assert_eq!(content, "Hello world!");
-//! # Ok(())
-//! # }
-//! ```
-
-// XXX: It would be nice to re-export the macros too.
-pub extern crate sequoia_openpgp as openpgp;
-pub extern crate sequoia_core as core;
-pub extern crate sequoia_net as net;
-pub extern crate sequoia_store as store;
-
-