gentoo resync : 24.12.2018

7 files changed, 13 insertions, 247 deletions

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 5764d4750f7e..8daeddd743fd 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,10 +1,7 @@
-DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
 DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
-EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
-EBUILD eix-0.33.2-r1.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
-EBUILD eix-0.33.2.ebuild 2795 BLAKE2B c490432dce6040986795e37744569cf27d320e9a0e066f5998960eded9cbd17e443786eb4346463d4d8d852765ff8791856951c109a514d7a0b6568bb7888571 SHA512 bc901e7e995bde5142988d6bf7ff4031fd3c895684e10db8249e7c723f39d9de4bb948d369da252aaa9b6378fa42318b66be177df6124ef79d9bf7094c762bfe
-EBUILD eix-0.33.5.ebuild 2803 BLAKE2B a8217bb65f047590307aa403e54396ba55f4d2aad98b58d9452bb9e855e7edad327c66b6816e243f911d32dfe335900dcd174be3fcb4160d63221d56ec840cac SHA512 48cfb75718d8021014d94d9bb1291e47d8a1eced46932262f70fe53a9e3acea80ee3f87d1f73af259ad158bc366cd2000b194ab74fa6d62d584370244cc16870
-EBUILD eix-0.33.6.ebuild 2800 BLAKE2B f23daa963d486af806ccb9fefad94164bb299071b6df49b8f122ebdcbf0c228888da359d3185d7962f69e1c2b084cc6019ced705528f814bf04a5a39992b3a59 SHA512 b53472ef80af890d9822d32ed890d62962fac175f2eb19da716426d2b159629d96758bc92110502b01201347d3449416a678527dc18b968c472fb1ec1e15c83c
-MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
+EBUILD eix-0.33.2.ebuild 2646 BLAKE2B 3ad92e6cdac3d31adb3c8a3a914030265659a73322fbdadb0ae211bd0312685b1969f09c3af73239ddf2acd566922f86dae629c54c570f703a36e232805fc2bd SHA512 88ed2a920e0d5cc6e8d633f21b3990045a1b70453dd858902f82b84474bd2b3e4fb3e58748983c0c9dc74086b9f7deb278fdf6afa9188027cb18062b71452c18
+EBUILD eix-0.33.5.ebuild 2647 BLAKE2B 154fa5064cb7525cd40ef14243391b15912498efa029835b75ce045bcafcc4590c9e16b854c58a255eee0dda989cb3a12a000edd64df7b521c25792edbc31842 SHA512 9fec63ff1a58eab93b7d52b76caccf2a1635a482fb4eeb28c173ca5e64c88a21e6b12a968ede6d52354a1640274a74f341d5e00a4edb12ffe7e6cea67ecb3083
+EBUILD eix-0.33.6.ebuild 2654 BLAKE2B 2923f5cf4b6db39cb1007e8b7b531c883ed02523afe53fefa4653e0e30ab2cbcc30f5d35c84dd07d347b85a894ce362410893b9db5d4204f1a9c506e2f0c963e SHA512 5445aae967a808d08b888f95be38df115c6db0f993dfad69f52eb480f5cbde14ffe670778412cd7a1edb6a773050e19f00def9fc2aa2b746abf36ebeb8116245
+MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
deleted file mode 100644
index e8dd7466f598..000000000000
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 systemd flag-o-matic
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoicasserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++11
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	systemd_dotmpfilesd tmpfiles.d/eix.conf
-
-	insinto /usr/share/${PN}
-	doins "${ED}"/usr/bin/eix-functions.sh
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-
-	keepdir /var/cache/eix
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
-		chown portage:portage "${EROOT%/}"/var/cache/eix || die
-	fi
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.33.2-r1.ebuild b/app-portage/eix/eix-0.33.2-r1.ebuild
deleted file mode 100644
index 507d7acf722a..000000000000
--- a/app-portage/eix/eix-0.33.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
-
-	keepdir /var/cache/eix
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
-		tmpfiles_process eix.conf
-	fi
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
index 4efb8b39b3c2..35f1e69f4cdb 100644
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild
index 507d7acf722a..dcde53139623 100644
--- a/app-portage/eix/eix-0.33.5.ebuild
+++ b/app-portage/eix/eix-0.33.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/eix-0.33.6.ebuild b/app-portage/eix/eix-0.33.6.ebuild
index 22862304f235..6591a20647ea 100644
--- a/app-portage/eix/eix-0.33.6.ebuild
+++ b/app-portage/eix/eix-0.33.6.ebuild
@@ -86,15 +86,10 @@ src_install() {
 
 	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
-	keepdir /var/cache/eix
 }
 
 pkg_postinst() {
-	if ! use prefix; then
-		# note: if this is done in src_install(), portage:portage
-		# ownership may be reset to root
 		tmpfiles_process eix.conf
-	fi
 
 	local obs=${EROOT%/}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index f07795f51987..acc485463b42 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
   </maintainer>
   <maintainer type="person">
     <email>martin@mvath.de</email>