1 |
voyageur 12/04/02 20:46:24 |
2 |
|
3 |
Modified: ChangeLog gnustep-make-2.6.2.ebuild |
4 |
Added: gnustep-make-2.6.2-r1.ebuild |
5 |
Log: |
6 |
Disable libobjc2 USE flag in stable candidate, moved in revision bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.107 gnustep-base/gnustep-make/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?rev=1.107&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?rev=1.107&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?r1=1.106&r2=1.107 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v |
20 |
retrieving revision 1.106 |
21 |
retrieving revision 1.107 |
22 |
diff -u -r1.106 -r1.107 |
23 |
--- ChangeLog 20 Feb 2012 20:05:38 -0000 1.106 |
24 |
+++ ChangeLog 2 Apr 2012 20:46:24 -0000 1.107 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for gnustep-base/gnustep-make |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.106 2012/02/20 20:05:38 voyageur Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.107 2012/04/02 20:46:24 voyageur Exp $ |
30 |
+ |
31 |
+*gnustep-make-2.6.2-r1 (02 Apr 2012) |
32 |
+ |
33 |
+ 02 Apr 2012; Bernard Cafarelli <voyageur@g.o> |
34 |
+ gnustep-make-2.6.2.ebuild, +gnustep-make-2.6.2-r1.ebuild: |
35 |
+ Disable libobjc2 USE flag in stable candidate, moved in revision bump |
36 |
|
37 |
20 Feb 2012; Bernard Cafarelli <voyageur@g.o> |
38 |
gnustep-make-2.6.2.ebuild, +files/testlibobjc.m: |
39 |
|
40 |
|
41 |
|
42 |
1.5 gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild?rev=1.5&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild?rev=1.5&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild?r1=1.4&r2=1.5 |
47 |
|
48 |
Index: gnustep-make-2.6.2.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v |
51 |
retrieving revision 1.4 |
52 |
retrieving revision 1.5 |
53 |
diff -u -r1.4 -r1.5 |
54 |
--- gnustep-make-2.6.2.ebuild 20 Feb 2012 20:05:38 -0000 1.4 |
55 |
+++ gnustep-make-2.6.2.ebuild 2 Apr 2012 20:46:24 -0000 1.5 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2012 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.4 2012/02/20 20:05:38 voyageur Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.5 2012/04/02 20:46:24 voyageur Exp $ |
61 |
|
62 |
EAPI=4 |
63 |
inherit gnustep-base eutils prefix toolchain-funcs |
64 |
@@ -12,13 +12,11 @@ |
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
68 |
-IUSE="libobjc2 native-exceptions" |
69 |
+IUSE="native-exceptions" |
70 |
|
71 |
DEPEND="${GNUSTEP_CORE_DEPEND} |
72 |
>=sys-devel/make-3.75 |
73 |
- libobjc2? ( gnustep-base/libobjc2 |
74 |
- >=sys-devel/clang-2.9 ) |
75 |
- !libobjc2? ( >=sys-devel/gcc-3.3[objc] )" |
76 |
+ >=sys-devel/gcc-3.3[objc]" |
77 |
RDEPEND="${DEPEND}" |
78 |
|
79 |
pkg_setup() { |
80 |
|
81 |
|
82 |
|
83 |
1.1 gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild |
84 |
|
85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild?rev=1.1&view=markup |
86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild?rev=1.1&content-type=text/plain |
87 |
|
88 |
Index: gnustep-make-2.6.2-r1.ebuild |
89 |
=================================================================== |
90 |
# Copyright 1999-2012 Gentoo Foundation |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild,v 1.1 2012/04/02 20:46:24 voyageur Exp $ |
93 |
|
94 |
EAPI=4 |
95 |
inherit gnustep-base eutils prefix toolchain-funcs |
96 |
|
97 |
DESCRIPTION="GNUstep Makefile Package" |
98 |
HOMEPAGE="http://www.gnustep.org" |
99 |
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" |
100 |
|
101 |
LICENSE="GPL-2" |
102 |
SLOT="0" |
103 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
104 |
IUSE="libobjc2 native-exceptions" |
105 |
|
106 |
DEPEND="${GNUSTEP_CORE_DEPEND} |
107 |
>=sys-devel/make-3.75 |
108 |
libobjc2? ( gnustep-base/libobjc2 |
109 |
>=sys-devel/clang-2.9 ) |
110 |
!libobjc2? ( >=sys-devel/gcc-3.3[objc] )" |
111 |
RDEPEND="${DEPEND}" |
112 |
|
113 |
pkg_setup() { |
114 |
# Determine libobjc.so to use |
115 |
if use libobjc2; then |
116 |
libobjc_version=libobjc.so.4 |
117 |
else |
118 |
# Test new libobjc.so.3 |
119 |
$(tc-getCC) -Werror -Wl,-l:libobjc.so.3 "${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null \ |
120 |
&& libobjc_version=libobjc.so.3 \ |
121 |
|| libobjc_version=libobjc.so.2 |
122 |
fi |
123 |
|
124 |
# For existing installations, determine if we will use another libobjc.so |
125 |
if has_version gnustep-base/gnustep-make; then |
126 |
local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)" |
127 |
# Old installations did not set this explicitely |
128 |
: ${current_libobjc:=libobjc.so.2} |
129 |
|
130 |
if [[ ${current_libobjc} != ${libobjc_version} ]]; then |
131 |
ewarn "Warning: changed libobjc.so version!!" |
132 |
ewarn "The libobjc.so version used for gnustep-make has changed" |
133 |
ewarn "(either by the libojbc2 use-flag or a GCC upgrade)" |
134 |
ewarn "You must rebuild all gnustep packages installed." |
135 |
ewarn "" |
136 |
ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:" |
137 |
ewarn "# gnustep-updater -l" |
138 |
fi |
139 |
fi |
140 |
|
141 |
if use libobjc2; then |
142 |
export CC=clang |
143 |
fi |
144 |
} |
145 |
|
146 |
src_prepare() { |
147 |
# Multilib-strict |
148 |
sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed" |
149 |
epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch |
150 |
cp "${FILESDIR}"/gnustep-4.{csh,sh} "${T}"/ |
151 |
eprefixify "${T}"/gnustep-4.{csh,sh} |
152 |
} |
153 |
|
154 |
src_configure() { |
155 |
#--enable-objc-nonfragile-abi: only working in clang for now |
156 |
econf \ |
157 |
--with-layout=fhs-system \ |
158 |
--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \ |
159 |
--with-objc-lib-flag=-l:${libobjc_version} \ |
160 |
$(use_enable libobjc2 objc-nonfragile-abi) \ |
161 |
$(use_enable native-exceptions native-objc-exceptions) |
162 |
} |
163 |
|
164 |
src_compile() { |
165 |
emake |
166 |
# Prepare doc here (needed when no gnustep-make is already installed) |
167 |
if use doc ; then |
168 |
# If a gnustep-1 environment is set |
169 |
unset GNUSTEP_MAKEFILES |
170 |
pushd Documentation &> /dev/null |
171 |
emake all install |
172 |
popd &> /dev/null |
173 |
fi |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
# Get GNUSTEP_* variables |
178 |
. ./GNUstep.conf |
179 |
|
180 |
local make_eval |
181 |
use debug || make_eval="${make_eval} debug=no" |
182 |
make_eval="${make_eval} verbose=yes" |
183 |
|
184 |
emake ${make_eval} DESTDIR="${D}" install |
185 |
|
186 |
# Copy the documentation |
187 |
if use doc ; then |
188 |
dodir ${GNUSTEP_SYSTEM_DOC} |
189 |
cp -r Documentation/tmp-installation/System/Library/Documentation/* \ |
190 |
"${ED}"${GNUSTEP_SYSTEM_DOC=} |
191 |
fi |
192 |
|
193 |
dodoc FAQ README RELEASENOTES |
194 |
|
195 |
exeinto /etc/profile.d |
196 |
doexe "${T}"/gnustep-4.sh |
197 |
doexe "${T}"/gnustep-4.csh |
198 |
} |
199 |
|
200 |
pkg_postinst() { |
201 |
# Warn about new layout if old GNUstep directory is still here |
202 |
if [ -e /usr/GNUstep/System ]; then |
203 |
ewarn "Old layout directory detected (/usr/GNUstep/System)" |
204 |
ewarn "Gentoo has switched to FHS layout for GNUstep packages" |
205 |
ewarn "You must first update the configuration files from this package," |
206 |
ewarn "then remerge all packages still installed with the old layout" |
207 |
ewarn "You can use gnustep-base/gnustep-updater for this task" |
208 |
fi |
209 |
} |