Link against libXaw with USE=athena. Change [ ] to [[ ]] throughout.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

4 files changed, 26 insertions, 17 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 49e59b043f8b..c5c56893ccbf 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.429 2011/09/08 14:10:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.430 2011/09/24 13:00:13 ulm Exp $
+
+  24 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild,
+  metadata.xml:
+  Link against libXaw with USE=athena. Change [ ] to [[ ]] throughout.
 
   02 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
   Backport some changes from the emacs-vcs live ebuild.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index eff04ef1dcde..6bbd8c9be9ab 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,13 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5022 RMD160 b7ece01e4d6bd874b4f719682ec89ad02e92356
 EBUILD emacs-22.3-r8.ebuild 7874 RMD160 213faef35dfe75d32e0c325399302af10a5d810f SHA1 2d3cd24c7e9f5ff79e27daf11c337c8fddc3b041 SHA256 e6a2d9a214be37d16e342a4d56ef473db2076940270ac879073f781e4a9372e2
 EBUILD emacs-23.2-r2.ebuild 9169 RMD160 da42435c54872e15a786f36e586b39855b33686f SHA1 b84b1d60ba0f4f3a9aa8b1952aa3cfd40c731b1c SHA256 7dd8751820b59c7b6619e05d879263fe91a56269a74240daf9d6326e44a942e1
 EBUILD emacs-23.3-r1.ebuild 10269 RMD160 4a384f15d098757c99f15d0592a49d2415b9d2f5 SHA1 5c1a2259f4911c8e238a4cdcfe686998ecad7039 SHA256 8b50b0f54553270a1c71a948110fe0d101a2f11ffe847913d60abb4aa716130a
-EBUILD emacs-23.3-r2.ebuild 10399 RMD160 abb9075f2a1bf79cd1f850489c0fe0d3c24fc804 SHA1 bedbb80e6f98ba9b12fb12ca7df45370bcbd6f45 SHA256 8d1304cbe1f4574534da83a32410843bb26210d3dd5ab4491cb25b0ef59d1a7e
-MISC ChangeLog 61285 RMD160 0ee915e0984e73d8084b7c3b322f3a7f6227f97d SHA1 ffcf6b0c7c3e6c179df6da6604a9b2a9a1c7a497 SHA256 202eaaca6bd67c203047996db9510b93fce221bb170654cde2774b54f0da85b2
-MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1
+EBUILD emacs-23.3-r2.ebuild 10495 RMD160 57385d69a2d9e95c37782c570c96a8ff4b0abbf2 SHA1 4b607687e7228793f36388756ee7b7e6b2dcad90 SHA256 d5230927dae74699a8cc7e7787051614f12a6a14002dffaabb5f90e843a542f9
+MISC ChangeLog 61442 RMD160 414c6919b9112ffe4979eae44ee64c1e7be7cbca SHA1 65daadea0798ebbdf23d03b4e211b70b1ed70695 SHA256 289885cabedddae7e0db02515928725af016f85093a8c31ef7a99185e56a2f10
+MISC metadata.xml 1799 RMD160 a7f84fb65e4183986c56293d6736de494c866afe SHA1 09be81d68015c843266b1b2f0e4fb3d3903bb1c6 SHA256 160051b131c440f42d74910a95c00692a7e63778dc60cb331d6033abbd302808
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5ozkIACgkQOeoy/oIi7uy6iQCeKm6BoXYMFo2S9filxv3AZ6lV
-yWwAnjAPhFXpdNXNc5QTrpYOiPpoHAwF
-=gJtK
+iEYEARECAAYFAk591gsACgkQOeoy/oIi7ux2BQCeO/E8TOxSE7yqBwRgIbwYYuMY
+FPwAn1OMfxG6Ulq/4Mh5OdxiorjA4IX8
+=kolu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 42ff73125825..76a46adc3c11 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.3 2011/09/08 14:10:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.4 2011/09/24 13:00:13 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
 RDEPEND="sys-libs/ncurses
@@ -49,7 +49,10 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
+			!Xaw3d? (
+				athena? ( x11-libs/libXaw )
+				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
+			)
 		)
 	)"
 
@@ -145,9 +148,9 @@ src_configure() {
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
 			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=lucid"
+		elif use Xaw3d || use athena; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
 		elif use motif; then
 			einfo "Configuring to build with Motif toolkit"
 			myconf="${myconf} --with-x-toolkit=motif"
@@ -157,9 +160,9 @@ src_configure() {
 		fi
 
 		local f tk=
-		for f in gtk Xaw3d motif; do
+		for f in gtk Xaw3d athena motif; do
 			use ${f} || continue
-			[ "${tk}" ] \
+			[[ ${tk} ]] \
 				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
 			tk="${tk}${tk:+ }${f}"
 		done
@@ -268,7 +271,7 @@ src_install () {
 pkg_preinst() {
 	# move Info dir file to correct name
 	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [ -f "${ED}"${infodir}/dir.orig ]; then
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
 		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
 	else
 		# this should not happen in EAPI 4
@@ -286,7 +289,7 @@ pkg_preinst() {
 pkg_postinst() {
 	local f
 	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[ -e "${f}" ] || touch "${f}"
+		[[ -e ${f} ]] || touch "${f}"
 	done
 	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
 
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index adb9915f4e11..84f3ac6149d3 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -20,6 +20,8 @@
      available separately.
 </longdescription>
 <use>
+  <flag name='athena'>Enable the MIT Athena widget set
+    (<pkg>x11-libs/libXaw</pkg>)</flag>
   <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
   <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>