5 files changed, 4 insertions, 139 deletions
diff --git a/security/rubygem-gpgme/Makefile b/security/rubygem-gpgme/Makefile
index 01afb9d78c35..edc525455b78 100644
--- a/security/rubygem-gpgme/Makefile
+++ b/security/rubygem-gpgme/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gpgme
-PORTVERSION=	2.0.24
-PORTREVISION=	2
+PORTVERSION=	2.0.25
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
diff --git a/security/rubygem-gpgme/distinfo b/security/rubygem-gpgme/distinfo
index d759a77b3ae6..86f7c7605002 100644
--- a/security/rubygem-gpgme/distinfo
+++ b/security/rubygem-gpgme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708450562
-SHA256 (rubygem/gpgme-2.0.24.gem) = 53eccd7042abb4fd5c78f30bc9ed075b1325e6450eab207f2f6a1e7e28ae3b64
-SIZE (rubygem/gpgme-2.0.24.gem) = 3498496
+TIMESTAMP = 1753796218
+SHA256 (rubygem/gpgme-2.0.25.gem) = 9242408b28720513145deb6150f25f5fe5149f3728ebaea635050cc3fc84dc34
+SIZE (rubygem/gpgme-2.0.25.gem) = 3160064
diff --git a/security/rubygem-gpgme/files/patch-ext_gpgme_extconf.rb b/security/rubygem-gpgme/files/patch-ext-gpgme-extconf.rb
index e0a3bbcbbf76..e0a3bbcbbf76 100644
--- a/security/rubygem-gpgme/files/patch-ext_gpgme_extconf.rb
+++ b/security/rubygem-gpgme/files/patch-ext-gpgme-extconf.rb
diff --git a/security/rubygem-gpgme/files/patch-ext_gpgme_gpgme__n.c b/security/rubygem-gpgme/files/patch-ext_gpgme_gpgme__n.c
deleted file mode 100644
index d0c71e09bb17..000000000000
--- a/security/rubygem-gpgme/files/patch-ext_gpgme_gpgme__n.c
+++ /dev/null
@@ -1,59 +0,0 @@
-The trustlist feature, which only worked for a short period in 2003, was
-removed in GpgME 2.0.0.
-
-The gpgme_attr_t enums and their functions, which have been marked deprecated
-since 2003, were removed in GpgME 2.0.0.
-
---- ext/gpgme/gpgme_n.c.orig	2025-06-23 05:28:53 UTC
-+++ ext/gpgme/gpgme_n.c
-@@ -1633,6 +1633,7 @@ rb_s_gpgme_op_card_edit_start (VALUE dummy, VALUE vctx
-   return LONG2NUM(err);
- }
- 
-+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER < 0x020000
- static VALUE
- rb_s_gpgme_op_trustlist_start (VALUE dummy, VALUE vctx, VALUE vpattern,
-                                VALUE vmax_level)
-@@ -1696,6 +1697,7 @@ rb_s_gpgme_op_trustlist_end (VALUE dummy, VALUE vctx)
-   err = gpgme_op_trustlist_end (ctx);
-   return LONG2NUM(err);
- }
-+#endif
- 
- static VALUE
- rb_s_gpgme_op_decrypt (VALUE dummy, VALUE vctx, VALUE vcipher, VALUE vplain)
-@@ -2558,13 +2560,15 @@ Init_gpgme_n (void)
-   rb_define_module_function (mGPGME, "gpgme_op_card_edit_start",
-                              rb_s_gpgme_op_card_edit_start, 5);
- 
--  /* Trust Item Management */
-+  /* Trust Item Management removed in 2.0.0 */
-+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER < 0x020000
-   rb_define_module_function (mGPGME, "gpgme_op_trustlist_start",
-                              rb_s_gpgme_op_trustlist_start, 3);
-   rb_define_module_function (mGPGME, "gpgme_op_trustlist_next",
-                              rb_s_gpgme_op_trustlist_next, 2);
-   rb_define_module_function (mGPGME, "gpgme_op_trustlist_end",
-                              rb_s_gpgme_op_trustlist_end, 1);
-+#endif
- 
-   /* Decrypt */
-   rb_define_module_function (mGPGME, "gpgme_op_decrypt",
-@@ -2805,7 +2809,8 @@ Init_gpgme_n (void)
-   rb_define_const (mGPGME, "GPGME_SIG_MODE_CLEAR",
-                    INT2FIX(GPGME_SIG_MODE_CLEAR));
- 
--  /* gpgme_attr_t */
-+  /* gpgme_attr_t removed in 2.0.0 */
-+#if defined(GPGME_VERSION_NUMBER) && GPGME_VERSION_NUMBER < 0x020000
-   rb_define_const (mGPGME, "GPGME_ATTR_KEYID",
-                    INT2FIX(GPGME_ATTR_KEYID));
-   rb_define_const (mGPGME, "GPGME_ATTR_FPR",
-@@ -2868,6 +2873,7 @@ Init_gpgme_n (void)
-                    INT2FIX(GPGME_ATTR_ERRTOK));
-   rb_define_const (mGPGME, "GPGME_ATTR_SIG_SUMMARY",
-                    INT2FIX(GPGME_ATTR_SIG_SUMMARY));
-+#endif
- 
-   /* gpgme_validity_t */
-   rb_define_const (mGPGME, "GPGME_VALIDITY_UNKNOWN",
diff --git a/security/rubygem-gpgme/files/patch-lib_gpgme_constants.rb b/security/rubygem-gpgme/files/patch-lib_gpgme_constants.rb
deleted file mode 100644
index 19766f99d845..000000000000
--- a/security/rubygem-gpgme/files/patch-lib_gpgme_constants.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-The gpgme_attr_t enums and their functions, which have been marked deprecated
-since 2003, were removed in GpgME 2.0.0.
-
---- lib/gpgme/constants.rb.orig	2025-06-23 05:42:19 UTC
-+++ lib/gpgme/constants.rb
-@@ -1,36 +1,38 @@ module GPGME
- module GPGME
- 
--  ATTR_ALGO = GPGME_ATTR_ALGO
--  ATTR_CAN_CERTIFY = GPGME_ATTR_CAN_CERTIFY
--  ATTR_CAN_ENCRYPT = GPGME_ATTR_CAN_ENCRYPT
--  ATTR_CAN_SIGN = GPGME_ATTR_CAN_SIGN
--  ATTR_CHAINID = GPGME_ATTR_CHAINID
--  ATTR_COMMENT = GPGME_ATTR_COMMENT
--  ATTR_CREATED = GPGME_ATTR_CREATED
--  ATTR_EMAIL = GPGME_ATTR_EMAIL
--  ATTR_ERRTOK = GPGME_ATTR_ERRTOK
--  ATTR_EXPIRE = GPGME_ATTR_EXPIRE
--  ATTR_FPR = GPGME_ATTR_FPR
--  ATTR_ISSUER = GPGME_ATTR_ISSUER
--  ATTR_IS_SECRET = GPGME_ATTR_IS_SECRET
--  ATTR_KEYID = GPGME_ATTR_KEYID
--  ATTR_KEY_CAPS = GPGME_ATTR_KEY_CAPS
--  ATTR_KEY_DISABLED = GPGME_ATTR_KEY_DISABLED
--  ATTR_KEY_EXPIRED = GPGME_ATTR_KEY_EXPIRED
--  ATTR_KEY_INVALID = GPGME_ATTR_KEY_INVALID
--  ATTR_KEY_REVOKED = GPGME_ATTR_KEY_REVOKED
--  ATTR_LEN = GPGME_ATTR_LEN
--  ATTR_LEVEL = GPGME_ATTR_LEVEL
--  ATTR_NAME = GPGME_ATTR_NAME
--  ATTR_OTRUST = GPGME_ATTR_OTRUST
--  ATTR_SERIAL = GPGME_ATTR_SERIAL
--  ATTR_SIG_STATUS = GPGME_ATTR_SIG_STATUS
--  ATTR_SIG_SUMMARY = GPGME_ATTR_SIG_SUMMARY
--  ATTR_TYPE = GPGME_ATTR_TYPE
--  ATTR_UID_INVALID = GPGME_ATTR_UID_INVALID
--  ATTR_UID_REVOKED = GPGME_ATTR_UID_REVOKED
--  ATTR_USERID = GPGME_ATTR_USERID
--  ATTR_VALIDITY = GPGME_ATTR_VALIDITY
-+  if defined?(GPGME_ATTR_ALGO)
-+    ATTR_ALGO = GPGME_ATTR_ALGO
-+    ATTR_CAN_CERTIFY = GPGME_ATTR_CAN_CERTIFY
-+    ATTR_CAN_ENCRYPT = GPGME_ATTR_CAN_ENCRYPT
-+    ATTR_CAN_SIGN = GPGME_ATTR_CAN_SIGN
-+    ATTR_CHAINID = GPGME_ATTR_CHAINID
-+    ATTR_COMMENT = GPGME_ATTR_COMMENT
-+    ATTR_CREATED = GPGME_ATTR_CREATED
-+    ATTR_EMAIL = GPGME_ATTR_EMAIL
-+    ATTR_ERRTOK = GPGME_ATTR_ERRTOK
-+    ATTR_EXPIRE = GPGME_ATTR_EXPIRE
-+    ATTR_FPR = GPGME_ATTR_FPR
-+    ATTR_ISSUER = GPGME_ATTR_ISSUER
-+    ATTR_IS_SECRET = GPGME_ATTR_IS_SECRET
-+    ATTR_KEYID = GPGME_ATTR_KEYID
-+    ATTR_KEY_CAPS = GPGME_ATTR_KEY_CAPS
-+    ATTR_KEY_DISABLED = GPGME_ATTR_KEY_DISABLED
-+    ATTR_KEY_EXPIRED = GPGME_ATTR_KEY_EXPIRED
-+    ATTR_KEY_INVALID = GPGME_ATTR_KEY_INVALID
-+    ATTR_KEY_REVOKED = GPGME_ATTR_KEY_REVOKED
-+    ATTR_LEN = GPGME_ATTR_LEN
-+    ATTR_LEVEL = GPGME_ATTR_LEVEL
-+    ATTR_NAME = GPGME_ATTR_NAME
-+    ATTR_OTRUST = GPGME_ATTR_OTRUST
-+    ATTR_SERIAL = GPGME_ATTR_SERIAL
-+    ATTR_SIG_STATUS = GPGME_ATTR_SIG_STATUS
-+    ATTR_SIG_SUMMARY = GPGME_ATTR_SIG_SUMMARY
-+    ATTR_TYPE = GPGME_ATTR_TYPE
-+    ATTR_UID_INVALID = GPGME_ATTR_UID_INVALID
-+    ATTR_UID_REVOKED = GPGME_ATTR_UID_REVOKED
-+    ATTR_USERID = GPGME_ATTR_USERID
-+    ATTR_VALIDITY = GPGME_ATTR_VALIDITY
-+  end
-   DATA_ENCODING_ARMOR = GPGME_DATA_ENCODING_ARMOR
-   DATA_ENCODING_BASE64 = GPGME_DATA_ENCODING_BASE64
-   DATA_ENCODING_BINARY = GPGME_DATA_ENCODING_BINARY