Version bump

Package-Manager: portage-2.1.3.19

4 files changed, 258 insertions, 8 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 9d50a75b3e3f..210a8d053836 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.100 2007/10/21 10:04:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.101 2007/11/11 09:25:49 graaff Exp $
+
+*xemacs-21.4.21 (11 Nov 2007)
+
+  11 Nov 2007; Hans de Graaff <graaff@gentoo.org> +xemacs-21.4.21.ebuild:
+  Version bump with bug fixes for a number of crashes and a few new features
+  aimed at improved compatibility with GNU Emacs.
 
   21 Oct 2007; Hans de Graaff <graaff@gentoo.org> -xemacs-21.4.20-r1.ebuild,
   -xemacs-21.4.20-r2.ebuild, -xemacs-21.4.20-r3.ebuild:
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 401dca88cfe4..6fb6350e0ec9 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -31,6 +31,7 @@ RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 files/xemacs.desktop 1080
 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060 files/xemacs.desktop 1080
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.4.20.tar.gz 8408589 RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 SHA1 651e8c2fcf680c577375a6d623bb9228a56f3a0d SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0
+DIST xemacs-21.4.21.tar.gz 8333619 RMD160 6dd212dd926cd7a8cb5ac905fb41ef787065bef5 SHA1 fe9216148ae90c9f4c8b904a987319026676c535 SHA256 7594721cc5fa66cfabfb18446e51970eebae517f024856a7d6e6e0a79adbfcb0
 EBUILD xemacs-21.4.20-r4.ebuild 6710 RMD160 71e389dfd1d12dd8ffd0058caa505fe1cb501833 SHA1 7675d8040f52b049db4d33641f1eefb61207b75b SHA256 2b2a50eb033492882d3e9950f1f965574b923bc5173af5cd3af852709ee73b51
 MD5 c147b39cfdde0aba60e4ae7843279a67 xemacs-21.4.20-r4.ebuild 6710
 RMD160 71e389dfd1d12dd8ffd0058caa505fe1cb501833 xemacs-21.4.20-r4.ebuild 6710
@@ -39,10 +40,14 @@ EBUILD xemacs-21.4.20-r5.ebuild 6918 RMD160 8380067e48559740571bd7662c28e3099085
 MD5 e8def69bdb994c25f816099cc87a7faf xemacs-21.4.20-r5.ebuild 6918
 RMD160 8380067e48559740571bd7662c28e30990857b19 xemacs-21.4.20-r5.ebuild 6918
 SHA256 8ca1e8664bc43510dd25f6976abea330964ef9294ba7102f9999ccd31c757bdd xemacs-21.4.20-r5.ebuild 6918
-MISC ChangeLog 17934 RMD160 59ed1121189273d6b98c5ea246a5c9f99ebfb9ff SHA1 d5a1fff02cb2e96c04f209605ba1262f3724b541 SHA256 e3588560912d091cf01003e87676162f733ec00d05e10b485a9d77ecb1dcf465
-MD5 f206293dc75ea528f5e4b8b3d566b961 ChangeLog 17934
-RMD160 59ed1121189273d6b98c5ea246a5c9f99ebfb9ff ChangeLog 17934
-SHA256 e3588560912d091cf01003e87676162f733ec00d05e10b485a9d77ecb1dcf465 ChangeLog 17934
+EBUILD xemacs-21.4.21.ebuild 6348 RMD160 474f2a3c296b02521a66ced4b61fbb673152add5 SHA1 f43083a35384e9fb4ee2940e17a7766bb7339e54 SHA256 3b1be64f333136752d8f519ccdcab092e05f2385f6626378c2f306829daba114
+MD5 221e001f9da139e7c1da2c71cfb2d3fe xemacs-21.4.21.ebuild 6348
+RMD160 474f2a3c296b02521a66ced4b61fbb673152add5 xemacs-21.4.21.ebuild 6348
+SHA256 3b1be64f333136752d8f519ccdcab092e05f2385f6626378c2f306829daba114 xemacs-21.4.21.ebuild 6348
+MISC ChangeLog 18167 RMD160 75d1e4e0980f6fe1f4c9218850d9b0192c9b5da6 SHA1 6dba3012aadb3270ba04c08806125bc1f926382e SHA256 bd14913c34b67d48822b6ddc9d55c47b37be8284831228a49ea6fbf06599c9dd
+MD5 b938e49e56de117b62f3e6b6112a8aab ChangeLog 18167
+RMD160 75d1e4e0980f6fe1f4c9218850d9b0192c9b5da6 ChangeLog 18167
+SHA256 bd14913c34b67d48822b6ddc9d55c47b37be8284831228a49ea6fbf06599c9dd ChangeLog 18167
 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365
