summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-02 20:08:25 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-02 20:08:25 +0000
commit87b8387344ed8537c0eaa97019e41ac22a1c756b (patch)
tree5a8435922671676661c108c836727060ffbd20c8
parentMigrate to EAPI=2 for fun. (diff)
downloadhistorical-87b8387344ed8537c0eaa97019e41ac22a1c756b.tar.gz
historical-87b8387344ed8537c0eaa97019e41ac22a1c756b.tar.bz2
historical-87b8387344ed8537c0eaa97019e41ac22a1c756b.zip
Add pkg-config patch from upstream.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
-rw-r--r--net-nds/rpcbind/ChangeLog6
-rw-r--r--net-nds/rpcbind/Manifest13
-rw-r--r--net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch65
-rw-r--r--net-nds/rpcbind/rpcbind-0.2.0.ebuild12
-rw-r--r--net-nds/rpcbind/rpcbind-9999.ebuild7
5 files changed, 88 insertions, 15 deletions
diff --git a/net-nds/rpcbind/ChangeLog b/net-nds/rpcbind/ChangeLog
index a881d601f597..1899079186bd 100644
--- a/net-nds/rpcbind/ChangeLog
+++ b/net-nds/rpcbind/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-nds/rpcbind
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/ChangeLog,v 1.13 2011/09/02 20:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/ChangeLog,v 1.14 2011/09/02 20:08:25 vapier Exp $
+
+ 02 Sep 2011; Mike Frysinger <vapier@gentoo.org> rpcbind-0.2.0.ebuild,
+ +files/rpcbind-0.2.0-pkgconfig.patch, rpcbind-9999.ebuild:
+ Add pkg-config patch from upstream.
02 Sep 2011; Mike Frysinger <vapier@gentoo.org> rpcbind-0.2.0.ebuild,
rpcbind-9999.ebuild:
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index ff36cd5dbf3e..f39d64aed6d7 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -1,17 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX rpcbind-0.2.0-pkgconfig.patch 2193 RMD160 48646405926a1f119784ecb8edcf0e543af6eae4 SHA1 1e71c484656807261a9aa48a2d252306156ae5a3 SHA256 8cf1f8dc8a6d75e081ecd50d2b09c51e69d85f54038f7cf09c00121c56917c90
AUX rpcbind.confd 68 RMD160 0b48cacf0ae78db4c1f305a93e019a1f3060d601 SHA1 8ccb1af754b68fca07ecc75a3dae6446a468d94e SHA256 38bb95aefc38d843d0890d9c15affd28f19f2133c17f463396c62970e7e2dffc
AUX rpcbind.initd 523 RMD160 6742d6e354055d16dfa5ea44e69c94f598c29b54 SHA1 05d325c01431a978b59a17aaf47b59b28909f609 SHA256 6561ae40c5899a9f7a12f1f0867bec47d47c7cc3c583574ffcecbbf6f8d8afbb
DIST rpcbind-0.2.0.tar.bz2 271018 RMD160 596ab1cbc37b17c09dafaa4cd9e86e21f8d62f12 SHA1 02f077372a76a8f9adfa696004aa437212c28617 SHA256 c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3
-EBUILD rpcbind-0.2.0.ebuild 1139 RMD160 bdbdc8a0609c14ef180363fe868f21c2f0ec6629 SHA1 5171c6e2108d7446e728881d192a879dbacb2a1f SHA256 e412dc455ee92771b70a93286fbed6a688296038487a2d0e036dee5b1d6d34f8
-EBUILD rpcbind-9999.ebuild 1138 RMD160 26d96e9fe2583f34e63da1c07a9746a6fd8123a5 SHA1 7908f7ede70f4b7eda969babe3a73c1487377045 SHA256 97988c428ad8ca1a4698772603175fb368f12f8be1a3ed1fac419138a0aa5145
-MISC ChangeLog 1952 RMD160 07484ee99baacb22fff8872bb317cc3a1020baf6 SHA1 464e926f3cb2eca8a2b2021d547a8563e3c0a4e7 SHA256 b99260c8899473e1165517797fd1a38ea1bcee6130900e7534cc294d925ee83b
+EBUILD rpcbind-0.2.0.ebuild 1166 RMD160 99a08779dbd234a7fb030b2c308a8435e0b3a1f9 SHA1 36052ccff7c71bb4ff2025ba0e5fedc4a64ef209 SHA256 272539b99aaa0a97bf997c6fed3d9ca08200b904d0ab85dc62b8db73423eddbe
+EBUILD rpcbind-9999.ebuild 1161 RMD160 0f89326c2c3e0ba2a7ac9e5590ae88afe93a70f6 SHA1 279dbf5a893b8d9d8ccfb2169ccfa1f63e61567f SHA256 0959b1b8aca58c9a29d560bb07abd13a19fd3fc59f922a480a29587b411ba999
+MISC ChangeLog 2124 RMD160 3f9764296e29fcdac1535ca7f51588f09ac3fcef SHA1 09445e742be2f81e451a2089b0cbb5c5c983aa7c SHA256 26ecb7abf5185c32a05f4e7e228db326d52b23abb453287233f54b4158fcdfda
MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk5hNnQACgkQaC/OocHi7JZWWAD+MWIp4oQcmNIaThmv7uzzysdb
-QN0+SwDYsE46zCApJEkBAJeAwxZK77xvU3EAnZyFUi1KVnPMsrS0PkapyCvWuIUY
-=Dkbt
+iF4EAREIAAYFAk5hN8AACgkQaC/OocHi7JbPyQD9FYESFcRHU6MOiZeSu8gpUffV
+OtMxI4z09qPQQeBSDfIA/jyVD9vbyiIFXXybZ45EWs0gfzLFXsUl6PoiKS0xwDXW
+=bqtJ
-----END PGP SIGNATURE-----
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch b/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch
new file mode 100644
index 000000000000..e0339af92b7e
--- /dev/null
+++ b/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch
@@ -0,0 +1,65 @@
+From afd71b8fc0df036a884b3af14ddb875674a49a85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=F2?= <flameeyes@gmail.com>
+Date: Mon, 29 Nov 2010 16:28:38 -0500
+Subject: [PATCH] Use pkg-config to find libtirpc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows to properly cross-compile rpcbind, as /usr/include/tirpc is
+no longer a valid path in that case.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ configure.in | 4 +++-
+ src/Makefile.am | 13 +++++++------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index de1c730..7d43fd4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -51,7 +51,9 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
+ unistd.h nss.h])
+
+ AC_CHECK_LIB([pthread], [pthread_create])
+-AC_CHECK_LIB([tirpc], [clnt_create])
++
++PKG_CHECK_MODULES([TIRPC], [libtirpc])
++
+ AC_ARG_ENABLE(libwrap,[ --enable-libwrap Enables host name checking],
+ [case "${enableval}" in
+ yes) libwarp=true
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cc0a85b..a2f3e34 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
++INCLUDES = $(TIRPC_CFLAGS) -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
+ -D_GNU_SOURCE -Wall -pipe
+ if DEBUG
+ INCLUDES += -DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
+@@ -23,12 +23,13 @@ rpcbind_SOURCES = check_bound.c rpcbind.c \
+ rpcbind.h
+
+ rpcinfo_SOURCES = rpcinfo.c
+-rpcinfo_LDFLAGS = -lpthread -ltirpc
+-rpcinfo_LDADD = $(LIB_TIRPC)
++rpcinfo_LDFLAGS = -lpthread
++rpcinfo_LDADD = $(TIRPC_LIBS)
+
+
+-rpcbind_LDFLAGS = -lpthread -ltirpc
+-rpcbind_LDADD = $(LIB_TIRPC)
+-AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
++rpcbind_LDFLAGS = -lpthread
++rpcbind_CFLAGS = $(TIRPC_CFLAGS)
++rpcbind_LDADD = $(TIRPC_LIBS)
++AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
+ -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
+
+--
+1.7.6
+
diff --git a/net-nds/rpcbind/rpcbind-0.2.0.ebuild b/net-nds/rpcbind/rpcbind-0.2.0.ebuild
index 89796d9418cb..db2a7217da03 100644
--- a/net-nds/rpcbind/rpcbind-0.2.0.ebuild
+++ b/net-nds/rpcbind/rpcbind-0.2.0.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-0.2.0.ebuild,v 1.9 2011/09/02 20:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-0.2.0.ebuild,v 1.10 2011/09/02 20:08:25 vapier Exp $
EAPI="2"
+inherit autotools
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.infradead.org/~steved/rpcbind.git"
inherit autotools git
@@ -21,15 +22,16 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-DEPEND="net-libs/libtirpc"
-RDEPEND=${DEPEND}
+RDEPEND="net-libs/libtirpc"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
else
- # fix busted timestamps
- find . -type f -print0 | xargs -0 touch -r .
+ epatch "${FILESDIR}"/${P}-pkgconfig.patch
+ eautoreconf
fi
}
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index 32e566e51b84..991de85ba0bd 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-9999.ebuild,v 1.4 2011/09/02 20:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-9999.ebuild,v 1.5 2011/09/02 20:08:25 vapier Exp $
EAPI="2"
@@ -21,8 +21,9 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-DEPEND="net-libs/libtirpc"
-RDEPEND=${DEPEND}
+RDEPEND="net-libs/libtirpc"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then