Latest version from upstream CVS; include /usr/lib32/pkgconfig, /usr/lib64/pkgconfig, /usr/share/pkgconfig to search paths.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 81 insertions, 9 deletions

diff --git a/dev-util/pkgconfig-openbsd/ChangeLog b/dev-util/pkgconfig-openbsd/ChangeLog
index 6f52fe134c1f..2f1fa1ba9271 100644
--- a/dev-util/pkgconfig-openbsd/ChangeLog
+++ b/dev-util/pkgconfig-openbsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/pkgconfig-openbsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v 1.12 2013/03/05 12:27:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v 1.13 2013/05/07 13:59:14 ssuominen Exp $
+
+*pkgconfig-openbsd-20130507 (07 May 2013)
+
+  07 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +pkgconfig-openbsd-20130507.ebuild:
+  Latest version from upstream CVS; include /usr/lib32/pkgconfig,
+  /usr/lib64/pkgconfig, /usr/share/pkgconfig to search paths.
 
   05 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
   pkgconfig-openbsd-20130225.ebuild:
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
index 5b4bd90757ed..3659a878414a 100644
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 DIST pkgconfig-openbsd-20130225.tar.xz 10140 SHA256 14e680a81d7214e80d4462f22049d0ff25a0cc130696c53ae9885cf0ea985847 SHA512 bf39abacc82bff8d17a128e7fc61106868f52c2e0b1b8ad1ae06848d3a8e9c369dfae7232c016e6c97e2747df88027ff95039247312f49ed03d1bd5d1fa1762c WHIRLPOOL e08a7d5f280a4d8a51beba2b3981862cac0db565810d7a1e48201b51a2884d924ff1d1ae222f2bf18c9ac4f051eabb4fe169df0cd6adc2ed28ad03445599af4a
+DIST pkgconfig-openbsd-20130507.tar.xz 10876 SHA256 ed43eef85e6f2fcee3eb02944b59cdacf29305507d4f168dc63c022a452869b8 SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69 WHIRLPOOL 607ab006bc262143ff4e87ccf72321f0217b7efba44f6b46efad34571d5324ba1fcb3a7142c75a002511fc6ba55ea2dbba16df383ca9fafbf52f38f308113f69
 EBUILD pkgconfig-openbsd-20130225.ebuild 1533 SHA256 b56ad10c2bde18ad43ca6fa7d3b895a83e398f788c62723b493f10689170c1a4 SHA512 4cc5e32390674fd648480b1e6b97c0ea6fdb735cbad73a8903d962e0b226c310c0a5a14c5432b9a2b7633f1e2684c829ae9d1ed48cef2efe88553684c8bba86f WHIRLPOOL 044f73dfdc70e45b557b7219911f1de9924b2c7b8ac328640b62d639703e78cb77afb00b1ffe9697a68212426d2a4c39f5fc07d3ddf689237c5bcf77b1f65f32
-MISC ChangeLog 2499 SHA256 08cac75ce7169569c0df626624f2cb298e782a7d006fb13a6aee5c40093301b7 SHA512 76a36c1ae0f00ed5d5b626746e2d1d230f51eeeca8cba00bc41e9b2b9ac972eb1f986d7a47bf0cc6d39ac1f177d14160bb6c2cf2178c80c3aea8d04bcb27feb4 WHIRLPOOL cf7a8f326f32499c8356353e1b0f693317e8b684c4a7b42a6a0e0b56e9ccd407976b0f90eaab667b830fe05afce0d99a1a1b0060c634c812e7b09b094184a8fd
+EBUILD pkgconfig-openbsd-20130507.ebuild 1705 SHA256 d7a544666c4518102bd793c8476cfe2fc3e9c9a2f4dfe302679b628462b613d5 SHA512 77b6072aa8e79b6a1c5a0d7a557deba4525a6a398f6cdc11a73f194612e66c1626e5e152256ab1b735dddfa892a0ea5734e0b11e73f9d71d87ce56f17e7b1f4d WHIRLPOOL e8309e518f5ab7dd5d9c1d5d7740cf1d2588f1632e58bad269a8f02266458a8356020cbc293ea68458d3a2c5f179303d8155d759dea64a9877ff38fbaa84f844
+MISC ChangeLog 2763 SHA256 a0b19cc012ac8cc3a27565e2d73b67b0d84e79af548ed9b6280189c1d5c31e29 SHA512 fe317331840ed0ffbcc79c2623d59afa583848e9bd3690c2290619f48e6e5fe682494d697fa0f74eb014b0f52c3b7ec4a78fc0dc28cd46b2cd198afd6721f3ca WHIRLPOOL c61c328f614636c118e4140044bb146ea348e521756e9778ea551d7e13cc098f7a60f49a7dc264574c84360613e8141d216b579279433643f553259e053521e4
 MISC metadata.xml 354 SHA256 c9627f768da21dddcc119335eb282801b3678a4730ba24211916a6fe921b74b3 SHA512 5be8992782ff7c59b2ed45e574db4221a0a54027a518dbc663124968e34a6e77f92ec622f8c31cc651d35a9b4eade65176056aea9de6c0c4985ec41434739853 WHIRLPOOL 31bf6bfdff0135eb634beb7685be70f38f5926f44f095786db1f6a41c6110b57a86febc898129124cf823b19c7913445411cdf5ba8d9cbefdec5f0727a2c2cef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRNeROAAoJEEdUh39IaPFN6JcH/28ca20UpzXMwBAvPUExMww1
