gentoo resync : 14.07.2018

5 files changed, 174 insertions, 0 deletions

diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
new file mode 100644
index 000000000000..d2410c218520
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -0,0 +1,6 @@
+AUX pkgconfig-openbsd-20130507-zap-warning.patch 525 BLAKE2B 7da7e41a0ad141df1df0a291a87c9ec874dc279613649afa33825f1d3b1149e843ea5686621da50ffae9ca337cfdc0026475f017a2f68b4d44ca3582b340f91e SHA512 984d662b5918a4a0f1bc75cee538f8414ca431a6e3132b74f86a2e3ef538479b7966042f414a103393a78ff236a78eb5aeef0107c16493ffe86f3c66cc64f791
+DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
+DIST pkgconfig-openbsd-20130507.tar.xz 10876 BLAKE2B 38beb8dfe17742fe83d57e62d5898de1d6d029ec5bf4caa5d16edb317e179e45fc6bf3c5d7bd56792b5e774ebc53d7cb51a721abd62753f67b1cd5cb76bdfb1a SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69
+EBUILD pkgconfig-openbsd-20130507-r1.ebuild 1719 BLAKE2B b17123ea49628de44d728108ee8ddd125c77dd4d808acfef2e6bc82e897c5189e28f719409a2376970e3cf60267c1def5d76e643acd0d226c338d8ec4e3573d0 SHA512 8a5bcb1bc6d16ada5f7b3b913e8c3eafaead8a17b15de12e90c3422127e0f93a728cc344d5444e66f0ccffe5b12b361f44b6e63816bc1d2ecd0fe1e18eff37c9
+EBUILD pkgconfig-openbsd-20130507-r2.ebuild 1765 BLAKE2B 76fd533299735c8aa83a3a0fe60975b7c93fc48f300e6f49fb048c2516e736bb3d5ca2e41c14507391b2202c22178f6c2f930ff8e8e694e8754162e1dbc0438f SHA512 71e2cea8ef068c4e0b6f81796529f6c6be6db03264621a3a7b676f311697d606a53554f07e6132626f8955757f9bef585ee88d6c8f6dcc1b551edd13d417120b
+MISC metadata.xml 250 BLAKE2B a66f2f22e145fed3677b05a9dc47b3741005d8b172cddd357cc76cc608f3ec918bc23fde06d723606086f246fe414c2231bd3483b9c523b9f699a699c21dc2e5 SHA512 57c5d6cefedd04f50e461d73db25c3166735de76c6500985888a13fe3c23cb44b3e17b046d53376192abe8924257b8bd97c14934a2d24c7df29298660998e7c9
diff --git a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch b/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
new file mode 100644
index 000000000000..41784c919e19
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
@@ -0,0 +1,19 @@
+Use of $_ produces warnings which can cause build failures in certain consumers.
+
+Backported from revision 1.4 upstream (http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm).
+
+Gentoo-bug: 538012
+Gentoo-bug: 545314
+Gentoo-bug: 545322
+Gentoo-bug: 545962
+
+--- a/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
++++ b/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
+@@ -91,7 +91,6 @@
+ {
+ 	my ($class, $fh, $name) = @_;
+ 	my $cfg = $class->new;
+-	my $_;
+ 
+ 	$name = '' if !defined $name;
+ 	while (<$fh>) {
diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
new file mode 100644
index 000000000000..1632dc7b3fb8
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
new file mode 100644
index 000000000000..ff2fbadd47bb
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils multilib perl-module multilib-minimal
+
+# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
+
+PKG_M4_VERSION=0.28
+
+DESCRIPTION="A perl based version of pkg-config from OpenBSD"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
+SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
+	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pkg-config"
+
+RDEPEND="virtual/perl-Getopt-Long
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkgconf[pkg-config]
+	)"
+
+S=${WORKDIR}/src
+
+src_prepare() {
+	epatch_user
+	ecvs_clean
+
+	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
+	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
+	else
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
+	fi
+}
+
+multilib_src_install() {
+	local pc_bin=pkg-config
+	use pkg-config || pc_bin+=-openbsd
+
+	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
+	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
+
+	# insert proper paths
+	local pc_paths=(
+		/usr/$(get_libdir)/pkgconfig
+		/usr/share/pkgconfig
+	)
+	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
+		"${ED%/}/usr/bin/${pc_bin}" || die
+}
+
+multilib_src_install_all() {
+	if use pkg-config; then
+		insinto /usr/share/aclocal
+		doins "${WORKDIR}"/pkg-config-*/pkg.m4
+	fi
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"
+	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
+}
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
new file mode 100644
index 000000000000..e47abefe3039
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils multilib perl-module multilib-minimal
+
+# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
+
+PKG_M4_VERSION=0.28
+
+DESCRIPTION="A perl based version of pkg-config from OpenBSD"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
+SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
+	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pkg-config"
+
+RDEPEND="virtual/perl-Getopt-Long
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkgconf[pkg-config]
+	)"
+
+S=${WORKDIR}/src
+
+src_prepare() {
+	epatch_user
+	ecvs_clean
+
+	epatch "${FILESDIR}/${P}-zap-warning.patch"
+
+	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
+	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
+	else
+		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
+	fi
+}
+
+multilib_src_install() {
+	local pc_bin=pkg-config
+	use pkg-config || pc_bin+=-openbsd
+
+	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
+	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
+
+	# insert proper paths
+	local pc_paths=(
+		/usr/$(get_libdir)/pkgconfig
+		/usr/share/pkgconfig
+	)
+	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
+		"${ED%/}/usr/bin/${pc_bin}" || die
+}
+
+multilib_src_install_all() {
+	if use pkg-config; then
+		insinto /usr/share/aclocal
+		doins "${WORKDIR}"/pkg-config-*/pkg.m4
+	fi
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"
+	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
+}