1 |
pacho 15/01/29 09:59:51 |
2 |
|
3 |
Modified: ChangeLog gnome2.eclass |
4 |
Log: |
5 |
Drop support for eapi0 and 1 (#530046) |
6 |
|
7 |
Revision Changes Path |
8 |
1.1517 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1517&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1517&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1516&r2=1.1517 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1516 |
18 |
retrieving revision 1.1517 |
19 |
diff -u -r1.1516 -r1.1517 |
20 |
--- ChangeLog 28 Jan 2015 13:48:58 -0000 1.1516 |
21 |
+++ ChangeLog 29 Jan 2015 09:59:51 -0000 1.1517 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1516 2015/01/28 13:48:58 grknight Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1517 2015/01/29 09:59:51 pacho Exp $ |
27 |
+ |
28 |
+ 29 Jan 2015; Pacho Ramos <pacho@g.o> gnome2.eclass: |
29 |
+ Drop support for eapi0 and 1 (#530046) |
30 |
|
31 |
28 Jan 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass, |
32 |
mysql-cmake.eclass: |
33 |
|
34 |
|
35 |
|
36 |
1.128 eclass/gnome2.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.128&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.128&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.127&r2=1.128 |
41 |
|
42 |
Index: gnome2.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v |
45 |
retrieving revision 1.127 |
46 |
retrieving revision 1.128 |
47 |
diff -u -r1.127 -r1.128 |
48 |
--- gnome2.eclass 16 Dec 2014 00:04:31 -0000 1.127 |
49 |
+++ gnome2.eclass 29 Jan 2015 09:59:51 -0000 1.128 |
50 |
@@ -1,6 +1,6 @@ |
51 |
-# Copyright 1999-2014 Gentoo Foundation |
52 |
+# Copyright 1999-2015 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.127 2014/12/16 00:04:31 pacho Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.128 2015/01/29 09:59:51 pacho Exp $ |
56 |
|
57 |
# @ECLASS: gnome2.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -13,16 +13,6 @@ |
60 |
inherit eutils fdo-mime libtool gnome.org gnome2-utils |
61 |
|
62 |
case "${EAPI:-0}" in |
63 |
- 0|1) |
64 |
- eqawarn |
65 |
- eqawarn "${CATEGORY}/${PF}: EAPI 0/1 support is now deprecated." |
66 |
- eqawarn "If you are the package maintainer, please" |
67 |
- eqawarn "update this package to a newer EAPI." |
68 |
- eqawarn "Support for EAPIs 0 and 1 for gnome2.eclass will be dropped" |
69 |
- eqawarn "in a month (around 23rd December)." |
70 |
- eqawarn |
71 |
- EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
72 |
- ;; |
73 |
2|3|4|5) |
74 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
75 |
;; |
76 |
@@ -39,7 +29,7 @@ |
77 |
# @DESCRIPTION: |
78 |
# Should we delete ALL the .la files? |
79 |
# NOT to be used without due consideration. |
80 |
-if has ${EAPI:-0} 0 1 2 3 4; then |
81 |
+if has ${EAPI:-0} 2 3 4; then |
82 |
GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} |
83 |
else |
84 |
GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} |
85 |
@@ -77,14 +67,12 @@ |
86 |
IUSE="debug" |
87 |
fi |
88 |
|
89 |
- |
90 |
# @FUNCTION: gnome2_src_unpack |
91 |
# @DESCRIPTION: |
92 |
# Stub function for old EAPI. |
93 |
gnome2_src_unpack() { |
94 |
unpack ${A} |
95 |
cd "${S}" |
96 |
- has ${EAPI:-0} 0 1 && gnome2_src_prepare |
97 |
} |
98 |
|
99 |
# @FUNCTION: gnome2_src_prepare |
100 |
@@ -102,7 +90,7 @@ |
101 |
gnome2_disable_deprecation_warning |
102 |
|
103 |
# Run libtoolize |
104 |
- if has ${EAPI:-0} 0 1 2 3; then |
105 |
+ if has ${EAPI:-0} 2 3; then |
106 |
elibtoolize ${ELTCONF} |
107 |
else |
108 |
# Everything is fatal EAPI 4 onwards |
109 |
@@ -130,7 +118,7 @@ |
110 |
# rebuild docs. |
111 |
# Preserve old behavior for older EAPI. |
112 |
if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then |
113 |
- if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then |
114 |
+ if has ${EAPI:-0} 2 3 4 && in_iuse doc ; then |
115 |
G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" |
116 |
else |
117 |
G2CONF="--disable-gtk-doc ${G2CONF}" |
118 |
@@ -149,7 +137,7 @@ |
119 |
fi |
120 |
|
121 |
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 |
122 |
- if has ${EAPI:-0} 0 1 2 3 4; then |
123 |
+ if has ${EAPI:-0} 2 3 4; then |
124 |
if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then |
125 |
G2CONF="--disable-silent-rules ${G2CONF}" |
126 |
fi |
127 |
@@ -183,9 +171,8 @@ |
128 |
|
129 |
# @FUNCTION: gnome2_src_compile |
130 |
# @DESCRIPTION: |
131 |
-# Stub function for old EAPI. |
132 |
+# Only default src_compile for now |
133 |
gnome2_src_compile() { |
134 |
- has ${EAPI:-0} 0 1 && gnome2_src_configure "$@" |
135 |
emake || die "compile failure" |
136 |
} |
137 |
|
138 |
@@ -194,7 +181,7 @@ |
139 |
# Gnome specific install. Handles typical GConf and scrollkeeper setup |
140 |
# in packages and removal of .la files if requested |
141 |
gnome2_src_install() { |
142 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
143 |
+ has ${EAPI:-0} 2 && ! use prefix && ED="${D}" |
144 |
# if this is not present, scrollkeeper-update may segfault and |
145 |
# create bogus directories in /var/lib/ |
146 |
local sk_tmp_dir="/var/lib/scrollkeeper" |
147 |
@@ -218,7 +205,7 @@ |
148 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
149 |
|
150 |
# Handle documentation as 'default' for eapi5 and newer, bug #373131 |
151 |
- if has ${EAPI:-0} 0 1 2 3 4; then |
152 |
+ if has ${EAPI:-0} 2 3 4; then |
153 |
# Manual document installation |
154 |
if [[ -n "${DOCS}" ]]; then |
155 |
dodoc ${DOCS} || die "dodoc failed" |
156 |
@@ -239,7 +226,7 @@ |
157 |
rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
158 |
|
159 |
# Delete all .la files |
160 |
- if has ${EAPI:-0} 0 1 2 3 4; then |
161 |
+ if has ${EAPI:-0} 2 3 4; then |
162 |
if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then |
163 |
ebegin "Removing .la files" |
164 |
if ! use_if_iuse static-libs ; then |