Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 268793 | Differences between
and this patch

Collapse All | Expand All

(-)/Users/tetsushi/Gentoo/usr/portage/app-editors/emacs/emacs-23.2.ebuild (-16 / +24 lines)
Lines 28-34 Link Here
28
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
28
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
29
SLOT="23"
29
SLOT="23"
30
KEYWORDS="~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
30
KEYWORDS="~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
31
IUSE="aqua alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
31
IUSE="alsa cocoa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
32
RESTRICT="strip"
32
RESTRICT="strip"
33
33
34
RDEPEND="sys-libs/ncurses
34
RDEPEND="sys-libs/ncurses
Lines 110-115 Link Here
110
			|| die "unable to sed configure.in"
110
			|| die "unable to sed configure.in"
111
	fi
111
	fi
112
112
113
	if use cocoa; then
114
		epatch "${FILESDIR}/${P}-ns_appdirs.patch" \
115
			|| die "ns* patch failed";
116
	fi
117
113
	eautoreconf
118
	eautoreconf
114
}
119
}
115
120
Lines 137-147 Link Here
137
		myconf="${myconf} $(use_with sound)"
142
		myconf="${myconf} $(use_with sound)"
138
	fi
143
	fi
139
144
140
	if use X && use aqua; then
145
	if use cocoa; then
141
		die "the X and aqua USE-flags cannot be used together, please use one"
146
		einfo "Configuring to build with Cocoa support"
142
	fi
147
		if use X; then
143
148
			ewarn "cocoa USE-flag disables X."
144
	if use X; then
149
			ewarn "If you want to enable X, please set -cocoa."
150
		fi
151
		myconf="${myconf} --without-x"
152
		myconf="${myconf} --with-ns"
153
		myconf="${myconf} --disable-ns-self-contained"
154
	elif use X; then
145
		myconf="${myconf} --with-x"
155
		myconf="${myconf} --with-x"
146
		myconf="${myconf} $(use_with gconf)"
156
		myconf="${myconf} $(use_with gconf)"
147
		myconf="${myconf} $(use_with toolkit-scroll-bars)"
157
		myconf="${myconf} $(use_with toolkit-scroll-bars)"
Lines 183-202 Link Here
183
				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
193
				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
184
			tk="${tk}${tk:+ }${f}"
194
			tk="${tk}${tk:+ }${f}"
185
		done
195
		done
186
	elif use aqua; then
187
		einfo "Configuring to build with Carbon support"
188
		myconf="${myconf} --without-x"
189
		myconf="${myconf} --with-carbon"
190
		myconf="${myconf} --enable-carbon-app=${EPREFIX}/Applications/Gentoo"
191
	else
196
	else
192
		myconf="${myconf} --without-x"
197
		myconf="${myconf} --without-x"
193
		myconf="${myconf} --without-carbon"
194
	fi
198
	fi
195
199
196
	myconf="${myconf} $(use_with hesiod)"
200
	myconf="${myconf} $(use_with hesiod)"
197
	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
201
	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
198
	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
202
	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
199
	
203
200
	# According to configure, this option is only used for GNU/Linux (x86_64 and
204
	# According to configure, this option is only used for GNU/Linux (x86_64 and
201
	# s390). For Gentoo Prefix we have to explicitly spell out the location
205
	# s390). For Gentoo Prefix we have to explicitly spell out the location
202
	# because $(get_libdir) returns a 32bit location on eg. RHEL.
206
	# because $(get_libdir) returns a 32bit location on eg. RHEL.
Lines 276-284 Link Here
276
280
277
	dodoc README BUGS || die "dodoc failed"
281
	dodoc README BUGS || die "dodoc failed"
278
282
279
	if use aqua; then
283
	if use cocoa; then
280
		einfo "Emacs.app is in $EPREFIX/Applications/Gentoo."
284
		if [ ! -e "${ED}"/Applications/Gentoo ]; then
281
		einfo "You may want to copy or symlink it into /Applications by yourself."
285
			mkdir -p "${ED}"/Applications/Gentoo
286
		fi
287
		mv "${S}"/nextstep/Emacs.app "${ED}"/Applications/Gentoo/Emacs-${FULL_VERSION}.app
288
		einfo "Emacs-${FULL_VERSION}.app is in $EPREFIX/Applications/Gentoo."
289
		einfo "You may want to copy it into /Applications by yourself."
282
	fi
290
	fi
283
}
291
}
284
292

Return to bug 268793