From ccbfbff3ffb51a9e7783458c9dad3e6d2cb49e29 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 28 Dec 2019 10:42:05 +0100
Subject: app-portage/portage-utils-0.83: version bump with bugfixes

Drop overshadowed testing versions.

Closes: https://bugs.gentoo.org/701968
Closes: https://bugs.gentoo.org/701470
Bug: https://bugs.gentoo.org/701402
Closes: https://bugs.gentoo.org/701392
Closes: https://bugs.gentoo.org/701386
Closes: https://bugs.gentoo.org/700850
Closes: https://bugs.gentoo.org/699558
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
 app-portage/portage-utils/Manifest                 |  3 +-
 .../portage-utils/portage-utils-0.74-r1.ebuild     | 38 ----------
 .../portage-utils/portage-utils-0.81.ebuild        | 87 ----------------------
 .../portage-utils/portage-utils-0.82.ebuild        | 87 ----------------------
 .../portage-utils/portage-utils-0.83.ebuild        | 87 ++++++++++++++++++++++
 5 files changed, 88 insertions(+), 214 deletions(-)
 delete mode 100644 app-portage/portage-utils/portage-utils-0.74-r1.ebuild
 delete mode 100644 app-portage/portage-utils/portage-utils-0.81.ebuild
 delete mode 100644 app-portage/portage-utils/portage-utils-0.82.ebuild
 create mode 100644 app-portage/portage-utils/portage-utils-0.83.ebuild

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ad443655e1b2..12b03547c1fa 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,4 +1,3 @@
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
-DIST portage-utils-0.81.tar.xz 1763088 BLAKE2B 1fa40950f9deff721ebfd8f3dc06a1ec99e1f5c1e8bce7cb20120feef4d0789f6ff02dac43fae84d9d554d9b9867423db43a0e7cb7a6070a60cb0619f36547ad SHA512 d9fa971e27aa8a58d4278cea8e9ec238f92d03e51f44b7124f51289613800790dcd5a0c886c3930dd89abd8cd032d0cfd05723e12ba7e2403a85a2d72b359ce1
-DIST portage-utils-0.82.tar.xz 1768888 BLAKE2B 27ef8a3835eab54be3e06e48496c5c3e1f2e89f350b80dc52c1e7615c3b2e0c1a5d771d070071057d6c308981f29e8e9d79739184596d3eb2d38a03b162fddf6 SHA512 dc4b452f7b8b0c81e7dbb1ba02984fb45e6cb3588525a2b464519c80f9287fc270ee9eeb4d097e6a96f2f2f06c73b1fe89cb0b01b0cae82b099aaf2326aca2a0
+DIST portage-utils-0.83.tar.xz 1770648 BLAKE2B ba545782afd17e4a250ac9fb7fe621bfdbc236976cc1e186a05bf73d8aa443590e2e17bb2894b4944a19014bce6304140739f94566c52da6c0200260f7c57f36 SHA512 80e127e20f495a805ed1857edadc9ef695031c76a626aa0c52647e342216a8a91a5f473428eb1c760c1af961d62e433f0819c48eeb03f8f7e5a6057374253ec7
diff --git a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild b/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
deleted file mode 100644
index 0f7b316377f7..000000000000
--- a/app-portage/portage-utils/portage-utils-0.74-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	static? ( dev-libs/iniparser:0[static-libs] )"
-
-PATCHES=( "${FILESDIR}"/${P}-qdepends-Q-regex.patch )
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf --with-eprefix="${EPREFIX}"
-	else
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake NLS=$(usex nls) STATIC=$(usex static)
-}
diff --git a/app-portage/portage-utils/portage-utils-0.81.ebuild b/app-portage/portage-utils/portage-utils-0.81.ebuild
deleted file mode 100644
index a898b264573d..000000000000
--- a/app-portage/portage-utils/portage-utils-0.81.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			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]
-		)
-		!static? (
-			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
-
-pkg_postinst() {
-	local pvr
-	local doshow=
-	for pvr in ${REPLACING_VERSIONS} ; do
-		[[ ${pvr} != "0.8"[01]* ]] && doshow=true
-	done
-
-	if [[ ${doshow} == true ]] ; then
-		elog "This version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.82.ebuild b/app-portage/portage-utils/portage-utils-0.82.ebuild
deleted file mode 100644
index 489d1d862b19..000000000000
--- a/app-portage/portage-utils/portage-utils-0.82.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and fast Portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static openmp +qmanifest +qtegrity libressl"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
-else
-	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-RDEPEND="
-	static? ( dev-libs/iniparser:0[static-libs] )
-	!static? ( dev-libs/iniparser:0 )
-	qmanifest? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			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]
-		)
-		!static? (
-			app-crypt/libb2:=
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			sys-libs/zlib:=
-			app-crypt/gpgme:=
-		)
-	)
-	qtegrity? (
-		openmp? (
-			|| (
-				>=sys-devel/gcc-4.2:*[openmp]
-				sys-devel/clang-runtime:*[openmp]
-			)
-		)
-		static? (
-			!libressl? ( dev-libs/openssl:0=[static-libs] )
-			libressl? ( dev-libs/libressl:0=[static-libs] )
-		)
-		!static? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--with-eprefix="${EPREFIX}" \
-		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
-		$(use_enable openmp) \
-		$(use_enable static)
-}
-
-pkg_postinst() {
-	local pvr
-	local doshow=
-	for pvr in ${REPLACING_VERSIONS} ; do
-		[[ ${pvr} != "0.8"[012]* ]] && doshow=true
-	done
-
-	if [[ ${doshow} == true ]] ; then
-		elog "This version of Portage utils has undergone significant changes."
-		elog "Please read the elog manpages for applets like qlop(1) and"
-		elog "qfile(1) where argument options have changed."
-	fi
-}
diff --git a/app-portage/portage-utils/portage-utils-0.83.ebuild b/app-portage/portage-utils/portage-utils-0.83.ebuild
new file mode 100644
index 000000000000..489d1d862b19
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.83.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+	static? ( dev-libs/iniparser:0[static-libs] )
+	!static? ( dev-libs/iniparser:0 )
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			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]
+		)
+		!static? (
+			app-crypt/libb2:=
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
+
+pkg_postinst() {
+	local pvr
+	local doshow=
+	for pvr in ${REPLACING_VERSIONS} ; do
+		[[ ${pvr} != "0.8"[012]* ]] && doshow=true
+	done
+
+	if [[ ${doshow} == true ]] ; then
+		elog "This version of Portage utils has undergone significant changes."
+		elog "Please read the elog manpages for applets like qlop(1) and"
+		elog "qfile(1) where argument options have changed."
+	fi
+}
-- 
cgit v1.2.3-65-gdbad