Upstream stable release. Most Gentoo patches applied by upstream.

This is possibly the end of the 21.4 series from upstream.

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x377034660A5828DE!

3 files changed, 262 insertions, 13 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index dec1b53b62c5..155e0585febd 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.191 2015/03/31 17:41:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.192 2015/04/11 00:44:43 matsl Exp $
+
+*xemacs-21.4.24 (11 Apr 2015)
+
+  11 Apr 2015; Mats Lidell <matsl@gentoo.org> +xemacs-21.4.24.ebuild:
+  Upstream stable release. Announced as the final 21.4 ever!?
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> xemacs-21.4.22-r4.ebuild,
   xemacs-21.5.31.ebuild, xemacs-21.5.33.ebuild, xemacs-21.5.34-r2.ebuild:
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index eea76d2ecad6..f80d96445fda 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -15,26 +15,33 @@ AUX xemacs-21.5.34-ncurses-tinfo.patch 699 SHA256 ded43ce90666103396d63e7a3180f9
 AUX xemacs.desktop 1061 SHA256 0f73f0492c8f647892ff94c76d7fe99bb8271ca79573093061870a60f35eaf5e SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69 WHIRLPOOL 1124a7f80ce877110e8ddd27f36c656952d81408230ad05de0458a80d00aa51cc0e0704d5b98829c99d1e92206e9fa619274c9a50bb890325e1186583b514782
 DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
 DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8 WHIRLPOOL f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e
+DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 WHIRLPOOL 469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049
 DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
 DIST xemacs-21.5.33.tar.gz 15781151 SHA256 448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151 WHIRLPOOL 29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209
 EBUILD xemacs-21.4.22-r4.ebuild 7266 SHA256 4c1624af125f8ed40c6a157a949346477fcbbdd862f521aa81876c425d4d40b0 SHA512 6d23d9cce7ca54a53803cde5e2f1c957efd06df0759d758b57eb90729269a4a98b60717943ad7249ce49b9330a869acc9784ce10de213f29a55acb05ed3ad803 WHIRLPOOL f480620847903103dfe89174d2fecac7fd613595c3bf7d26d3f941f8029299227dc7ab15934732379015b8fb5a74a650bd8cc074e08c647172cac7b9988bdb79
+EBUILD xemacs-21.4.24.ebuild 6776 SHA256 15cee5a3d16192f477779a1ed47e278d77c298bffb3bdd2a5f0f185354874ae4 SHA512 777844f35012338e8fd6b1cd6d5cfeed3cf99663d29cc260fb1e76225c3734e6b789dc499da0fca703e83b50c929a305cfe282952d026ddc37570a7afee5e5c3 WHIRLPOOL 193aa817a777fc91d4252ac8cbf1ec0ed16824b0d06db0e84840c98e840128a1c436c2a5eb4b2bdb6841d05e34a006ea817a92efc3c78fdca3cc2dd49852ccea
 EBUILD xemacs-21.5.31.ebuild 6686 SHA256 032f613c6fc676d137f1321c30ca413a4bd6de17b9ceb3de39d5b2587e95d46b SHA512 6cb54ddbfa57b0153f4c63fefff7e1bddd1a5c59aad14438d8b2e633d30e902a96bc1b79f0a655d4af70d68a8bb8ef178487eaa038216b89addb4ff96e3d16e9 WHIRLPOOL 8b7581f190486e3b67c7d99b69879c5d63c6994b53f47d1749121d49a13c7fb149a7588b92c8112d8947a6d63686f7b9ad683eb34b2db0743c2db11481484358
 EBUILD xemacs-21.5.33.ebuild 6547 SHA256 1c3cc3f9c1417d48593367af80819daf753f0f4585082747c697772fbff0ecb7 SHA512 6da1b464b38ed53b84266f86455cf42a276e5122e41f2fefda9c888eb31b2f5b95797d390552b3786d0ae4ef8f1d64518d8dd6a5a00461c64bf623c3a683baed WHIRLPOOL 3f49f8f2a4d4d8753d5202c35d2b279e0765f18193a8e680fd222afd6642acaa9235029d5c8692a1f7b5e9e6f4a0acb70360796fb1c055bc36353fcca66ea782
 EBUILD xemacs-21.5.34-r2.ebuild 7147 SHA256 2139744e0c42aeb80faade698b4df6dc8b1a163a80583af57c2ab19bd8c903c8 SHA512 01157726a8c609cf7acf0f20335e27a61f3222583635e8f1fbeeea8831b4bb379a87d5c8b3fddb5a0d00380aa8f219370e00cc8ac4d07604e259d1aaa2f3d240 WHIRLPOOL 196a182136194ee5dee885fbb199a4bcc36d57a5f1559cea66b2a9e524b37770c894153bb5f25f605b87b5cc70c9b1247e9f6374d5333d80b96203b8be7268ac
