sys-power/acpi-support: Add X use flag and rename i855->intel-855 for clarity

[~andy/sunrise] / sys-power / acpi-support / acpi-support-0.95.ebuild

diff --git a/sys-power/acpi-support/acpi-support-0.95.ebuild b/sys-power/acpi-support/acpi-support-0.95.ebuild
index ac1382cb6b159b4f79ce98e40ed96da7c470cfdd..3921b8541f40f7695893bebc6b8782ec97ca333d 100644 (file)
--- a/sys-power/acpi-support/acpi-support-0.95.ebuild
+++ b/sys-power/acpi-support/acpi-support-0.95.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://archive.ubuntu.com/ubuntu/pool/main/a/acpi-support/acpi-support_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="kde laptop-mode pcmcia toshiba i855 video_cards_radeon"
+IUSE="kde laptop-mode pcmcia toshiba intel-855 X video_cards_radeon"
 
 DEPEND=""
 RDEPEND="sys-power/acpid
@@ -20,7 +20,7 @@ RDEPEND="sys-power/acpid
        sys-apps/vbetool
        sys-apps/ethtool
        sys-power/powermgmt-base
-       x11-apps/xset
+       X? ( x11-apps/xset )
        kde? ( =kde-base/kdelibs-3.5* )
        toshiba? ( app-laptop/toshset )
        laptop-mode? ( app-laptop/laptop-mode-tools )
@@ -33,8 +33,9 @@ S=${WORKDIR}/${PN}-0.94
 
 src_unpack() {
        unpack ${A}
-       use video_cards_radeon && sed -i '/RADEON_LIGHT=true/ s/# //' "${S}/acpi-support"
-       sed -i "s!/etc/default/acpi-support!/etc/conf.d/${PN}!" "${S}"/*.sh "${S}/vbesave"
+       use video_cards_radeon && sed -i '/RADEON_LIGHT=true/ s/# //' "${S}/acpi-support" || die "sed failed"
+       use X || sed -i '/xset/ s/\(.*\)/#\1/' "${S}/"{lid.sh,lib/screenblank} || die "sed failed"
+       sed -i "s!/etc/default/acpi-support!/etc/conf.d/${PN}!" "${S}/"{*.sh,vbesave} || die "sed failed"
        epatch "${FILESDIR}/${P}-gentoo.patch"
 }