Enable multilib support. Install to proper perl libdir.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 99 insertions, 12 deletions

diff --git a/dev-util/pkgconfig-openbsd/ChangeLog b/dev-util/pkgconfig-openbsd/ChangeLog
index ce77a4011d97..471e7278a6e3 100644
--- a/dev-util/pkgconfig-openbsd/ChangeLog
+++ b/dev-util/pkgconfig-openbsd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2013/05/07 14:01:46 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v 1.15 2014/03/30 11:11:13 mgorny Exp $
+
+*pkgconfig-openbsd-20130507-r1 (30 Mar 2014)
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org>
+  +pkgconfig-openbsd-20130507-r1.ebuild:
+  Enable multilib support. Install to proper perl libdir.
 
   07 May 2013; Samuli Suominen <ssuominen@gentoo.org>
   -pkgconfig-openbsd-20130225.ebuild:
@@ -70,4 +76,3 @@
   16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   +pkgconfig-openbsd-20120116.ebuild:
   Initial commit.
-
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
index e8aeb362d1df..e058700648e8 100644
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -3,17 +3,26 @@ Hash: SHA256
 
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 DIST pkgconfig-openbsd-20130507.tar.xz 10876 SHA256 ed43eef85e6f2fcee3eb02944b59cdacf29305507d4f168dc63c022a452869b8 SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69 WHIRLPOOL 607ab006bc262143ff4e87ccf72321f0217b7efba44f6b46efad34571d5324ba1fcb3a7142c75a002511fc6ba55ea2dbba16df383ca9fafbf52f38f308113f69
+EBUILD pkgconfig-openbsd-20130507-r1.ebuild 1916 SHA256 91cb8ab88e2f414aceb8239c45e0733ad7fa182dea3a84ea554604490999e6f0 SHA512 c9fea9526657a822a95de7c79c1d6a27f86191f110ba7990e454e8da2884cf40cd54cc45b16717f4a634af34cf33525b817001dcb9d2cd277a97f765ceb43b04 WHIRLPOOL 07aa4aa6b1db9174f25c91c076db696cf2225662fd9856906b01e17d0eeecd72dceea798bad210bb087f726a7d0150a31533046b6ac30df537200cc5141443a0
 EBUILD pkgconfig-openbsd-20130507.ebuild 1705 SHA256 d7a544666c4518102bd793c8476cfe2fc3e9c9a2f4dfe302679b628462b613d5 SHA512 77b6072aa8e79b6a1c5a0d7a557deba4525a6a398f6cdc11a73f194612e66c1626e5e152256ab1b735dddfa892a0ea5734e0b11e73f9d71d87ce56f17e7b1f4d WHIRLPOOL e8309e518f5ab7dd5d9c1d5d7740cf1d2588f1632e58bad269a8f02266458a8356020cbc293ea68458d3a2c5f179303d8155d759dea64a9877ff38fbaa84f844
-MISC ChangeLog 2649 SHA256 51d8f8e3301993ca3c9b1cc01b4891cabfd463d15d66bb11637aaa96469ca44c SHA512 f395e1319778da7b234546442299fd3ef646b35db7af11fc7648018ffc5f5632e33ce0ec70565a88dc5ce27b609808c3be60e3483dbe7bf237bbba42d33f974a WHIRLPOOL 9307709e3605ead27a2ddaf1259781e6f3cd6a253c4639a7df7a6af8458da90671bf1f2d3c344e28a12d467504b54cd04049d50fc82d432399a6799faf7ff67e
+MISC ChangeLog 2841 SHA256 ef7386f7f84d34ad48a315ade560732bd6341bfcd40a1aaaf599605a670cfa23 SHA512 f8d1704e69deb5dab81196fbaf6ba55cfb0650c0d5f0b1bda3dfbd98c0ad71d55fe7506fd2a0d476bf29290c43f04f8396ea6da880906254db6a1ddfec86e8ea WHIRLPOOL 33bb2e9a0f19c024ad80df5cdbbd932d58787b6b0aa8adcbb1b8ecead2f6ca94ea293a1842ac07aeef8341696fc9882b055e29289138a419be6382611c6e6c4b
 MISC metadata.xml 354 SHA256 c9627f768da21dddcc119335eb282801b3678a4730ba24211916a6fe921b74b3 SHA512 5be8992782ff7c59b2ed45e574db4221a0a54027a518dbc663124968e34a6e77f92ec622f8c31cc651d35a9b4eade65176056aea9de6c0c4985ec41434739853 WHIRLPOOL 31bf6bfdff0135eb634beb7685be70f38f5926f44f095786db1f6a41c6110b57a86febc898129124cf823b19c7913445411cdf5ba8d9cbefdec5f0727a2c2cef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRiQkyAAoJEEdUh39IaPFNUTkH/3js4Lao0S+ThWtzThEj1z+e
