From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 8 Jun 2019 09:17:31 +0000 (+0200)
Subject: app-portage/portage-utils: don't use mirror://, fix some SLOT deps
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0395c9b00ce9c7482227c18c9fa0b5f7b172a90;p=gentoo.git

app-portage/portage-utils: don't use mirror://, fix some SLOT deps

Closes: https://bugs.gentoo.org/687616
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
---

diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild
index 754e9aafaac0..5456dfedb80e 100644
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild
@@ -14,8 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -33,15 +32,15 @@ RDEPEND="
 			app-crypt/libb2:=[static-libs]
 			!libressl? ( dev-libs/openssl:0=[static-libs] )
 			libressl? ( dev-libs/libressl:0=[static-libs] )
-			sys-libs/zlib[static-libs]
-			app-crypt/gpgme[static-libs]
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
-			app-crypt/libb2
+			app-crypt/libb2:=
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
-			sys-libs/zlib
-			app-crypt/gpgme
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
 		)
 	)
 "
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index d116c33af568..ba0d7c726581 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -14,8 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -33,15 +32,15 @@ RDEPEND="
 			app-crypt/libb2:=[static-libs]
 			!libressl? ( dev-libs/openssl:0=[static-libs] )
 			libressl? ( dev-libs/libressl:0=[static-libs] )
-			sys-libs/zlib[static-libs]
-			app-crypt/gpgme[static-libs]
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
 		)
 		!static? (
-			app-crypt/libb2
+			app-crypt/libb2:=
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
-			sys-libs/zlib
-			app-crypt/gpgme
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
 		)
 	)
 "