-ILOSjB2zaRvBCdG9e3siiJX3ZQpbLCrDFemUg9o8KpzpzxCHBf6JtZQ1oFBQSddo
-cSD9E+zSZ7SAt7uJvT/aX2xo0FgDLS8JpP6zZ5KZ5A3h5JGVqjx+t5RiqeHjwIZD
-oy9PN6YvtUjuCF4Bj52Hs4b7IwnMZNgUzJltKyb+QUjUEdfsvfT4t5+BBvIfdmlx
-Ji6o/DO4yppi729j2zBkq6e2JTWlX7bulwfgHEvr2qrc3Iex7hrDGCO4dVxtR0we
-K4Am69A9F1bZrqMLpkKHiAImlFXF/qRpxop5CVJfqrkgK4RuAWWFujCwqmf00aY=
-=JY+V
+iQEcBAEBCAAGBQJRiQiZAAoJEEdUh39IaPFNSpoH/188IH1PaLIMSz9vCTl7+Thh
+grk3lsYR3MT7PROL9j85dqqSq941X/cw8Y06XXoNoki7JgiBwYt9PGdBwbIPQ7oq
+XiBQmIdI08jxGYpNrP9DQll/umYfZbzD6iE1fXobYIvOkvLls3qSI66LpnBVCzxh
+Tuaim7+GNbRfUkLne0++Wko+KRKjfZZ34SmBz2n/7nYbUTPuw8awwUcwoNS6A/HF
+yaEF1xIyaIFqRR219jn63eoTTtf+IaX99Z2C8tNWnJUJPyQzdEUbuFt5Hef4+4fj
+qD4EM33D8aAlobPAAy1YY1WGiTokEMWc97tEA/RLpOwT7AgCKQUK9W9q0JSsbt8=
+=VB/B
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507.ebuild
new file mode 100644
index 000000000000..3b27cbd0c2c4
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507.ebuild,v 1.1 2013/05/07 13:59:14 ssuominen Exp $
+
+EAPI=5
+
+# 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://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz
+	pkg-config? ( http://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pkg-config"
+
+DEPEND="
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkgconf[pkg-config]
+	)"
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/src
+
+src_prepare() {
+	# 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
+
+	sed -i \
+		-e 's:/usr/X11R6/lib/pkgconfig:/usr/share/pkgconfig:' \
+		-e 's:/usr/X11R6/share/pkgconfig:/usr/lib64/pkgconfig\n/usr/lib32/pkgconfig:' \
+		usr.bin/pkg-config/pkg-config || die
+}
+
+src_install() {
+	if use pkg-config; then
+		dobin usr.bin/pkg-config/pkg-config
+		doman usr.bin/pkg-config/pkg-config.1
+
+		insinto /usr/share/aclocal
+		doins "${WORKDIR}"/pkg-config-*/pkg.m4
+	else
+		newbin usr.bin/pkg-config/pkg-config pkg-config-openbsd
+		newman usr.bin/pkg-config/pkg-config.1 pkg-config-openbsd.1
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r usr.bin/pkg-config/OpenBSD
+
+	cat <<-EOF > "${T}"/99${PN}
+	COLON_SEPARATED=PERL5LIB
+	PERL5LIB=/usr/share/${PN}
+	EOF
+
+	doenvd "${T}"/99${PN}
+}