Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: enlightenment.eclass
Date: Mon, 23 Aug 2010 21:38:17
Message-Id: 20100823213814.085A12004E@flycatcher.gentoo.org
1 vapier 10/08/23 21:38:14
2
3 Modified: enlightenment.eclass
4 Log:
5 drop enlightenment_warning_msg now that things have stabilized quite a bit upstream
6
7 Revision Changes Path
8 1.85 eclass/enlightenment.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.85&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.85&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?r1=1.84&r2=1.85
13
14 Index: enlightenment.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v
17 retrieving revision 1.84
18 retrieving revision 1.85
19 diff -u -r1.84 -r1.85
20 --- enlightenment.eclass 22 Aug 2010 23:31:08 -0000 1.84
21 +++ enlightenment.eclass 23 Aug 2010 21:38:13 -0000 1.85
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2010 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.84 2010/08/22 23:31:08 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.85 2010/08/23 21:38:13 vapier Exp $
27
28 # @ECLASS: enlightenment.eclass
29 # @MAINTAINER:
30 @@ -86,7 +86,7 @@
31 inherit autotools
32 fi
33
34 -ENLIGHTENMENT_EXPF="pkg_setup src_unpack src_compile src_install pkg_postinst"
35 +ENLIGHTENMENT_EXPF="src_unpack src_compile src_install"
36 case "${EAPI:-0}" in
37 2|3|4) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;;
38 *) ;;
39 @@ -121,32 +121,6 @@
40 live) S=${WORKDIR}/${E_S_APPEND};;
41 esac
42
43 -enlightenment_warning_msg() {
44 - if [[ -n ${E_LIVE_SERVER} ]] ; then
45 - einfo "Using user server for live sources: ${E_LIVE_SERVER}"
46 - fi
47 - if [[ ${E_STATE} == "snap" ]] ; then
48 - ewarn "Please do not contact the E team about bugs in Gentoo."
49 - ewarn "Only contact enlightenment@g.o via e-mail or bugzilla."
50 - ewarn "Remember, this stuff is DEV only code so dont cry when"
51 - ewarn "I break you :)."
52 - elif [[ ${E_STATE} == "live" ]] ; then
53 - eerror "This is a LIVE SOURCES ebuild."
54 - eerror "That means there are NO promises it will work."
55 - eerror "If it fails to build, FIX THE CODE YOURSELF"
56 - eerror "before reporting any issues."
57 - fi
58 -}
59 -
60 -enlightenment_die() {
61 - enlightenment_warning_msg
62 - die "$@"$'\n'"!!! SEND BUG REPORTS TO enlightenment@g.o NOT THE E TEAM"
63 -}
64 -
65 -enlightenment_pkg_setup() {
66 - : enlightenment_warning_msg
67 -}
68 -
69 enlightenment_src_unpack() {
70 if [[ ${E_STATE} == "live" ]] ; then
71 case ${E_LIVE_SOURCE} in
72 @@ -184,29 +158,25 @@
73 hasq src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure
74
75 if [[ -z ${E_PYTHON} ]] ; then
76 - emake || enlightenment_die "emake failed"
77 + emake || die "emake failed"
78 else
79 distutils_src_compile
80 fi
81
82 if use doc ; then
83 if [[ -x ./gendoc ]] ; then
84 - ./gendoc || enlightenment_die "gendoc failed"
85 + ./gendoc || die
86 else
87 - emake doc || enlightenment_die "emake doc failed"
88 + emake doc || die
89 fi
90 fi
91 }
92
93 enlightenment_src_install() {
94 - emake install DESTDIR="${D}" || enlightenment_die
95 + emake install DESTDIR="${D}" || die
96 find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
97 for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
98 [[ -f ${d} ]] && dodoc ${d}
99 done
100 use doc && [[ -d doc ]] && dohtml -r doc/*
101 }
102 -
103 -enlightenment_pkg_postinst() {
104 - : enlightenment_warning_msg
105 -}