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

svn path=/sunrise/; revision=3415

diff --git a/sys-power/acpi-support/ChangeLog b/sys-power/acpi-support/ChangeLog
index ab076248a58baebdfebd1020a41183e8b6877e5b..69c89f4a9f2f95dd584229c3daa1adc2adbbf427 100644 (file)
--- a/sys-power/acpi-support/ChangeLog
+++ b/sys-power/acpi-support/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Apr 2007; AK <gentoo@horizon.ath.cx> acpi-support-0.95.ebuild:
+  Add X use flag and rename i855->intel-855 for clarity
+
   13 Apr 2007; AK <gentoo@horizon.ath.cx> +acpi-support-0.95.ebuild,
   +files/acpi-support-0.95-gentoo.patch:
   Version bump and some fixes

diff --git a/sys-power/acpi-support/Manifest b/sys-power/acpi-support/Manifest
index 999134a4102483cce000c2187c069ec704a2b7f3..4bfdf4f0534639b5c70ad31409137a47c496925c 100644 (file)
--- a/sys-power/acpi-support/Manifest
+++ b/sys-power/acpi-support/Manifest
@@ -12,14 +12,14 @@ EBUILD acpi-support-0.91.ebuild 2130 RMD160 bfccc140f15d55bda3779f3caaffd98fa1d3
 MD5 60e26191ab036ec6245f33dbede8dd9d acpi-support-0.91.ebuild 2130
 RMD160 bfccc140f15d55bda3779f3caaffd98fa1d3a7e4 acpi-support-0.91.ebuild 2130
 SHA256 6a737547efafe89b02ed4ce45608f1f7a8f21b74a56aa74aaa5d4f84bf5d7287 acpi-support-0.91.ebuild 2130
-EBUILD acpi-support-0.95.ebuild 2252 RMD160 e58f5226c1bbf330ba658001f8dc6c278d48e37c SHA1 f653997904c2b725c3b39b4b11ed6c93ca141a33 SHA256 3faa14b3b6e032fc89f285125ce9bd46f3b3fb952ea1219534277cbea411b43b
-MD5 eb518ff56457520a9d9193ba0fc6f85b acpi-support-0.95.ebuild 2252
-RMD160 e58f5226c1bbf330ba658001f8dc6c278d48e37c acpi-support-0.95.ebuild 2252
-SHA256 3faa14b3b6e032fc89f285125ce9bd46f3b3fb952ea1219534277cbea411b43b acpi-support-0.95.ebuild 2252
-MISC ChangeLog 945 RMD160 67d301d9bc0b5e502f7d85d2743238d2062e16cf SHA1 64a5f5255149f48e207b7488e32de7e50a563738 SHA256 93f6c782c415f34bcacaf503390a4e7f26acb7e1c8b12b0e5790e63c39499306
-MD5 68f0be5f94e6951f422adbf788b68df2 ChangeLog 945
-RMD160 67d301d9bc0b5e502f7d85d2743238d2062e16cf ChangeLog 945
-SHA256 93f6c782c415f34bcacaf503390a4e7f26acb7e1c8b12b0e5790e63c39499306 ChangeLog 945
+EBUILD acpi-support-0.95.ebuild 2393 RMD160 fa65792d6f4ba91720b0cd1c71caf9a14cc60033 SHA1 84506027755047cb70db0b14228ab0ff0bd8e00b SHA256 4d7dc6e86967a7e45b7bf34851aa46a5846281e54155247a36467aef7301bd2f
+MD5 450e9fc3c5f5a3a8cbae8c082163dddc acpi-support-0.95.ebuild 2393
+RMD160 fa65792d6f4ba91720b0cd1c71caf9a14cc60033 acpi-support-0.95.ebuild 2393
+SHA256 4d7dc6e86967a7e45b7bf34851aa46a5846281e54155247a36467aef7301bd2f acpi-support-0.95.ebuild 2393
+MISC ChangeLog 1070 RMD160 6c34f6848378adf0a9e584b786c4f42f40db6674 SHA1 99ac7f4e73dcdc026764e97abc873b0d7b3d115d SHA256 1cd85d836b2208b6befaf2c65e1ae6591926096aa0ffb50dd897bfa44bc03660
+MD5 6564cc507c51d0df86f52ea04d57be09 ChangeLog 1070
+RMD160 6c34f6848378adf0a9e584b786c4f42f40db6674 ChangeLog 1070
+SHA256 1cd85d836b2208b6befaf2c65e1ae6591926096aa0ffb50dd897bfa44bc03660 ChangeLog 1070
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

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"
 }