-MISC ChangeLog 32842 SHA256 26a08e7d93f095006e0382bd9a445af8144afd083ed21ba285bb981e67d21f88 SHA512 ba7e95f064f6abf98bca440e64c56952356e99ae01407154675bac4d4f2b748a3efb55647b83eca775b068a24f57aa2f25a53c57c3cf689c2d2bb662ee9e9828 WHIRLPOOL 50f0dc5ad7243f57c80f20599b80ec5ed9cef070e2eb29104ca9f8f10df767be88df284cc57653e73a868d2421e5b6eb414b4a0b75b11ca1596b514a3c1be5ef
+MISC ChangeLog 33008 SHA256 940a278b4de812f9ab42cce9055ad10bea3addaa9940057b7934768462a498c2 SHA512 1d71782d1e8dc12b28b953992270b00490b8c2c3c68c7ef8b107bca7bdc0601a0f0d7a63c7389047d3f498ad771dfed95f6da9a2b8202c8591fc51389f39862c WHIRLPOOL ed565895362d1357740ad8352677a0ea567710e4c2ca54712342794f03115698cec15a69c3a666c9ba944dfd1b273d5375f9f392dc9d5ff0eeca5812a5645af1
 MISC metadata.xml 711 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58 SHA512 b201e8584db8c7f798137dd79d2136639a0456e6127b28259ac42535664d608ff3d290e30f28ba2d71cf6c971ff5f5048d9b7911bff7907f715acbefb54d8048 WHIRLPOOL 0344fe6a29e42f5088260ccd648c83eda9cc13abbd78fa29db799ed66bed2f385735f7cd54aa5e00cf61f0cc1673892f207a553d9ccab55141c76cec2e179bfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGtw4AAoJEJQzkH1pP7W4DV0L/08lPXadhodK1AUbvT9kKM1y
