krb5: upgraded package to upstream
Upgraded virtual/krb5 to version 0-r1 on amd64, arm
Curl depends on krb5-0-r1 when built with kerberos.
BUG=chromium:1042641
TEST=curl with USE=kerberos emerges
Change-Id: Ief07519f9d4c3adf92ba4af1603b328a086a58a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2181262
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Andreea-Elena Costinas <acostinas@google.com>
Commit-Queue: Andreea-Elena Costinas <acostinas@google.com>
diff --git a/metadata/md5-cache/virtual/krb5-0 b/metadata/md5-cache/virtual/krb5-0
deleted file mode 100644
index ab1eaad..0000000
--- a/metadata/md5-cache/virtual/krb5-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Kerberos V implementation
-EAPI=3
-KEYWORDS=*
-RDEPEND=|| ( app-crypt/mit-krb5 app-crypt/heimdal )
-SLOT=0
-_md5_=8932bcb64ea912978b2904daf29b55f7
diff --git a/metadata/md5-cache/virtual/krb5-0-r1 b/metadata/md5-cache/virtual/krb5-0-r1
new file mode 100644
index 0000000..eeb95f0
--- /dev/null
+++ b/metadata/md5-cache/virtual/krb5-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Kerberos V implementation
+EAPI=5
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+RDEPEND=|| ( >=app-crypt/mit-krb5-1.12.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=app-crypt/heimdal-1.5.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
+SLOT=0
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build 1979aa0ff4d356d32507ca4650d9f37d toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
+_md5_=cbb53c7f17314deed87c39274ce34614
diff --git a/virtual/krb5/krb5-0-r1.ebuild b/virtual/krb5/krb5-0-r1.ebuild
new file mode 100644
index 0000000..db8e06b
--- /dev/null
+++ b/virtual/krb5/krb5-0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Kerberos V implementation"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+ || (
+ >=app-crypt/mit-krb5-1.12.1-r1[${MULTILIB_USEDEP}]
+ >=app-crypt/heimdal-1.5.3-r2[${MULTILIB_USEDEP}]
+ )"
diff --git a/virtual/krb5/krb5-0.ebuild b/virtual/krb5/krb5-0.ebuild
deleted file mode 100644
index a0f6bb0..0000000
--- a/virtual/krb5/krb5-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/krb5-0.ebuild,v 1.1 2011/03/13 03:38:23 eras Exp $
-
-EAPI=3
-
-DESCRIPTION="Virtual for Kerberos V implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( app-crypt/mit-krb5 app-crypt/heimdal )"
diff --git a/virtual/krb5/metadata.xml b/virtual/krb5/metadata.xml
index 9cc2325..b02e0ca 100644
--- a/virtual/krb5/metadata.xml
+++ b/virtual/krb5/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kerberos</herd>
+<maintainer type="project">
+ <email>kerberos@gentoo.org</email>
+ <name>Kerberos</name>
+</maintainer>
</pkgmetadata>
-
