From ab62dd4264827d65ff4a334f3acaf5b28306ce17 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 13 Apr 2012 09:02:08 +0000 Subject: Install modules before trying to modify them in src_install. Bug #411675 Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64 --- app-laptop/prey/ChangeLog | 7 +++++-- app-laptop/prey/Manifest | 28 +++++++++++++++++----------- app-laptop/prey/prey-0.5.3.ebuild | 11 +++++------ 3 files changed, 27 insertions(+), 19 deletions(-) (limited to 'app-laptop') diff --git a/app-laptop/prey/ChangeLog b/app-laptop/prey/ChangeLog index bf031d8c56f6..b55ed60ee82d 100644 --- a/app-laptop/prey/ChangeLog +++ b/app-laptop/prey/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-laptop/prey -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.2 2011/10/31 17:15:40 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/ChangeLog,v 1.3 2012/04/13 09:02:08 hwoarang Exp $ + + 13 Apr 2012; Markos Chandras prey-0.5.3.ebuild: + Install modules before trying to modify them in src_install. Bug #411675 31 Oct 2011; Samuli Suominen prey-0.5.3.ebuild: Fix media-video/mplayer USE depend from "v4l2" to "v4l" wrt #385241 diff --git a/app-laptop/prey/Manifest b/app-laptop/prey/Manifest index 12a704a87d95..f2c119ce881c 100644 --- a/app-laptop/prey/Manifest +++ b/app-laptop/prey/Manifest @@ -1,22 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX prey-0.5.3-gtk-ui.patch 1179 RMD160 d5ce0a426922ef7aad6f49290ce6571af2e1480e SHA1 59901af09f8e6fe82746bd26f4074a12187e3235 SHA256 e6272e6999cb939c7a539633916691448344da7fd43d0fe106cf697259e66fc1 AUX prey-0.5.3-mplayer-support.patch 1502 RMD160 f5805fb88d9ae13c62fface160c7e58122b02267 SHA1 4744fc84fb3a40064bbbc31a3e18bd733f3141d1 SHA256 e36f42783d7d17e73038dbb09b29812d272ecb2cf2d89e5848078d949d5e8245 AUX prey-cron-functions.patch 1118 RMD160 13942e017914ad27040bbfa0b4eea75d9886a707 SHA1 39dce3f94af89689a382d83f56b0432ba43997b0 SHA256 365841680a0351621970a1ca1466c33e470146b3527eb0246990c7b0c3cabd7b AUX prey.cron 40 RMD160 7e0860ed0f1bef387f880414fda026ef1ce8505d SHA1 913f62662cd79782277e44fd279733708afd6b5b SHA256 db734b149b34c68bb28894d01b0fd4d189cc86aca8cacffddfa9059f44d1413c DIST prey-0.5.3-linux.zip 639364 RMD160 511ff534d1b2e629f35733a2aa564711528fec77 SHA1 af459705df270d67f7a3142667cf38c446667cb3 SHA256 fdeed1987d30b4ca585e19ac9884194bc8a108bd56112d2913206fc85be3bd9b -EBUILD prey-0.5.3.ebuild 4306 RMD160 78828d6bb99d0fa63320d8adb93f2327f63f9e92 SHA1 c848577793428f48d030136bed2fa98a26059947 SHA256 3b817d07a678879d38ae8f6bfdef38ba5a34eb4cdf869a1ba524132e2f469cf5 -MISC ChangeLog 734 RMD160 653562f15e46350c3cc80cfc22253602f00188cf SHA1 1aa42c02b5f2a53319de1998153d5e8f83c37297 SHA256 3e6360f72063c00f4f73ba4ae120a57cc2e768f08af4555310260df51ea7b82f +EBUILD prey-0.5.3.ebuild 4307 RMD160 6b1dd4f70542761f77516348d259d65928838433 SHA1 e3d86944f7fe150ebbc0fce783c783bb75c5aadc SHA256 520dc8ef234b4383407ec4dfcb9f50828f10489422ceaa42c9bfe42f4465a216 +MISC ChangeLog 881 RMD160 497c9fb967ef10e015ad56745a2af68bb22f9fd7 SHA1 1aba96695d83ec729eae411d90d94759e8c9837a SHA256 0685f6b65f899908f67761ebc5d96a2e59a44a893568a9c59fa20b43a6ac6c1d MISC metadata.xml 1344 RMD160 7e6fb77d4f6633943ef59ac5ea4c91847f363683 SHA1 6ef0396722030f97f4d28bc68be6e3a53f7f9a0c SHA256 f0667b7a0b0ca396e48f0d1a2522361db5b795ef756c5c5f2362e4ef0c213085 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJOrte5AAoJEEdUh39IaPFNePcIAI2jMT2d0ryM6nZOrBPMorWw -wdiVp9cn5Trpwr3SKUKOz46/BnqrMTXndJ/KJnrihzwa3uyJgKTyyExFCuaI/Vk9 -kv88lJF2n7UwXZK4HZZIRROknMCCTu0MbFX8OF6v6n6fBlSjYNmN7ubYaU37nYru -7kmvCvbZgHVDAmkxe8y+9X1BAdLjsnyQQGT4Kbxzb0pfxwJFKnabiaJN/mcxUgM+ -jIU7Cz/AQ+LneOMpzcMBiZgMO4yMgJIYLYHup+n/nm2LM9OFpXaOa2pEzYjm40BI -2MYVCEChMGfqkCSdCbxYmj+ZhGYVA8SxgTVy73TRG4oi0vde8FE/68qHxVsdu/o= -=9UVu +iQIcBAEBCgAGBQJPh+uUAAoJEPqDWhW0r/LCO+EQAL5hJqqRfpYJEpJdcazsidY6 +I6tRwq/cXyNXjknQ5SzvmWVFHLpzerHitnJh/njek6TMEOthPQwurT8PTEfDAUM6 +5nFMP5QjrJG1rRlwfbEaTSLwCw09bFbc0YeF+ZbOgCOol/NLxs4D+Pbjm2OQ9h6Z +THfFeOHErjffGZryN0MFmF9duBedBLbrW5AiVHd4CH6pMvsJUxA0cqIQ1oiV/84H +x/uLv475qlGnsFEMGA9VmkmlslJ4x6JMrpjbCYsTzbRogJxhO+L0LyR8QjzMUmyw +hVhUsSiqVLeFi7E1KTZZ+Z5+fQ/GWq7zy6QasIs9jHoVFIYa/OfR4X6tAHaPZV5T +64ZNWDFhJax0cH741sywV12Yy6TdXBK82WWma1g2yqwyaVQjNjY7NHUFFlj8e6ph +1jnWxxTaN/ouMMoriB1jHowrcWYrTiR7Jx2/IoopOqrEeZk8W5UKaPrUfz08OUsS +ssmUyYnywZG+9StcQruAWyVcdJjgTk/+DvuyU7mFOfc5hHE0OVQDVk1dVAQ5A/yU +T3LWNaE5bRYAkhmKCIjMaP3pgMjZRktpHiheG4kgaNc7Ds5VdaQublsN+8wRn6yY +Sa6sEMGLRGz+Y3kzgrgQnDNOlFKjn4Bx88oEpyX1RhxM8YmdYzS1XDEEKLRA4z5G +CXf+1uvFzbRzC73UN111 +=XFJL -----END PGP SIGNATURE----- diff --git a/app-laptop/prey/prey-0.5.3.ebuild b/app-laptop/prey/prey-0.5.3.ebuild index bee77778b887..ea708283be1e 100644 --- a/app-laptop/prey/prey-0.5.3.ebuild +++ b/app-laptop/prey/prey-0.5.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.3.ebuild,v 1.2 2011/10/31 17:15:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/prey/prey-0.5.3.ebuild,v 1.3 2012/04/13 09:02:08 hwoarang Exp $ EAPI=4 @@ -128,15 +128,14 @@ src_install() { newins "$mod/config" "mod-$mod.conf" use userpriv && { fowners root:${PN} "/etc/${PN}/mod-$mod.conf" ; } fperms 660 "/etc/${PN}/mod-$mod.conf" + # Rest of the module in its expected location + insinto /usr/share/prey/modules + doins -r "$mod" if [[ $mod == "lock" ]]; then fperms 555 \ "/usr/share/${PN}/modules/lock/platform/linux/${PN}-lock" fi fi - - # Rest of the module in its expected location - insinto /usr/share/prey/modules - doins -r "$mod" done } -- cgit v1.2.3-65-gdbad