@@ -53,10 +58,13 @@ SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/di
 MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r5 479
 RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r5 479
 SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r5 479
+MD5 783a62239ff821f11bf30a43a2b0c995 files/digest-xemacs-21.4.21 479
+RMD160 aa2aef6ca5cc35b01a28f95d62bc7b32c8d88aea files/digest-xemacs-21.4.21 479
+SHA256 05bdf9ebe1418dbd99619d34f11634378eebf2d804e873a22d89fc2643286a5b files/digest-xemacs-21.4.21 479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHGyQg0BM77Tkv120RArJOAJ9l0CZvwHcg2QiMw7jYAA2YZ6x8KgCg8b7V
-F8DxgKfZoipFxRVM7Cys8ZA=
-=ghLy
+iD8DBQFHNsqj0BM77Tkv120RAiT/AJ92ER82H+ejd3B32pRSTMlsaohMjACeLDZe
+6s9E82t6fHJ3CwYmQeOu9D0=
+=KECe
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.21 b/app-editors/xemacs/files/digest-xemacs-21.4.21
new file mode 100644
index 000000000000..775c4204afca
--- /dev/null
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.21
@@ -0,0 +1,6 @@
+MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
+RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571
+SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571
+MD5 87b051f12d1bb344ca4da1907100f1b5 xemacs-21.4.21.tar.gz 8333619
+RMD160 6dd212dd926cd7a8cb5ac905fb41ef787065bef5 xemacs-21.4.21.tar.gz 8333619
+SHA256 7594721cc5fa66cfabfb18446e51970eebae517f024856a7d6e6e0a79adbfcb0 xemacs-21.4.21.tar.gz 8333619
diff --git a/app-editors/xemacs/xemacs-21.4.21.ebuild b/app-editors/xemacs/xemacs-21.4.21.ebuild
new file mode 100644
index 000000000000..c14ba0014489
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.21.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.21.ebuild,v 1.1 2007/11/11 09:25:49 graaff 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.
+
+export WANT_AUTOCONF="2.1"
+inherit autotools eutils
+
+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 esd 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"
+
+DEPEND="virtual/libc
+	!virtual/xemacs
+	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-7.2 )
+	ldap? ( net-nds/openldap )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/Xaw3d )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff )
+	png? ( =media-libs/libpng-1.2* )
+	jpeg? ( media-libs/jpeg )
+	canna? ( app-i18n/canna )
+	!amd64? ( freewnn? ( app-i18n/freewnn ) )
+	>=sys-libs/ncurses-5.2
+	>=app-admin/eselect-emacs-0.7-r1"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+PROVIDE="virtual/xemacs"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use neXt && unpack NeXT_XEmacs.tar.gz
+
+	cd "${S}"
+	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
+
+	# see bug 58350, 102540 and 143580
+	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+
+	# 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
+	eautoconf
+
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_compile() {
+	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"
+	use esd && soundconf="${soundconf},esd"
+
+	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"
+
+	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 ) \
+		--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"
+
+	emake || die "emake failed"
+}
+
+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 ; do
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags; 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
+
+	insinto /usr/share/pixmaps
+	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update --if-unset
+}
+
+pkg_postrm() {
+	eselect emacs update --if-unset
+}