sys-infiniband/libibverbs: adding pc file

4 files changed, 71 insertions, 8 deletions

diff --git a/sys-infiniband/libibverbs/ChangeLog b/sys-infiniband/libibverbs/ChangeLog
index df72b5155..127186872 100644
--- a/sys-infiniband/libibverbs/ChangeLog
+++ b/sys-infiniband/libibverbs/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-infiniband/libibverbs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  libibverbs-1.1.2-r1.ebuild, +files/libibverbs-1.1.2-pcfile.patch:
+  sys-infiniband/libibverbs: adding pc file
+
 *libibverbs-1.1.2-r1 (20 Aug 2009)
 
   20 Aug 2009; Alexey Shvetsov <alexxy@gentoo.org> libibverbs-1.1.2.ebuild,
diff --git a/sys-infiniband/libibverbs/Manifest b/sys-infiniband/libibverbs/Manifest
index b9c6c3263..9409f1ad3 100644
--- a/sys-infiniband/libibverbs/Manifest
+++ b/sys-infiniband/libibverbs/Manifest
@@ -1,6 +1,7 @@
+AUX libibverbs-1.1.2-pcfile.patch 1257 RMD160 d9adbfad0dc6fcfe75f5297dc500012254ef53a6 SHA1 6cffbcd184e6e9f3298d6d987088985fa2736449 SHA256 e9b8b63aea1a9edd3f333552246266ecb0a030514c9a00095d93e8c856634367
 DIST OFED-1.4.1.tgz 65180617 RMD160 748e669a1a5aef90dd9cec3e8fce110d0051a3cd SHA1 e558bb16c414e0f40727ac046cbd80a3fc84c87f SHA256 5e73c9ead49f286ef68d1618a042b5101887cf0f8c66fbfea5a8a7648feee1e6
 DIST OFED-1.4.tgz 61398547 RMD160 55fdf86f788a1ac86f0de842ffda545967f25431 SHA1 4d0c61409e0d41dc65906b93b592b9c331399392 SHA256 da1adc3d413b3a5731c9c46443c42fcfb88c1ad6bb9d77175a315a26a07ecaee
-EBUILD libibverbs-1.1.2-r1.ebuild 510 RMD160 cc40764446dff7b7c9ebd92c001bfa16e76977df SHA1 ef679636f6526df0aebfd3f1885e4b2ddcd2dd08 SHA256 03251a185c710cee72fd60f0c2af5186bb805ebac0126729cdf0499950a1f77e
+EBUILD libibverbs-1.1.2-r1.ebuild 589 RMD160 192113a131d846da3aa79043d052c3d3e3d3021e SHA1 57f8d61dbaabbdc6f8b1e499fe5052fcfa95f2d1 SHA256 6fd93756897ffe80a37220a3e52fbec7751745b0c8b48b64d066e293f53cdaea
 EBUILD libibverbs-1.1.2.ebuild 505 RMD160 0c07c3748c8b0483d2588995dffb8cee8ed73b54 SHA1 ddc379b9f7958f4304ef9fef2a6c75a69ec88e35 SHA256 db22dd8ccc67b5ce90b6bdc5d8b71246c902765379deb1542571f6fe213fcca3
-MISC ChangeLog 1622 RMD160 618731bb39b8a9cbca5b26b7ae2f5eb66bb46877 SHA1 8eff9c410f4fbfb62e883f7e59b1a5ae61d9c741 SHA256 c4a72a6dc584bca99f78237e9ce069dbcbc08c651a7f6cefe7ee273cb05871ce
+MISC ChangeLog 1789 RMD160 1d9c456d5dbc17d1eab7bc276332195270e4a454 SHA1 07e95c710b03691d409e23e180d10c83a6faad94 SHA256 7a363182c002a6129a883693321ae941b13be07f68f5e3448c7acd3bc614df8e
 MISC metadata.xml 426 RMD160 9bf509ead397955652dcc89a9cff5370ccaee9bd SHA1 38090b6e7d9e6677943062b81b8ea6a29b5f698d SHA256 041eeefa57c81b2cef7450e96ead60e4d999570cfe9d62cfc4252ff904e18719
diff --git a/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch b/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch
new file mode 100644
index 000000000..a870a5b70
--- /dev/null
+++ b/sys-infiniband/libibverbs/files/libibverbs-1.1.2-pcfile.patch
@@ -0,0 +1,53 @@
+--- configure.in
++++ configure.in
+@@ -22,6 +22,18 @@
+     fi
+ fi
+ 
++dnl Additional arguments (and substitutions)
++dnl Allow the pkg-config directory to be set
++AC_ARG_WITH(pkgconfigdir,
++        AC_HELP_STRING([--with-pkgconfigdir],
++        [Use the specified pkgconfig dir (default is libdir/pkgconfig)]),
++        [pkgconfigdir=${withval}],
++        [pkgconfigdir='${libdir}/pkgconfig'])
++
++AC_SUBST([pkgconfigdir])
++AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
++
++
+ dnl Checks for programs
+ AC_PROG_CC
+ AC_PROG_LN_S
+@@ -66,5 +78,5 @@
+     AC_DEFINE([HAVE_SYMVER_SUPPORT], 1, [assembler has .symver support])
+ fi
+ 
+-AC_CONFIG_FILES([Makefile libibverbs.spec])
++AC_CONFIG_FILES([Makefile libibverbs.spec ibverbs.pc:ibverbs.pc.in])
+ AC_OUTPUT
+--- Makefile.am
++++ Makefile.am
+@@ -1,5 +1,8 @@
+ INCLUDES = -I$(srcdir)/include
+ 
++pkgconfigdir = @pkgconfigdir@
++pkgconfig_DATA = ibverbs.pc
++
+ lib_LTLIBRARIES = src/libibverbs.la
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+--- /dev/null
++++ ibverbs.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Version: @PACKAGE_VERSION@
++Description: @PACKAGE_STRING@
++Requires:
++Libs: -L${libdir} -libverbs
++Cflags: -I${includedir}
diff --git a/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild b/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild
index 928bf5a6c..9eac99a40 100644
--- a/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild
+++ b/sys-infiniband/libibverbs/libibverbs-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ EAPI="2"
 OFED_VER="1.4.1"
 OFED_SUFFIX="1.ofed1.4.1"
 
-inherit openib
+inherit autotools eutils openib
 
 DESCRIPTION="A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware"
 KEYWORDS="~amd64 ~x86"
@@ -15,9 +15,14 @@ IUSE=""
 
 DEPEND="sys-fs/sysfsutils"
 RDEPEND="${DEPEND}
-		!sys-infiniband/openib-userspace"
+	!sys-infiniband/openib-userspace"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pcfile.patch
+	eautoreconf
+}
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS ChangeLog || die
 }