Don't hardcode /usr/local/lib in import-fdi-quirkdb script wrt #319139 by Peter Gantner.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 71 insertions, 2 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 78bfc15609d1..1e4476c8d67b 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.39 2010/05/10 18:04:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.40 2010/05/14 19:37:25 ssuominen Exp $
+
+*pm-utils-1.3.0-r3 (14 May 2010)
+
+  14 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pm-utils-1.3.0-r3.ebuild:
+  Don't hardcode /usr/local/lib in import-fdi-quirkdb script wrt #319139 by
+  Peter Gantner.
 
   10 May 2010; nixnut <nixnut@gentoo.org> pm-utils-1.3.0-r2.ebuild:
   ppc stable #318209
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index f7737b52c975..e0f358922ed5 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -4,5 +4,6 @@ DIST pm-utils-1.2.5.tar.gz 174592 RMD160 987a795e0cada9aeabcab2053d1de33af2635e7
 DIST pm-utils-1.3.0.tar.gz 197344 RMD160 52d257a5440bbdafd7d814351b9a59deb36536ba SHA1 30f6c0a7f470d2c2874d3b13046c1883363c06f3 SHA256 586cc4a6d40e5d659d9d634ba9d3cde6268a0543fd7f29026a3069bcd726806e
 EBUILD pm-utils-1.2.5.ebuild 1631 RMD160 5197fae7c6da3c3ecbf0ec5431d94c31d8874f1c SHA1 cf7d15cb07f376503b1a47771b5d467431620bf7 SHA256 6cd03cb334243d6dcaa75fc8e684176842ebabc0d633add68001b9d220b3fa67
 EBUILD pm-utils-1.3.0-r2.ebuild 1519 RMD160 3db60fda7e9b2025cde5a6378b26b7b9c2bf36a8 SHA1 44bf290c2b572e0b37743bf7e9c6cdfdf20196b9 SHA256 e9d4551e8bf7ca250e1f91a31390ad0f10b504e9e47aaf86dfb70a7ed166ad08
-MISC ChangeLog 5915 RMD160 b60c67f948b2af82ef14546580c7ece5d86771df SHA1 a62bc8d3b85ce03f768dbea506038769d8c7796b SHA256 662fc3af301c2838ae0fc841d2b473a70be94f729f04d367377bff406a9a332f
+EBUILD pm-utils-1.3.0-r3.ebuild 1622 RMD160 338b3f4dad47714f4e2d97c00fe06df2de0c6801 SHA1 9ce0866ca8e323803d44fe151d0ae9143c3bc43e SHA256 7b0b082b98b4bc6058dc9f21eda945e890160df42198562f31c12cdc9db99157
+MISC ChangeLog 6129 RMD160 b5be2225e16ca7a82049972047bcd5aab9db9403 SHA1 335c45b34cf178c60ad29245e953679d9db314be SHA256 3f24477c6ab7e994c73482fb32f1e3e86988af87c338464c75de4611493f51c8
 MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda
diff --git a/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild b/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..c58ab1b07e8a
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r3.ebuild,v 1.1 2010/05/14 19:37:25 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+DESCRIPTION="Suspend and hibernation utilities"
+HOMEPAGE="http://pm-utils.freedesktop.org/"
+SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
+
+vbetool="!video_cards_intel? ( sys-apps/vbetool )"
+RDEPEND="
+	!sys-power/powermgmt-base
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.13
+	sys-power/pm-quirks
+	alsa? ( media-sound/alsa-utils )
+	networkmanager? ( net-misc/networkmanager )
+	ntp? ( net-misc/ntp )
+	amd64? ( ${vbetool} )
+	x86? ( ${vbetool} )
+	video_cards_radeon? ( app-laptop/radeontool )"
+DEPEND="app-text/xmlto
+	app-text/docbook-xml-dtd:4.5"
+
+src_prepare() {
+	local ignore="01grub"
+	use networkmanager || ignore+=" 55NetworkManager"
+	use ntp || ignore+=" 90clock"
+
+	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
+
+	epatch "${FILESDIR}"/${PV}-fix_autotools.patch \
+		"${FILESDIR}"/${PV}-on_ac_power-upower.patch
+
+	sed -i \
+		-e "s:/usr/local/lib:/usr/$(get_libdir):" \
+		src/import-fdi-quirkdb || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die
+
+	insinto /etc/pm/config.d
+	doins gentoo || die
+}