summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-04-22 22:44:07 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-04-22 22:44:07 +0000
commit1ade4408f36b8fd08abde0f911cfe8852b2a6f8b (patch)
treec2cef96896cabf9b76ba0ded11b9b9c46ffdef17 /sys-apps/pmount
parentAdd FORTIFY build workaround to kde-base/arts-3.5.9 too. Bug #260539. (diff)
downloadhistorical-1ade4408f36b8fd08abde0f911cfe8852b2a6f8b.tar.gz
historical-1ade4408f36b8fd08abde0f911cfe8852b2a6f8b.tar.bz2
historical-1ade4408f36b8fd08abde0f911cfe8852b2a6f8b.zip
Fix install with USE=-hal, bug #266827.
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/pmount')
-rw-r--r--sys-apps/pmount/ChangeLog5
-rw-r--r--sys-apps/pmount/Manifest10
-rw-r--r--sys-apps/pmount/pmount-0.9.19.ebuild11
3 files changed, 17 insertions, 9 deletions
diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 99725b6f502c..ded73ffc44d4 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/pmount
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.64 2009/04/18 11:28:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.65 2009/04/22 22:44:07 eva Exp $
+
+ 22 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> pmount-0.9.19.ebuild:
+ Fix install with USE="-hal", bug #266827.
18 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> pmount-0.9.19.ebuild:
Remove unneeded sysfs dependency.
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 48e617b9a6b6..2b90fc366367 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -10,13 +10,13 @@ DIST pmount-0.9.19.tar.gz 439507 RMD160 90aaf063fbf5303e1dfec615eade200c7485d4dd
EBUILD pmount-0.9.16.ebuild 1624 RMD160 ab3d6598dd247ee8e9043a15fa629b40004481bb SHA1 71a4f3c37373bbb95c7336619956b5487f2bc1dc SHA256 1709311b8e2c527333138406946d0f3b9fd879bd5b942aa145cc9c1c41957bb7
EBUILD pmount-0.9.17.ebuild 1641 RMD160 74f35daa7f98687bf21fb01b0d5f310c85d6e3d3 SHA1 8f5e0355c6b160bac3dd8d2a1b8da117d2886725 SHA256 06f196da8412252eba2308f0f2b95b83e526c2f15ce1ec08148e9d9fa8c3f5ec
EBUILD pmount-0.9.18.ebuild 1641 RMD160 f4bea5add985358655369cff2bbf3a3c278331ba SHA1 0f46d358429a70b008c192449cf1a590ec56ba0d SHA256 27891e64c88dff6b236ea60c9ba09307f507e8828bc24cafa1e5b776fff0a974
-EBUILD pmount-0.9.19.ebuild 1647 RMD160 b3cf71396a8ab1c7d93a3a3ed43518bffafbd06a SHA1 fafd9a0f8d8fc51b08b336a8be8d5f82ccbf0700 SHA256 85df6a25369b63162a401e37e6537221c6fe57e4678df733f69c20b3ba7868ff
-MISC ChangeLog 8160 RMD160 783e13c81d6a3ad17f91cd4668b3962fcf8b9b1b SHA1 6fa79664619398fdf1c907a326f4c09c342a6675 SHA256 c35d5720ed06cfc43aaceea53b6b94a52a83dde4e7361a4b5af7ec0c658672e6
+EBUILD pmount-0.9.19.ebuild 1731 RMD160 49b6f1031cec6cf4fe919e9f1b638aeb54ebb9f7 SHA1 0d542aefaeabaed4f30990dc290ac3ce706ecbf7 SHA256 cd7c79dd05c27fdca71bbeaabd2761cda05e1c85570ebdad1b6a2484b2239d43
+MISC ChangeLog 8281 RMD160 99c2fdf2029b282d58160534fbb841b310c3476c SHA1 6621d9ffdc5a040b623ef26c053c9dd7ed5d3275 SHA256 3d63fc92e6f437f634fa3166963ce5301d937ca7b95903ed26651492d4707c38
MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknpuWcACgkQ1fmVwcYIWAaZMwCg3riAWnphfWAa0vzK8Inw/PPq
-nNkAoNCb+bGE/s4GTAu5CVIJFB2rx+aB
-=K2Bp
+iEYEARECAAYFAknvnb4ACgkQ1fmVwcYIWAZHRQCg0hbM5apys5B00PnNraQu9K6Y
+6tQAn2fE2YpcnEGC6i1hmWICutIglBA2
+=ybMJ
-----END PGP SIGNATURE-----
diff --git a/sys-apps/pmount/pmount-0.9.19.ebuild b/sys-apps/pmount/pmount-0.9.19.ebuild
index c4960347635e..f74a66fd9bc0 100644
--- a/sys-apps/pmount/pmount-0.9.19.ebuild
+++ b/sys-apps/pmount/pmount-0.9.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.19.ebuild,v 1.2 2009/04/18 11:28:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.19.ebuild,v 1.3 2009/04/22 22:44:07 eva Exp $
EAPI="2"
@@ -37,10 +37,15 @@ src_install () {
# Must be run SETUID+SETGID, bug #250106
exeinto /usr/bin
exeopts -m 6710 -g plugdev
- doexe src/pmount src/pumount src/pmount-hal || die "doexe failed"
+ doexe src/pmount src/pumount || die "doexe failed"
dodoc AUTHORS ChangeLog TODO || die "dodoc failed"
- doman man/pmount.1 man/pumount.1 man/pmount-hal.1 || die "doman failed"
+ doman man/pmount.1 man/pumount.1 || die "doman failed"
+
+ if use hal; then
+ doexe src/pmount-hal || die "doexe failed"
+ doman man/pmount-hal.1 || die "doman failed"
+ fi
insinto /etc
doins etc/pmount.allow || die "doins failed"