| 1 |
commit: e38694007a1f643d82cb6d7b672b55298c864274 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 1 02:50:05 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 1 02:50:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3869400 |
| 7 |
|
| 8 |
www-client/google-chrome: do all the work in src_install |
| 9 |
|
| 10 |
.../google-chrome-beta-53.0.2785.89.ebuild | 19 +++++++++++-------- |
| 11 |
.../google-chrome-unstable-54.0.2840.6.ebuild | 19 +++++++++++-------- |
| 12 |
.../google-chrome/google-chrome-53.0.2785.89.ebuild | 19 +++++++++++-------- |
| 13 |
3 files changed, 33 insertions(+), 24 deletions(-) |
| 14 |
|
| 15 |
diff --git a/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild b/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild |
| 16 |
index cb166c0..2452d42 100644 |
| 17 |
--- a/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild |
| 18 |
+++ b/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild |
| 19 |
@@ -107,8 +107,16 @@ pkg_setup() { |
| 20 |
chromium_suid_sandbox_check_kernel_config |
| 21 |
} |
| 22 |
|
| 23 |
+src_unpack() { |
| 24 |
+ : |
| 25 |
+} |
| 26 |
+ |
| 27 |
src_install() { |
| 28 |
- rm -r usr/share/menu || die |
| 29 |
+ dodir / |
| 30 |
+ cd "${ED}" || die |
| 31 |
+ unpacker |
| 32 |
+ |
| 33 |
+ rm -r etc usr/share/menu || die |
| 34 |
mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die |
| 35 |
|
| 36 |
pushd "${CHROME_HOME}/locales" > /dev/null || die |
| 37 |
@@ -126,14 +134,9 @@ src_install() { |
| 38 |
newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png |
| 39 |
done |
| 40 |
|
| 41 |
- insinto / |
| 42 |
- doins -r opt usr |
| 43 |
- dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}" |
| 44 |
+ dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}" |
| 45 |
|
| 46 |
- find "${ED}" -type d -empty -delete || die |
| 47 |
- chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die |
| 48 |
- chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die |
| 49 |
- pax-mark m "${ED}${CHROME_HOME}/chrome" |
| 50 |
+ pax-mark m "${CHROME_HOME}/chrome" |
| 51 |
|
| 52 |
readme.gentoo_create_doc |
| 53 |
} |
| 54 |
|
| 55 |
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild |
| 56 |
index cb166c0..2452d42 100644 |
| 57 |
--- a/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild |
| 58 |
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild |
| 59 |
@@ -107,8 +107,16 @@ pkg_setup() { |
| 60 |
chromium_suid_sandbox_check_kernel_config |
| 61 |
} |
| 62 |
|
| 63 |
+src_unpack() { |
| 64 |
+ : |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_install() { |
| 68 |
- rm -r usr/share/menu || die |
| 69 |
+ dodir / |
| 70 |
+ cd "${ED}" || die |
| 71 |
+ unpacker |
| 72 |
+ |
| 73 |
+ rm -r etc usr/share/menu || die |
| 74 |
mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die |
| 75 |
|
| 76 |
pushd "${CHROME_HOME}/locales" > /dev/null || die |
| 77 |
@@ -126,14 +134,9 @@ src_install() { |
| 78 |
newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png |
| 79 |
done |
| 80 |
|
| 81 |
- insinto / |
| 82 |
- doins -r opt usr |
| 83 |
- dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}" |
| 84 |
+ dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}" |
| 85 |
|
| 86 |
- find "${ED}" -type d -empty -delete || die |
| 87 |
- chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die |
| 88 |
- chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die |
| 89 |
- pax-mark m "${ED}${CHROME_HOME}/chrome" |
| 90 |
+ pax-mark m "${CHROME_HOME}/chrome" |
| 91 |
|
| 92 |
readme.gentoo_create_doc |
| 93 |
} |
| 94 |
|
| 95 |
diff --git a/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild b/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild |
| 96 |
index cb166c0..2452d42 100644 |
| 97 |
--- a/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild |
| 98 |
+++ b/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild |
| 99 |
@@ -107,8 +107,16 @@ pkg_setup() { |
| 100 |
chromium_suid_sandbox_check_kernel_config |
| 101 |
} |
| 102 |
|
| 103 |
+src_unpack() { |
| 104 |
+ : |
| 105 |
+} |
| 106 |
+ |
| 107 |
src_install() { |
| 108 |
- rm -r usr/share/menu || die |
| 109 |
+ dodir / |
| 110 |
+ cd "${ED}" || die |
| 111 |
+ unpacker |
| 112 |
+ |
| 113 |
+ rm -r etc usr/share/menu || die |
| 114 |
mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die |
| 115 |
|
| 116 |
pushd "${CHROME_HOME}/locales" > /dev/null || die |
| 117 |
@@ -126,14 +134,9 @@ src_install() { |
| 118 |
newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png |
| 119 |
done |
| 120 |
|
| 121 |
- insinto / |
| 122 |
- doins -r opt usr |
| 123 |
- dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}" |
| 124 |
+ dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}" |
| 125 |
|
| 126 |
- find "${ED}" -type d -empty -delete || die |
| 127 |
- chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die |
| 128 |
- chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die |
| 129 |
- pax-mark m "${ED}${CHROME_HOME}/chrome" |
| 130 |
+ pax-mark m "${CHROME_HOME}/chrome" |
| 131 |
|
| 132 |
readme.gentoo_create_doc |
| 133 |
} |
Archives