gnu: Remove gpgme-1.18 and qgpgme-1.18.

* gnu/packages/gnupg.scm (gpgme-1.18, qgpgme-1.18): Remove variables.
* gnu/packages/kde-pim.sm (kleopatra, kmail): Refer to gpgme and qgpgme instead.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>

gnu/packages/gnupg.scm

@@ -416,19 +416,6 @@ and every application benefits from this.")
     (properties '((ftp-server . "ftp.gnupg.org")
                   (ftp-directory . "/gcrypt/gpgme")))))
 
-;; TODO: Merge with gpgme in the next rebuild cycle.
-(define-public gpgme-1.18
-  (package
-    (inherit gpgme)
-    (version "1.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnupg/gpgme/gpgme-"
-                                  version ".tar.bz2"))
-              (sha256
-               (base32
-                "17hfigfnq6xz45b5xrp299f68b5mwx0aysd51sx5v4nf8yp4w79n"))))))
-
 (define-public qgpgme
   (package
     (inherit gpgme)
@@ -457,16 +444,6 @@ QGpgME was originally developed as part of libkleo and incorporated into
 gpgpme starting with version 1.7.")
     (license license:gpl2+))) ;; Note: this differs from gpgme
 
-;; TODO: Merge with qgpgme in the next rebuild cycle.
-(define-public qgpgme-1.18
-  (package
-    (inherit qgpgme)
-    (version (package-version gpgme-1.18))
-    (source (package-source gpgme-1.18))
-    (inputs
-     (modify-inputs (package-inputs qgpgme)
-       (replace "gpgme" gpgme-1.18)))))
-
 (define-public guile-gcrypt
   (package
     (name "guile-gcrypt")

gnu/packages/kde-pim.scm

@@ -1139,7 +1139,7 @@ protocol for querying and modifying directory services running over TCP/IP.")
            kdoctools))
     (inputs
      (list boost
-           gpgme-1.18
+           gpgme
            kcmutils
            kcodecs
            kconfig
@@ -1159,7 +1159,7 @@ protocol for querying and modifying directory services running over TCP/IP.")
            libassuan
            libkleo
            breeze-icons ;; default icon set
-           qgpgme-1.18
+           qgpgme
            qtbase-5))
     (arguments
      `(#:phases
@@ -1196,7 +1196,7 @@ and retrieving certificates from LDAP servers.")
            akonadi-mime
            akonadi-search
            boost
-           gpgme-1.18
+           gpgme
            grantlee
            grantleetheme
            kbookmarks
@@ -1243,7 +1243,7 @@ and retrieving certificates from LDAP servers.")
            libkleo
            libksieve
            breeze-icons ; default icon set, required for tests
-           qgpgme-1.18
+           qgpgme
            qtbase-5
            qtdeclarative-5
            qtkeychain