app-laptop/linux-phc: Do not waste time and die in pkg_setup if collision-protect...

svn path=/sunrise/; revision=2439

diff --git a/app-laptop/linux-phc/ChangeLog b/app-laptop/linux-phc/ChangeLog
index 6fd3a6db2b14f2b5dbc1793432b7eb9dc14cf054..21309030ed4cff2c532c4e8c76cc88d6ebffa947 100644 (file)
--- a/app-laptop/linux-phc/ChangeLog
+++ b/app-laptop/linux-phc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Dec 2006; Jakub Moc <jakub@gentoo.org> linux-phc-0.2.8.ebuild:
+  Do not waste time and die in pkg_setup if collision-protect is on
+
   19 Dec 2006; Ali Polatel (hawking) <polatel@nerdshack.com>
   +linux-phc-0.2.8.ebuild, +metadata.xml:
   New ebuild for bug 158579

diff --git a/app-laptop/linux-phc/Manifest b/app-laptop/linux-phc/Manifest
index fc28ad4cce75373aece085d1eb02965c30c57eaa..88889534cdc3f75bac2242071315303481e37197 100644 (file)
--- a/app-laptop/linux-phc/Manifest
+++ b/app-laptop/linux-phc/Manifest
@@ -1,12 +1,12 @@
 DIST linux-phc-0.2.8.tar.gz 371563 RMD160 abebdbbe11008922281feabe78a54414f597a8d4 SHA1 39450b9b6de50d005fac86d32f11dfd1e478ce2e SHA256 f5ffc59485bc7b4f3fb05c0f0ca84e38dc536de6b3421f237b0384a2706bada9
-EBUILD linux-phc-0.2.8.ebuild 2613 RMD160 8648f45af683f5cdac4af168604d28735ca8bc82 SHA1 e47d4367f9243eba1a7ea3c4f18456ef2b5033ba SHA256 4851db2ccccac3d66d2a2d10d0388144a549fc008414f1a1c475dddc987c080b
-MD5 ce40d1ed967245d4255862f992f6195b linux-phc-0.2.8.ebuild 2613
-RMD160 8648f45af683f5cdac4af168604d28735ca8bc82 linux-phc-0.2.8.ebuild 2613
-SHA256 4851db2ccccac3d66d2a2d10d0388144a549fc008414f1a1c475dddc987c080b linux-phc-0.2.8.ebuild 2613
-MISC ChangeLog 253 RMD160 78d6faffd624cae67be5b2df99d5e70e35d4be9b SHA1 be44690414237aaec48f5544c17c1ef57585239b SHA256 46f1d9a419ba7f51489fa360b9b90dc3fca5454cb57934bcf1d02155d37d9b0f
-MD5 2a4cce8b5fbb82585aa3a248b4a754c3 ChangeLog 253
-RMD160 78d6faffd624cae67be5b2df99d5e70e35d4be9b ChangeLog 253
-SHA256 46f1d9a419ba7f51489fa360b9b90dc3fca5454cb57934bcf1d02155d37d9b0f ChangeLog 253
+EBUILD linux-phc-0.2.8.ebuild 2712 RMD160 439c534cfd0499a0f901d575dd2f791b91942c16 SHA1 9d40eff804efdc841ead7c412c5adddd811c3e60 SHA256 e0b97f8e5b7ed3acccf0033f7f583196648d76b095fb391eb6835b496dc5eee5
+MD5 4198d7abdb74c70201385b1eed496539 linux-phc-0.2.8.ebuild 2712
+RMD160 439c534cfd0499a0f901d575dd2f791b91942c16 linux-phc-0.2.8.ebuild 2712
+SHA256 e0b97f8e5b7ed3acccf0033f7f583196648d76b095fb391eb6835b496dc5eee5 linux-phc-0.2.8.ebuild 2712
+MISC ChangeLog 390 RMD160 afed8b8fb7b17d5378ffc48827699b04d2c96499 SHA1 526a0fc0487755179444d59ad462eb6e649c3adf SHA256 5a333e3065049521fcff5c8b9bb7523a6bbb46d3909f0b56aaf9297dceeb3f5f
+MD5 14e1ac0f81181d5cfa70a01c586fae4f ChangeLog 390
+RMD160 afed8b8fb7b17d5378ffc48827699b04d2c96499 ChangeLog 390
+SHA256 5a333e3065049521fcff5c8b9bb7523a6bbb46d3909f0b56aaf9297dceeb3f5f ChangeLog 390
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/app-laptop/linux-phc/linux-phc-0.2.8.ebuild b/app-laptop/linux-phc/linux-phc-0.2.8.ebuild
index 0fef623208a489106fcffc4b50679cfcadac5d28..0811e081bfb8f1c26cc6e851465f692bc556d8a9 100644 (file)
--- a/app-laptop/linux-phc/linux-phc-0.2.8.ebuild
+++ b/app-laptop/linux-phc/linux-phc-0.2.8.ebuild
@@ -36,6 +36,19 @@ which_patch() {
        fi
 }
 
+collision_check() {
+       if has collision_protect ${FEATURES}; then
+               ewarn "Collisions are expected as this patches kernel code. Disable"
+               ewarn "FEATURES=collision-protect before use"
+               die 'incompatible FEATURES=collision-protect'
+       fi
+}
+
+pkg_setup() {
+       linux-info_pkg_setup
+       collision_check
+}
+
 src_unpack() {
        which_patch
 
@@ -76,7 +89,11 @@ src_install() {
        doinitd gentoo/etc/init.d/undervolt
        doconfd gentoo/etc/conf.d/undervolt
        cd "${S}/utils/measurefreq"
-       emake DESTDIR=${D} install || die "emake failed"
+       emake DESTDIR="${D}" install || die "emake failed"
+}
+
+pkg_preinst() {
+       collision_check
 }
 
 pkg_postinst() {
@@ -85,13 +102,6 @@ pkg_postinst() {
        ewarn "Edit /etc/conf.d/undervolt before using the initscript"
 }
 
-pkg_preinst() {
-       if has collision_protect ${FEATURES}; then
-               ewarn "Collisions are expected as this patches kernel code. Disable"
-               ewarn "FEATURES=collision-protect before use"
-               die 'incompatible FEATURES=collision-protect'
-       fi
-}
 
 pkg_postrm() {
        ewarn "Unmerging this ebuild won't revert the patches in your kernel"