gentoo resync : 28.04.2019

5 files changed, 2 insertions, 255 deletions

diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index 375db4c5f531..6c0121cba2e8 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,6 +1,3 @@
-AUX fontconfig.eselect-1.0 4394 BLAKE2B 47b3570309471efbe4c0c5bfe64949a2933ff6067fe2766e03eccd3b2de6ea044debbe3de92ca6384db76ee9d25d8a541be9a1e65e24b7e0c468e6cf0fca1d9e SHA512 5ca29ddbb672193eac8edc1acdefee0f7924aaba23d8ce40317d3dacd339e820462382d3fdf233c2cf4e4b258a2956e7b86ec6f4f541876789ab234aeaa81f42
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.0.ebuild 547 BLAKE2B b70e0ed2e214ebd2d1cce70b0973ab1e0dee2f69d0b2f04676d1c691972f7d62a6d811ebabb7cadd214201ba0bcd17dc4c644070234b5687c23c56efd4dc6572 SHA512 db69bba98ea30fa5d61696e0ab25b74528c5c27a8410be24ed0efccc9955e7cec91f397b6c901c3f1300e80ce38b9c80c2f81e0a135f6233d8a8ef47f9ae7d83
-EBUILD eselect-fontconfig-1.1-r1.ebuild 754 BLAKE2B 6b262071275b4fe215ae7a113a6971c7ce491fd3384a289d1214620ae965377416aeeeec829e77d08e12c618f465d3537a718b397b5299978c1a6d0683eec73b SHA512 6a3d82fb5eae7f0b51b14e6c6119b6eab5eec80139701b84781d2d72c3f92369d5c32c9718fc1470243760fbfac0cdd56a88e6daeb4b334e165fe4d980bf6d87
-EBUILD eselect-fontconfig-1.1.ebuild 767 BLAKE2B d730bb072e7dfb81e9cf86d00b7f6f9a033496286cf4eb20fcec9c830ca6c427f072e221662a5bcbd57f1e960b93b61780d5daed8ba35f8ad59d6f96d33e42c3 SHA512 0dda75358d0a16579170859506e8cf878ffc3540d8e89009a492f5f3c2c6ad5b3c7f92244f3990e951a2ee15e8d49a2fc7e2b5c10be222794ffdc5d05e6b22b9
+EBUILD eselect-fontconfig-1.1-r1.ebuild 752 BLAKE2B 0d31c2c81f5d2deec41c30fe4eae7dc76ba04ed23ea0209878598a694c2676d9f4fce1021c7e91ca0ab1cc562f23513be10a3c4b7ac2786f516a4c0f21a35e25 SHA512 0b7c8221b60d4a10257162a9b9f14e6dc1c623a1868283895de2d2ac817c3384f37beabb141906d0c4ec450ea520fa860be74ac2a4d8bdfb628e4cd743d55922
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
deleted file mode 100644
index 38ec0133ff1c..000000000000
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-admin/eselect
-		>=media-libs/fontconfig-2.4"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/fontconfig.eselect-${PV}" fontconfig.eselect || die
-}
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index cd070c50051d..36fa78e814c3 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
deleted file mode 100644
index ca3f8310b31f..000000000000
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.3
-		 >=media-libs/fontconfig-2.4"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect || die
-}
diff --git a/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0 b/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0
deleted file mode 100644
index 0215fe300388..000000000000
--- a/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage fontconfig /etc/fonts/conf.d/ symlinks"
-MAINTAINER="fonts@gentoo.org"
-VERSION="1.0"
-
-find_targets() {
-	local targets bc x i=0
-	bcdirs[i]="${ROOT}/etc/fonts/conf.avail/*.conf"
-
-	if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
-		for x in ${ES_FONTCONFIG_DIRS} ; do
-			bcdirs[$((++i))]="${x}/*"
-		done
-	fi
-
-	for bc in ${bcdirs[@]} ; do
-		[[ -e ${bc} && ${bc} != *~ ]] && targets="${targets}\n$(basename ${bc})"
-	done
-
-	echo -ne ${targets} | sort -u
-}
-
-is_enabled() {
-	bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -e ${bcdir}/${1} ]] || return 1
-	return 0
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available fontconfig .conf files"
-}
-
-do_list() {
-	local opts
-	targets=( $(find_targets) )
-	write_list_start "Available fontconfig .conf files  ( $(highlight '*') is enabled ):"
-
-	if [[ -n "${targets[@]}" ]] ; then
-		for (( n = 0 ; n < ${#targets[@]} ; ++n )) ; do
-			is_enabled ${opts:-} ${targets[${n}]} && \
-				targets[${n}]="${targets[${n}]} $(highlight '*')"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-
-	return 0
-}
-
-### enable action ###
-
-describe_enable() {
-	echo "Enable specified fontconfig .conf file(s)"
-}
-
-describe_enable_parameters() {
-	echo "<target>"
-}
-
-describe_enable_options() {
-	echo "<target> : Target name or number (from 'list' action)"
-}
-
-do_enable() {
-	local bc bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -z ${1} ]] && die -q "You didn't specify any .conf files to enable"
-
-	# create directory if necessary
-	if [[ ! -d ${bcdir} && -w $(dirname ${bcdir}) ]] ; then
-		mkdir ${bcdir} || die -q "Failed to create ${bcdir}"
-	elif [[ ! -d ${bcdir} ]] ; then
-		die -q "You don't have permission to create ${bcdir}"
-	fi
-
-	# make sure we have proper permissions
-	[[ -w ${bcdir} ]] || \
-		die -q "You don't have permission to write to ${bcdir}"
-
-	targets=( $(find_targets) )
-
-	for bc in $@ ; do
-		local file target=${bc}
-
-		is_number "${target}" && \
-			target=${targets[$(( ${target} - 1 ))]}
-
-		[[ -z "${target}" ]] && \
-			die -q "Target \"${bc}\" doesn't appear to be valid!"
-
-		bc=${target}
-
-		# ignore any unrecognized options
-		[[ ${bc} == --* ]] && continue
-
-		# what form is the argument in?
-		case "${bc}" in
-			# absolute path
-			/*)
-				file="${ROOT}/${bc}"
-				;;
-			# relative path
-			*/*)
-				file="${ROOT}/${PWD}/${bc}"
-				;;
-			# no path
-			*)
-				# CWD
-				if [[ -f ${bc} ]] ; then
-					file="${ROOT}/${PWD}/${bc}"
-				# assume /etc/fonts/conf.avail
-				elif [[ -f ${ROOT}/etc/fonts/conf.avail/${bc} ]]
-				then
-					file="${ROOT}/etc/fonts/conf.avail/${bc}"
-				else
-					if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
-						for x in ${ES_FONTCONFIG_DIRS} ; do
-							[[ -f ${x}/${bc} ]] && file="${x}/${bc}"
-						done
-					fi
-
-					[[ -e ${file} ]] || \
-						file="${ROOT}/etc/fonts/conf.avail/${bc}"
-				fi
-				;;
-		esac
-
-		# does it exist?
-		if [[ ! -e ${file} ]] ; then
-			write_error_msg "${file} doesn't exist"
-			continue
-		fi
-
-		# already installed?
-		if [[ -e ${bcdir}/$(basename ${bc}) ]] ; then
-			write_error_msg "$(basename ${bc}) is already installed"
-			continue
-		fi
-
-		# finally, create the symlink
-		ln -s "${file}" "${bcdir}" || \
-			die -q "Failed to create symlink from '${file}' to '${bcdir}'"
-	done
-}
-
-### disable action ###
-
-describe_disable() {
-	echo "Disable specified fontconfig .conf file(s)"
-}
-
-describe_disable_parameters() {
-	echo "<target>"
-}
-
-describe_disable_options() {
-	echo "<target> : Target name or number (from 'list' action)"
-}
-
-
-do_disable() {
-	local bc bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -z ${1} ]] && die -q "You didn't specify any .conf files to disable"
-
-	targets=( $(find_targets) )
-
-	for bc in $@ ; do
-		local file target=${bc}
-
-		is_number "${target}" && \
-			target=${targets[$(( ${target} - 1 ))]}
-
-		[[ -z "${target}" ]] && \
-			die -q "Target \"${bc}\" doesn't appear to be valid!"
-
-		bc=${target}
-		file="${bcdir}/${bc}"
-
-		# ignore any unrecognized options
-		[[ ${bc} == --* ]] && continue
-
-		# is in installed?
-		if [[ ! -e ${file} ]] ; then
-			write_error_msg "${bc} is not installed"
-			continue
-		fi
-
-		# remove it if we have permissions
-		if [[ -w $(dirname ${file}) ]] ; then
-			rm "${file}" || die -q "Failed to remove ${file}"
-		else
-			die -q "You don't have permission to remove ${file}"
-		fi
-	done
-}
-
-# vim: set ft=eselect :