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

Collapse All | Expand All

(-)emacs-vcs-24.0.93.ebuild (-1 / +17 lines)
Lines 30-36 Link Here
30
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
30
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
31
SLOT="24"
31
SLOT="24"
32
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
32
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
33
IUSE="alsa athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
33
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
34
REQUIRED_USE="aqua? ( !X )"
34
35
35
RDEPEND="sys-libs/ncurses
36
RDEPEND="sys-libs/ncurses
36
	>=app-admin/eselect-emacs-1.2
37
	>=app-admin/eselect-emacs-1.2
Lines 104-109 Link Here
104
			|| die "Upstream version number changed to ${FULL_VERSION}"
105
			|| die "Upstream version number changed to ${FULL_VERSION}"
105
	fi
106
	fi
106
107
108
	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
109
107
	if ! use alsa; then
110
	if ! use alsa; then
108
		# ALSA is detected even if not requested by its USE flag.
111
		# ALSA is detected even if not requested by its USE flag.
109
		# Suppress it by supplying pkg-config with a wrong library name.
112
		# Suppress it by supplying pkg-config with a wrong library name.
Lines 188-193 Link Here
188
191
189
		! use gtk && use gtk3 \
192
		! use gtk && use gtk3 \
190
			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
193
			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
194
	elif use aqua; then
195
		einfo "Configuring to build with Cocoa support"
196
		myconf="${myconf} --with-ns --disable-ns-self-contained"
197
		myconf="${myconf} --without-x"
191
	else
198
	else
192
		myconf="${myconf} --without-x --without-ns"
199
		myconf="${myconf} --without-x --without-ns"
193
	fi
200
	fi
Lines 298-303 Link Here
298
	elisp-site-file-install "${T}/${SITEFILE}" || die
305
	elisp-site-file-install "${T}/${SITEFILE}" || die
299
306
300
	dodoc README BUGS
307
	dodoc README BUGS
308
309
	if use aqua; then
310
		dodir /Applications/Gentoo
311
		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
312
		mv nextstep/Emacs.app \
313
			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
314
		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
315
		elog "You may want to copy or symlink it into /Applications by yourself."
316
	fi
301
}
317
}
302
318
303
pkg_preinst() {
319
pkg_preinst() {

Return to bug 399059