-jvIldxUDS3TsbaUywu7pI45SFQ7dqHYahdJ4L6Gv3CWPQfXebDt1rVaiw1A6o1P2
-7sIJYOCKdVOpxKmTfaxJ44FPPQUr9kNK17AdJT4zSXseFNqxh0aJNe6h0A8v8/A/
-EGREBvYqJ996Q8vtb+BApqskEnlDwCg2sfghHXgwAHntj/qG9jUiD3OVMaQH8JPg
-7Fr0CXLJn6RHGO68Bq/zEmegP/G+/4w2J3oSmKwnO+pWc813g6VvWuuC+H+JxyVW
-Yh3jggc3qY2K4Toflh89pe8ah/br2KGEUO5WzUKyBkbRqC844JobMEFcPgo/YVI=
-=BNfC
+iQJ8BAEBCABmBQJTN/vSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjG8P/1RHS8XhYxs3ywB/QSrrL8Q2
+ol+1vfRPiUAfwL2g0veFELFyBmD91cMbO7vCQfORlvOrla2HMOTtUN28L83tW8Dt
+dfOnZPNor6x+UTG2xloSKKWs03lgSrULT1oS85N4JNrxlMqVQAI/dQUcMnthJ+Kg
+fSlCEN1CT0o3Trrf9CNXJ/3WmSo5JNoe82OCvw1dt2y08r0L342ON8sY7MCrrLnQ
+ImUpkW52WeheMFTMWNbWIaZE52Sk6S8vX/zC99hUQJdUG2IGBNVUqBucaQUOJDqP
+I0CAdKx9Zv5uBp5ru47vzQqVL+FEBWJQ1I2fL+VFP1ryf+3rKvUthQNzzowWTzqj
+PlXSqse2n49Dn98lpNBBnC7Ve7dSjyoY64A5Fw8qrGatR8Vv5nQ8JAuvkta8QP6f
+Ims5t62ggr1X7xtFds0Q0Rst5qAj9ZJY+3gsJ1B8bavyANJlvqWDT1kraZqGThjw
+Y8wRPBKPzMpwWvx8RHlSuT/i5UdYOFeFCoevNAsadSbgSeZl/BbIyh4mSh/xfMD7
+EqHzs74cpEbSR/YKWoTMMx3ApMB/MBCy0vjERIXu58UaTiwWh/2v/iAbdgp4zBV9
+GY1sQS2DMGkoBHtYpwoMVwddqUFB0+1Se+R4ubz9jtn4ipXVmdWjaLfU9lXueXwV
+m+5U9+0BiItOSeM2piM3
+=T/Aw
 -----END PGP SIGNATURE-----
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..6ae1aee75105
--- /dev/null
+++ b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/03/30 11:11:13 mgorny Exp $
+
+EAPI=5
+
+inherit eutils multilib 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://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="dev-lang/perl:="
+RDEPEND="${DEPEND}
+	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
+
+	local perl_version=$(perl -e 'printf "%vd", $^V')
+
+	insinto /usr/$(get_libdir)/perl5/vendor_perl/${perl_version}
+	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
+}