Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 28 Jun 2016 23:34:58
Message-Id: 1467156855.c45bfe66551e30361dbabd9b62251a1d00f193e4.floppym@gentoo
1 commit: c45bfe66551e30361dbabd9b62251a1d00f193e4
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 28 22:48:52 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 23:34:15 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c45bfe66
7
8 chromium-2.eclass: drop phase functions
9
10 eclass/chromium-2.eclass | 71 +-----------------------------------------------
11 1 file changed, 1 insertion(+), 70 deletions(-)
12
13 diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
14 index f656e0a..4833914 100644
15 --- a/eclass/chromium-2.eclass
16 +++ b/eclass/chromium-2.eclass
17 @@ -9,11 +9,7 @@
18 # Mike Gilbert <floppym@g.o>
19 # @BLURB: Shared functions for chromium and google-chrome
20
21 -inherit eutils fdo-mime gnome2-utils linux-info
22 -
23 -if [[ ${CHROMIUM_EXPORT_PHASES} != no ]]; then
24 - EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm
25 -fi
26 +inherit eutils linux-info
27
28 if [[ ${PN} == chromium ]]; then
29 IUSE+=" custom-cflags"
30 @@ -113,47 +109,6 @@ chromium_remove_language_paks() {
31 done
32 }
33
34 -chromium_pkg_preinst() {
35 - gnome2_icon_savelist
36 -}
37 -
38 -chromium_pkg_postinst() {
39 - fdo-mime_desktop_database_update
40 - gnome2_icon_cache_update
41 -
42 - # For more info see bug #292201, bug #352263, bug #361859.
43 - if ! has_version x11-themes/gnome-icon-theme &&
44 - ! has_version x11-themes/oxygen-icons ; then
45 - elog
46 - elog "Depending on your desktop environment, you may need"
47 - elog "to install additional packages to get icons on the Downloads page."
48 - elog
49 - elog "For KDE, the required package is kde-frameworks/oxygen-icons."
50 - elog
51 - elog "For other desktop environments, try one of the following:"
52 - elog " - x11-themes/gnome-icon-theme"
53 - elog " - x11-themes/tango-icon-theme"
54 - fi
55 -
56 - # For more info see bug #359153.
57 - elog
58 - elog "Some web pages may require additional fonts to display properly."
59 - elog "Try installing some of the following packages if some characters"
60 - elog "are not displayed properly:"
61 - elog " - media-fonts/arphicfonts"
62 - elog " - media-fonts/bitstream-cyberbit"
63 - elog " - media-fonts/droid"
64 - elog " - media-fonts/ipamonafont"
65 - elog " - media-fonts/ja-ipafonts"
66 - elog " - media-fonts/takao-fonts"
67 - elog " - media-fonts/wqy-microhei"
68 - elog " - media-fonts/wqy-zenhei"
69 -}
70 -
71 -chromium_pkg_postrm() {
72 - gnome2_icon_cache_update
73 -}
74 -
75 chromium_pkg_die() {
76 if [[ "${EBUILD_PHASE}" != "compile" ]]; then
77 return
78 @@ -232,27 +187,3 @@ gyp_use() {
79 local gypflag="-D${2:-use_${1//-/_}}="
80 usex "$1" "${gypflag}" "${gypflag}" "${3-1}" "${4-0}"
81 }
82 -
83 -# @FUNCTION: chromium_bundled_v8_version
84 -# @USAGE: [path to version.cc]
85 -# @DESCRIPTION:
86 -# Outputs the version of v8 parsed from a (bundled) copy of the source code.
87 -chromium_bundled_v8_version() {
88 - local vf=${1:-v8/src/version.cc}
89 - local major minor build patch
90 - major=$(sed -ne 's/#define MAJOR_VERSION *\([0-9]*\)/\1/p' "${vf}")
91 - minor=$(sed -ne 's/#define MINOR_VERSION *\([0-9]*\)/\1/p' "${vf}")
92 - build=$(sed -ne 's/#define BUILD_NUMBER *\([0-9]*\)/\1/p' "${vf}")
93 - patch=$(sed -ne 's/#define PATCH_LEVEL *\([0-9]*\)/\1/p' "${vf}")
94 - echo "${major}.${minor}.${build}.${patch}"
95 -}
96 -
97 -# @FUNCTION: chromium_installed_v8_version
98 -# @USAGE:
99 -# @DESCRIPTION:
100 -# Outputs the version of dev-lang/v8 currently installed on the host system.
101 -chromium_installed_v8_version() {
102 - local cpf=$(best_version dev-lang/v8)
103 - local pvr=${cpf#dev-lang/v8-}
104 - echo "${pvr%-r*}"
105 -}