[patch] Patch for emacs-vcs-24.0.92-r1.ebuild

emacs-vcs-24.0.92-r1.ebuild.diff (text/plain), 2.12 KB, created by Ulrich Müller on 2012-01-16 11:21:39 UTC

--- emacs-vcs-24.0.92-r1.ebuild~
+++ emacs-vcs-24.0.92-r1.ebuild
@@ -32,7 +32,8 @@
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-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"
+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"
+REQUIRED_USE="aqua? ( !X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
@@ -107,6 +108,7 @@
 	fi
 
 	epatch "${WORKDIR}"/patch/08_all_ede_security_fix.patch	#398227
+	epatch "${FILESDIR}"/emacs-${PV}-ns-appdirs.patch
 
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
@@ -148,7 +150,7 @@
 	fi
 
 	if use X; then
-		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-x --without-ns"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with gsettings)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -190,8 +192,12 @@
 				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
 			tk="${tk}${tk:+ }${f}"
 		done
-	else
+	elif use aqua; then
+		einfo "Configuring to build with Cocoa support"
+		myconf="${myconf} --with-ns --disable-ns-self-contained"
 		myconf="${myconf} --without-x"
+	else
+		myconf="${myconf} --without-x --without-ns"
 	fi
 
 	if [[ ${PV##*.} = 9999 ]]; then
@@ -300,6 +306,15 @@
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
 	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
+		elog "You may want to copy or symlink it into /Applications by yourself."
+	fi
 }
 
 pkg_preinst() {