summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-08-06 13:48:44 +0000
committerRichard Yao <ryao@gentoo.org>2012-08-06 13:48:44 +0000
commitfe81a01a9efd1f93f2884888cf0614d5eb4522d3 (patch)
tree3d396e757349f02d9b7b954c2f1ab5f5f9b6c9cf /sys-fs/zfs
parentFix build with gnutls, bug #428592 (diff)
downloadhistorical-fe81a01a9efd1f93f2884888cf0614d5eb4522d3.tar.gz
historical-fe81a01a9efd1f93f2884888cf0614d5eb4522d3.tar.bz2
historical-fe81a01a9efd1f93f2884888cf0614d5eb4522d3.zip
Use pkgconfig to detect udev directory location
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/ChangeLog6
-rw-r--r--sys-fs/zfs/Manifest6
-rw-r--r--sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild12
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild12
4 files changed, 24 insertions, 12 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 6f31d9d03bb4..0a1a97c716a4 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.40 2012/07/28 21:47:04 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.41 2012/08/06 13:48:44 ryao Exp $
+
+ 06 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r6.ebuild,
+ zfs-9999.ebuild:
+ Use pkgconfig to detect udev directory location
28 Jul 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r6.ebuild,
zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 3ec769e35ae9..91da8a750e97 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,7 +10,7 @@ AUX zfs-0.6.0_rc9-remove-pfmalloc-2-of-3.patch 1979 SHA256 6f61761703c4c71d8c91f
AUX zfs-0.6.0_rc9-remove-pfmalloc-3-of-3.patch 2593 SHA256 a51425a9d97dc7177be6bf05a14d1905d52be5b503ab27e570e1e7e254befcf8 SHA512 7579231f68a1d840a1d568b12bb5bc8bd78d15c379020618b061015cc4771655650157e993ee77731f9bdc6e7ee1a6dd3ead3f548724e72e398b0400a9eeb5e4 WHIRLPOOL 57787a873e5c0195060a3e146c34f465df3c8fcb8123263435fcc9180bebef19fbba911767f8e5131063c0e1199db34c40c062038bb1d9bed311a4d8ac2e85ce
AUX zfs-shutdown 1252 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553 SHA512 1c04ba8c1f533efdc2ea938ba508d1789fc6bb653e5ad84dfcd78e41f1271f05309df670b9b8246c3317c96060028266230c83b8c21b7abf71442320cd33a219 WHIRLPOOL 58a3e23d316f673bee78e9837c6aea3be6bfceab5e89a0717b0290257a7a682bef67e6ae98e6f92a0c41a1da043a6ba6eded5974bbff3ee50c39e48ea8d3c77f
DIST zfs-0.6.0-rc9.tar.gz 1989469 RMD160 fef1e4e4f0d122be60e3f5b8322e683b8981bac2 SHA1 fc14d86cd0124fd67d2ac80853f9ae078dee9a0d SHA256 a014475fab410caf209e99b448aeffe0070d1d9fc002fb33dd56f73dba87b1fd
-EBUILD zfs-0.6.0_rc9-r6.ebuild 3610 SHA256 b4c6fb5a0a420c5b93e03d7a501e4cb6872de7d573dc936f6bf3792b1542228c SHA512 bd40335f0b144521ed42eb4186c0ff17a59186baae4bce938157c4bfa4b9ac5760fa89c01d655b4c0b53484b7d50da811b3e77c75f0836ef25cabe351101ff14 WHIRLPOOL 634ba4e9c3e1e89b422a6944b2b86806b187dc1695c39029baebc747b77065af318fe9fcba94e292f8ef72a3fc6ded1cdc4d107f26333ddb2652bdefa89c020a
-EBUILD zfs-9999.ebuild 3603 SHA256 226dd174b57fc3d7548cddf6ab5ca33d9ec8ebb6760f09f2819297e791e43914 SHA512 ded5ec962933404102df3155e821db20bfbdd344d16efed3b96d8daf9ee3ba7c48146194724a4643eb3f4f21a0401bf7154aaffc222be9c398ad44a941bb7b93 WHIRLPOOL c7b0fb66e74dc33f34f1a1de8bdc58848ed9fd7f7ac47bb2e63bac66ba4fc39623c28201aaf91b868a50be3e7d42443206af886f8384955a53a0f077f370eb4a
-MISC ChangeLog 7117 SHA256 5180be9659f73774086157337d4ba20714dd1f42302e0892bf80c52e8ba0ae6f SHA512 257d0052481548a21ceb0a24b84165e02389b96e60b6e066a06b26a4d4005e34e8fc733e5750aa8430e0ba9d3aa21ed6569a8c223d8cac3d87c0b0802189d96b WHIRLPOOL 078e5bc4ed80e577549a84cc709300c31df6be21bcfcb0d69f3ad0d0c9761a60963a1d70217d47237e8eeb5f013a7bac03f86a38c96e54862a421174358d9389
+EBUILD zfs-0.6.0_rc9-r6.ebuild 3695 SHA256 e75c23a36bb6cb5f2ea5b74b483b85c25318933f7353d46d2a4e04a7dc07393b SHA512 8aaf033ba5992148faa4b3871a0758348023f8864ef808e87e77ee636a7b95855e918d33090668f12c151ff11842aa9efaf2b94af82cb01e16a94042cc9b886a WHIRLPOOL a5c88a4d1834d9db393eb98d3ecaa914c164ac420386ed75f516a897bc4d4f6c2ddd7cadc9d0648c91cecb502678698b5d4e823c2bc4e05bd742871d5ebb249d
+EBUILD zfs-9999.ebuild 3688 SHA256 b1689b8b570610cdda69a7e2e773be04c44d789b2b98052c8216f9a5eea7d3e1 SHA512 d809b46541bfc6406270a4b3cfe34273f239a056f728db82c57c65c0910714fc065cf4efea3c87cc81e2fbddc593356da99d245ffe43da1d8d8f8b75202a3c98 WHIRLPOOL a5bb97b9ebec60298891c96b01487b7097b4a13ff1027ab6d2a3aa02018d53385ae1a4f14c047d4b51a42cb4aa74681c0c21b064a5b8461d9abc6255dfde1189
+MISC ChangeLog 7257 SHA256 6d07d3818ff6c22cb95a1f7d539658908692301d8a936d2d4b79aa7bee559bd6 SHA512 2cbe3fbe06dd9a8eb2116e160607581500c4e146e69c90c071fb1c7acd85fe2b03bdd6d624a4a91812174572467942d89a26a825217cce44401473275b3e40d2 WHIRLPOOL 8a503dca570132852de6dfd3c0fb3612a781422cca8aca7c448f232167857a87c8b8f69fb90fade3b50f70e1d72cd9f62b7be7486ef96cfb398ee6f2c6f77bfd
MISC metadata.xml 460 SHA256 4f32c18bfc4d75883f198b1166ad4f5d7a95deb11eca99d476f305ed31875e7d SHA512 80e3d510553f1ab052ecea017e51d6ec2878e75b180ba8b72593ce775e423e5eb71806516b655d9714b8dadb4921888bc8874bb1ee19757efd63dc9f40a703c0 WHIRLPOOL e4dabc36cf1cb920f010493c0ba1854e884b3180ec286c51ac5ec1ce4edd32705657d3b0e9e45419a89156c7f08927acb1ab94b938955981aa1fb8d1a391d4ac
diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild
index 6390da61aa3e..e3b150a226a5 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild,v 1.2 2012/07/28 21:47:04 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild,v 1.3 2012/08/06 13:48:44 ryao Exp $
EAPI="4"
@@ -28,12 +28,16 @@ LICENSE="BSD-2 CDDL MIT"
SLOT="0"
IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
-DEPEND="
+COMMON_DEPEND="
=sys-kernel/spl-${PV}*
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )
test-suite? (
@@ -105,7 +109,7 @@ src_configure() {
--with-config=all
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="${EPREFIX}/lib/udev"
+ --with-udevdir="$(tc-getPKG_CONFIG) --variable=udevdir udev"
$(use_enable debug)
)
autotools-utils_src_configure
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e8a687ce33da..ee5de04749a7 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.30 2012/07/28 21:47:04 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.31 2012/08/06 13:48:44 ryao Exp $
EAPI="4"
@@ -28,12 +28,16 @@ LICENSE="BSD-2 CDDL MIT"
SLOT="0"
IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
-DEPEND="
+COMMON_DEPEND="
=sys-kernel/spl-${PV}*
sys-apps/util-linux[static-libs?]
sys-libs/zlib[static-libs(+)?]
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )
test-suite? (
@@ -105,7 +109,7 @@ src_configure() {
--with-config=all
--with-linux="${KV_DIR}"
--with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="${EPREFIX}/lib/udev"
+ --with-udevdir="$(tc-getPKG_CONFIG) --variable=udevdir udev"
$(use_enable debug)
)
autotools-utils_src_configure