-TtitiFQAsYHvp1vDKkrrAl4C+5GRo1XV7GMhxa4prGcSc2nccon6/BiV98n1ifMD
-U0uZ9j1yQs1mgaydTfvfBiFSgWqEbrW4MqF/XOt2QFabkRFjQqsO8d0F0d2WOoKh
-PqpoTAeFGAy7LB2IvT/3dSQirH5PJkxz1dRMBpqMbJLW/5hcCiQ1ulgeJj7mdxjw
-VEDBWo6zxHpUbctsKIadac0ZLSZTvo+hUSB0+2Vsn1qJyLUFHDbJ62UwrKenGl2f
-7L7wSGNAEgx2uvAsc0UaIqJW5Kb7+Vzss7OifZXpw2BCQdgEtRmj/N69BwskFO40
-U2rZODDtMRjKir3cpM0m1r1AEtZxMk7/qZSPsWJ/4qJ7MZKjadme7owOe8J8E2b7
-6VmNONoluXIXyUThyiKN7xaVoxo5fAQDjSN94opczvHeejUg9RhVAtdeWc/GKYnS
-1PaA96HunNAkoKj+bxyMH5Cmjd+1CLB5zuuzoAS/Sg==
-=3FZ8
+iQJ8BAEBCABmBQJVKG6JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRERjkwNzZBQzRGQTJCOTQwMTUxOTRGN0Qz
+NzcwMzQ2NjBBNTgyOERFAAoJEDdwNGYKWCje8F0P/R5uGBtJzb0pLPNED79CnXI6
+FKz9VBLkhSQE2HhANt2A2FORpjuSEjGfSmsvpaPR0HkgNGtSfPJcDTnbqO5pFBRA
+aZ+1Ro8wSk12PQKOmWs1k8ZLTnlgGSO/KFtDnyTSs+lt4FWUgFseXmI3L/1dPcoK
+Q3WwF9p9lme/1FcQK8AN7S2F9uasVoaAoakpmnt9TlvNU64NLIJ1Q+DVHqYM7mVD
+X2WddrKORyx5vsi9kAub6mICv1wzEoCcCIgyYipqxcO85kEVHsYhVypGh333QcwV
+BGnuh5vF9H8QjXylDh+jVufIpSY5URntbdF3xZ0eEZNUojB38mWozxXHtZYervo6
+xNlJ/rqyPm/QmQqY7QPrIsBZg+ixME2JlRI9/RyH7YL2bZl4ocMjqgydt2qlMCBz
+c+r2ypWCgRKtCtB8J0J8f6kli011Fs1ZGNNnxB6fdwVU2PVYLlAQiZ9290X+w4eX
+hLzCfNFti8T1meweAEtB5pYNrTN+5cn3STq7F6XYeEpJIJeNexXkOqYpqFp0Dw4A
+80hL9VtaI2y22PutmfSfFoCKd/L9P/EFmQdWJhYUNbQTje7xiBupKzYokAZxdUyC
+DnDuOTGv1FFZy5WIRC5Z1pwR/gxH9X5m8j5oIa1pZBakMeCcLBkI8vt+uOln0Vtp
+bXNe3RlrorhxsjbItRMd
+=+cy0
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
new file mode 100644
index 000000000000..32dd8fac1021
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.24.ebuild,v 1.1 2015/04/11 00:44:43 matsl Exp $
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql )
+	ldap? ( net-nds/openldap )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff )
+	png? ( >=media-libs/libpng-1.2 )
+	jpeg? ( virtual/jpeg )
+	canna? ( app-i18n/canna )
+	!amd64? ( freewnn? ( app-i18n/freewnn ) )
+	>=sys-libs/ncurses-5.2
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	# see bug 58350, 102540 and 143580
+	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+
+	# Run autoconf. XEmacs tries to be smart by providing a stub
+	# configure.ac file for autoconf 2.59 but this throws our
+	# autotools eclass so it must be removed first.
+	rm "${S}"/configure.ac || die
+	eautoconf
+
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_configure() {
+	local myconf=""
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff ) $(use_with png )"
+		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm && mydb="gdbm"
+
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	# fixes #21264, this should be fixed in 21.4.21 and has been fixed
+	# in 21.5 for sure. Now that 21.4.21 is out there is no real
+	# evidence that this indeed got fixed, so keep these exceptions
+	# for now.
+	use alpha && myconf="${myconf} --with-system-malloc"
+	use ppc64 && myconf="${myconf} --with-system-malloc"
+	use ia64  && myconf="${myconf} --with-system-malloc"
+
+	# Enabling modules will cause segfaults outside the XEmacs build directory
+	use ia64  && myconf="${myconf} --without-modules"
+
+	einfo "${myconf}"
+
+	# Don't use econf because it uses options which this configure
+	# script does not understand (like --host).
+	./configure ${myconf} ${EXTRA_ECONF} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--compiler=$(tc-getCC) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		|| die "The configure script failed to run properly"
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		install gzip-el || die "emake install failed"
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+}