summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-02-08 21:11:46 +0000
committerJonathan Callen <abcd@gentoo.org>2011-02-08 21:11:46 +0000
commit9673b5e36a750daf5756b10b77b808f8747b2c6d (patch)
treec897dbf348aae90c02a2bc51186f9ffb23006f96 /x11-libs/libpciaccess
parentx86 stable per bug 353819 (diff)
downloadgentoo-2-9673b5e36a750daf5756b10b77b808f8747b2c6d.tar.gz
gentoo-2-9673b5e36a750daf5756b10b77b808f8747b2c6d.tar.bz2
gentoo-2-9673b5e36a750daf5756b10b77b808f8747b2c6d.zip
Let libtool find & install the proper scanpci binary. Fix bugs 354145 and 353699.
(Portage version: 2.2.0_alpha19_p61/cvs/Linux i686)
Diffstat (limited to 'x11-libs/libpciaccess')
-rw-r--r--x11-libs/libpciaccess/ChangeLog6
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild9
2 files changed, 11 insertions, 4 deletions
diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog
index 5c70d5f817fe..d8bfec98717a 100644
--- a/x11-libs/libpciaccess/ChangeLog
+++ b/x11-libs/libpciaccess/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libpciaccess
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.58 2011/02/04 17:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.59 2011/02/08 21:11:46 abcd Exp $
+
+ 08 Feb 2011; Jonathan Callen <abcd@gentoo.org> libpciaccess-0.12.1.ebuild:
+ Let libtool find & install the proper scanpci binary. Fix bugs 354145 and
+ 353699.
04 Feb 2011; Michał Górny <mgorny@gentoo.org> libpciaccess-0.12.1.ebuild:
Fix scanpci location.
diff --git a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
index af934adc6856..3bc007cb01a2 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.12.1.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/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild,v 1.2 2011/02/04 17:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild,v 1.3 2011/02/08 21:11:46 abcd Exp $
EAPI=3
@@ -17,10 +17,13 @@ pkg_setup() {
xorg-2_pkg_setup
CONFIGURE_OPTIONS="$(use_with zlib)
- --with-pciids-path=/usr/share/misc"
+ --with-pciids-path=${EPREFIX}/usr/share/misc"
}
src_install() {
xorg-2_src_install
- use minimal || { dobin scanpci/scanpci || die ; }
+ if ! use minimal; then
+ dodir /usr/bin || die
+ ${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
+ fi
}