| 1 |
commit: f0324ba32afe32db3311dfab9b9c783814f35b00 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 21 16:13:35 2011 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 21 16:13:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f0324ba3 |
| 7 |
|
| 8 |
use nsplugins.eclass for share_plugins_dir instead of mozcoreconf-2 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mozcoreconf-2.eclass | 16 ----- |
| 12 |
eclass/nsplugins.eclass | 67 +++++++++++++++++++++ |
| 13 |
mail-client/thunderbird/Manifest | 2 +- |
| 14 |
mail-client/thunderbird/thunderbird-8.0-r1.ebuild | 2 +- |
| 15 |
www-client/firefox/Manifest | 2 +- |
| 16 |
www-client/firefox/firefox-8.0.ebuild | 2 +- |
| 17 |
www-client/seamonkey/Manifest | 2 +- |
| 18 |
www-client/seamonkey/seamonkey-2.5_beta4.ebuild | 2 +- |
| 19 |
8 files changed, 73 insertions(+), 22 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass |
| 22 |
index 4930532..5b74318 100644 |
| 23 |
--- a/eclass/mozcoreconf-2.eclass |
| 24 |
+++ b/eclass/mozcoreconf-2.eclass |
| 25 |
@@ -279,19 +279,3 @@ mozconfig_final() { |
| 26 |
sed -i '/^ac_add_options --enable-extensions/d' .mozconfig |
| 27 |
echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig |
| 28 |
} |
| 29 |
- |
| 30 |
-# ${MOZILLA_FIVE_HOME} must be defined in src_install to support |
| 31 |
-share_plugins_dir() { |
| 32 |
- if [[ ${PN} == seamonkey ]] ; then |
| 33 |
- rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ |
| 34 |
- || die "failed to remove existing plugins dir" |
| 35 |
- fi |
| 36 |
- |
| 37 |
- if [[ ${PN} == *-bin ]] ; then |
| 38 |
- PLUGIN_BASE_PATH="/usr/$(get_libdir)" |
| 39 |
- else |
| 40 |
- PLUGIN_BASE_PATH=".." |
| 41 |
- fi |
| 42 |
- |
| 43 |
- dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" |
| 44 |
-} |
| 45 |
|
| 46 |
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass |
| 47 |
new file mode 100644 |
| 48 |
index 0000000..bdce719 |
| 49 |
--- /dev/null |
| 50 |
+++ b/eclass/nsplugins.eclass |
| 51 |
@@ -0,0 +1,67 @@ |
| 52 |
+# Copyright 1999-2009 Gentoo Foundation |
| 53 |
+# Distributed under the terms of the GNU General Public License v2 |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.26 2011/10/05 15:14:07 scarabeus Exp $ |
| 55 |
+# |
| 56 |
+# Author: Martin Schlemmer <azarah@g.o> |
| 57 |
+# |
| 58 |
+# Just some re-usable functions for the netscape/moz plugins sharing |
| 59 |
+ |
| 60 |
+inherit eutils |
| 61 |
+ |
| 62 |
+DESCRIPTION="Based on the ${ECLASS} eclass" |
| 63 |
+ |
| 64 |
+PLUGINS_DIR="nsbrowser/plugins" |
| 65 |
+ |
| 66 |
+# This function move the plugin dir in src_install() to |
| 67 |
+# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be |
| 68 |
+# the full path (without $D) to old plugin dir. |
| 69 |
+src_mv_plugins() { |
| 70 |
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" |
| 71 |
+ |
| 72 |
+ # Move plugins dir. We use keepdir so that it might not be unmerged |
| 73 |
+ # by mistake ... |
| 74 |
+ keepdir /usr/$(get_libdir)/${PLUGINS_DIR} |
| 75 |
+ cp -a "${ED}"/$1/* "${ED}"/usr/$(get_libdir)/${PLUGINS_DIR} |
| 76 |
+ rm -rf "${ED}"/$1 |
| 77 |
+ dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1 |
| 78 |
+} |
| 79 |
+ |
| 80 |
+# This function move plugins in pkg_preinst() in old dir to |
| 81 |
+# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be |
| 82 |
+# the full path (without $ROOT) to old plugin dir. |
| 83 |
+pkg_mv_plugins() { |
| 84 |
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${ROOT}" |
| 85 |
+ |
| 86 |
+ # Move old plugins dir |
| 87 |
+ if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ] |
| 88 |
+ then |
| 89 |
+ mkdir -p "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} |
| 90 |
+ cp -a "${EROOT}"/$1/* "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} |
| 91 |
+ rm -rf "${EROOT}"/$1 |
| 92 |
+ fi |
| 93 |
+} |
| 94 |
+ |
| 95 |
+# This function installs a plugin with dosym to PLUGINS_DIR. |
| 96 |
+# First argument should be the plugin file. |
| 97 |
+inst_plugin() { |
| 98 |
+ dodir /usr/$(get_libdir)/${PLUGINS_DIR} |
| 99 |
+ dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}/$(basename ${1}) |
| 100 |
+} |
| 101 |
+ |
| 102 |
+# This function ensures we use proper plugin path for Gentoo. |
| 103 |
+# This should only be used by mozilla packages. |
| 104 |
+# ${MOZILLA_FIVE_HOME} must be defined in src_install to support |
| 105 |
+share_plugins_dir() { |
| 106 |
+ if [[ ${PN} == seamonkey ]] ; then |
| 107 |
+ rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ |
| 108 |
+ || die "failed to remove existing plugins dir" |
| 109 |
+ fi |
| 110 |
+ |
| 111 |
+ if [[ ${PN} == *-bin ]] ; then |
| 112 |
+ PLUGIN_BASE_PATH="/usr/$(get_libdir)" |
| 113 |
+ else |
| 114 |
+ PLUGIN_BASE_PATH=".." |
| 115 |
+ fi |
| 116 |
+ |
| 117 |
+ dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" |
| 118 |
+} |
| 119 |
|
| 120 |
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest |
| 121 |
index 58f8935..fbea527 100644 |
| 122 |
--- a/mail-client/thunderbird/Manifest |
| 123 |
+++ b/mail-client/thunderbird/Manifest |
| 124 |
@@ -56,4 +56,4 @@ DIST thunderbird-8.0-vi.xpi 425968 RMD160 5412aefbf05179354fb4fa2f3865a58b535520 |
| 125 |
DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132 |
| 126 |
DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a |
| 127 |
DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256 f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5 |
| 128 |
-EBUILD thunderbird-8.0-r1.ebuild 9841 RMD160 ad3cff9e507bfa11042ff335e5df3169c8208e76 SHA1 44edb74edaa35fc2b8fc5219ee91906f04d9a8d7 SHA256 7b2bc7272973cbe02febf86f84ddb387a2a10229e5b91c647fd94f74823d6e7b |
| 129 |
+EBUILD thunderbird-8.0-r1.ebuild 9851 RMD160 08eec1866071e6eaa02e8fe9825e17d7251db77f SHA1 26f5987ffc4291fd6b67cd9c741a40b02d9bb83f SHA256 4926d4d2f1b939e06d6d2818163fa38f2d1d299f5fb01941a84b4b6d11ed4f30 |
| 130 |
|
| 131 |
diff --git a/mail-client/thunderbird/thunderbird-8.0-r1.ebuild b/mail-client/thunderbird/thunderbird-8.0-r1.ebuild |
| 132 |
index 3b0c6aa..515f4db 100644 |
| 133 |
--- a/mail-client/thunderbird/thunderbird-8.0-r1.ebuild |
| 134 |
+++ b/mail-client/thunderbird/thunderbird-8.0-r1.ebuild |
| 135 |
@@ -5,7 +5,7 @@ |
| 136 |
EAPI="3" |
| 137 |
WANT_AUTOCONF="2.1" |
| 138 |
|
| 139 |
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs |
| 140 |
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs nsplugins |
| 141 |
|
| 142 |
TB_PV="${PV/_beta/b}" |
| 143 |
TB_P="${PN}-${TB_PV}" |
| 144 |
|
| 145 |
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest |
| 146 |
index fbe1d5d..fa6aeed 100644 |
| 147 |
--- a/www-client/firefox/Manifest |
| 148 |
+++ b/www-client/firefox/Manifest |
| 149 |
@@ -84,4 +84,4 @@ DIST firefox-8.0-zh-CN.xpi 243430 RMD160 50781f9c1e56671b71958962d8047f1c1e69e99 |
| 150 |
DIST firefox-8.0-zh-TW.xpi 244296 RMD160 b61ad8ada60b9841a23c72579b9f903773b70e77 SHA1 faa4fa00a67585fd9cfba9e6cea2d4e4dce0f938 SHA256 bf988457d2174eaeba9272a6d049e27431fc2413f3b43ee8bab2924675dc24fa |
| 151 |
DIST firefox-8.0-zu.xpi 234633 RMD160 c8163fab204bf8b412345089cdc9a2a79aea4b27 SHA1 5120fdf77cbfd09d7cf211cfb1ec988eae1654b9 SHA256 856bfe9ea1251e1104046c1da1452298cd12280b8e281fa00a0618d7e91ab01f |
| 152 |
DIST firefox-8.0.source.tar.bz2 70377448 RMD160 f87ec7668b2dcc1bb581b97e1dbe85e4b97cb31c SHA1 843cf4ad70d2fc4b16654c3ff9b080d3eb357452 SHA256 d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139 |
| 153 |
-EBUILD firefox-8.0.ebuild 11311 RMD160 4f8bf6729ae15eaedac46044b4e87d8c706c8cb4 SHA1 da4e2b771004822422ed96967bc3863e1531e13d SHA256 78ce720efdfb0d54020fa5cdea9d1b4ed1d00f90c4540d534e1ab7b34c77be4e |
| 154 |
+EBUILD firefox-8.0.ebuild 11321 RMD160 5443df8f498301db440ffba2847b02a08710bfc2 SHA1 e82026df826470f2dd2047198e5bf4b5dde9dddb SHA256 0d8f0684852d94cd20775bd2eb1e3ff454d1a73af510325aa50aa44c5521623e |
| 155 |
|
| 156 |
diff --git a/www-client/firefox/firefox-8.0.ebuild b/www-client/firefox/firefox-8.0.ebuild |
| 157 |
index e41974a..89e3c3a 100644 |
| 158 |
--- a/www-client/firefox/firefox-8.0.ebuild |
| 159 |
+++ b/www-client/firefox/firefox-8.0.ebuild |
| 160 |
@@ -6,7 +6,7 @@ EAPI="3" |
| 161 |
VIRTUALX_REQUIRED="pgo" |
| 162 |
WANT_AUTOCONF="2.1" |
| 163 |
|
| 164 |
-inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx |
| 165 |
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins |
| 166 |
|
| 167 |
MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc. |
| 168 |
FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI |
| 169 |
|
| 170 |
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest |
| 171 |
index 9f7acea..cd00d73 100644 |
| 172 |
--- a/www-client/seamonkey/Manifest |
| 173 |
+++ b/www-client/seamonkey/Manifest |
| 174 |
@@ -29,4 +29,4 @@ DIST seamonkey-2.5_beta4-sv-SE.xpi 871535 RMD160 6a0a7eeee3a7054b7989f1ffa853d8d |
| 175 |
DIST seamonkey-2.5_beta4-tr.xpi 807205 RMD160 541bac93d2a5310594f40e4bf28af68dc402d05e SHA1 07e4695723b2852c9463a95843bc93cf38d87f57 SHA256 0c0a655ea10bcf9b86d25d9b58c9a8cae7fdae191c02fb63359d8f2fc14b9902 |
| 176 |
DIST seamonkey-2.5_beta4-zh-CN.xpi 837986 RMD160 6f45ba71684339b3c2de6db5413934e1ad56e687 SHA1 e63de8518475adf66b1b938a0cad7faca0879e21 SHA256 75952433c1268f3b0b8f363be774ed17f747b6dd7b7103df48c373343c2a0525 |
| 177 |
DIST seamonkey-2.5_beta4.source.tar.bz2 89481907 RMD160 1ed9a59457b7bafe2aed2071908822b98225dddc SHA1 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe SHA256 10031a49b84542641bc93b40c3e8c3a56dd3aee90db47b49880ec1d100302231 |
| 178 |
-EBUILD seamonkey-2.5_beta4.ebuild 10089 RMD160 b65455a71643afc3a84d10a3bbfb048433db92f1 SHA1 f8a3e41795b8899b1b3d7a5e2c8ffbfea4ba7c7a SHA256 e0e124ed31eca4ad0ac1a488fbbd2704fee3ee47d0f4d74d1246ffc7e868c6ce |
| 179 |
+EBUILD seamonkey-2.5_beta4.ebuild 10099 RMD160 d3ffeaf1ebb53a65f763cb57ca964f5177386ed3 SHA1 d3d7e30a455669e04be29aeb50e1fec30fa7eb96 SHA256 aa8952368cf901bd9b1e204043143d2e3b4bf94c4a56c03b0bd1bf6545cf77c8 |
| 180 |
|
| 181 |
diff --git a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild b/www-client/seamonkey/seamonkey-2.5_beta4.ebuild |
| 182 |
index d9ea39d..912b4d9 100644 |
| 183 |
--- a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild |
| 184 |
+++ b/www-client/seamonkey/seamonkey-2.5_beta4.ebuild |
| 185 |
@@ -5,7 +5,7 @@ |
| 186 |
EAPI="3" |
| 187 |
WANT_AUTOCONF="2.1" |
| 188 |
|
| 189 |
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python |
| 190 |
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python nsplugins |
| 191 |
|
| 192 |
PATCH="${PN}-2.4.1-patches-01" |
| 193 |
EMVER="1.3.3" |
Archives