Version bump. License has changed to GPL-3. Drop patch now applied upstream.

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

3 files changed, 257 insertions, 5 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 003e35dcad2b..847337ef64cb 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.143 2011/04/27 18:02:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.144 2011/04/30 08:03:43 graaff Exp $
+
+*xemacs-21.5.31 (30 Apr 2011)
+
+  30 Apr 2011; Hans de Graaff <graaff@gentoo.org> +xemacs-21.5.31.ebuild:
+  Version bump. License has changed to GPL-3. Drop patch now applied
+  upstream.
 
 *xemacs-21.5.30 (27 Apr 2011)
 
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 5e8added0942..a76546f893eb 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -15,16 +15,18 @@ DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SH
 DIST xemacs-21.4.22.tar.gz 8357931 RMD160 f7d71d3607c3301760df8f7ae5a93d1d37df56ba SHA1 24ed9b13d80c53c06bba60c7bb68387f692b7373 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1
 DIST xemacs-21.5.29.tar.gz 15453810 RMD160 96b951fd44915b3b73a9d69a7ab80c1237fdecc7 SHA1 0815975a2a7e9720d1a8fe0b347b0f977786e2a5 SHA256 071f84a2572eb70d4ae5cfc079f8f4c199371621f1855833a55a9577dffc0186
 DIST xemacs-21.5.30.tar.gz 15500732 RMD160 0cca64db9f03c8f2052be743a5b0bb0531776430 SHA1 cdef683d52ea0abd9d71d06f3b30582bc1b51445 SHA256 cc9573faea6e8442965b47ab011e647f4e0313c985cf4f9b751c52ce4767cc97
+DIST xemacs-21.5.31.tar.gz 15802193 RMD160 ba3b82cf6876e14302c2635e2c0033633613541a SHA1 b12e024f82aa70e65b6b6eeb203f6cee80912f30 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d
 EBUILD xemacs-21.4.22-r1.ebuild 6580 RMD160 15346e733445c92fd5fee6905aaacbf5989eb2a3 SHA1 22ee08f497b4b26ce2b960bbea1b5c41513c306e SHA256 865bc0dbec4272ae29f4b1fbfb230eff59ef4b4ebe84860546506062657a1ab5
 EBUILD xemacs-21.4.22-r2.ebuild 6713 RMD160 33c045f05568d54fd9d4a61c02e9926a77ea6c79 SHA1 3db56a012c9a592811b219a7766f7b844c2bf040 SHA256 3d73184fadd999071bbdb1c08d7e4b7a22cbd8661c757073109c0fe037301daa
 EBUILD xemacs-21.5.29-r2.ebuild 7070 RMD160 1b2df3401a94b3e8b58344d0995d976b785b5b35 SHA1 859185214924b587b88bc23d91787669848420b6 SHA256 846a6f733db597d85f5f88f7bc1ac7c2af607c7533a284d19c0e3f53ff1fa32a
 EBUILD xemacs-21.5.30.ebuild 6896 RMD160 f7629a51ab84c8f68022d63e30a2142697ebd2fc SHA1 d5fd77c46ff92be063b97fca7bc9a7452cb2fc7e SHA256 535e811f7780eb31731932d95138882c9509b7ef4a1755a097f17bd05ecb1b94
-MISC ChangeLog 24847 RMD160 17d1a76fe9467d81e3608f8d0bc6343914366eaa SHA1 35ed3741285d8f76472487d2a2be0392df2965b6 SHA256 7ad5f4bc3e0499426b61bbc1284a06356a84c41958653335d5e60d939be326f2
+EBUILD xemacs-21.5.31.ebuild 6832 RMD160 90c63fc25c1dff442bdc08ee53bb197f8322766a SHA1 3a5a43b354f7fc5d98af5a519535f042e6590d7a SHA256 c9a1fce8a594ce3822d1878878a435f1d4f042a8454dc8589f08e05dc25c0151
+MISC ChangeLog 25034 RMD160 794a7477940e84c5fc19b4502fbf2852d05b3010 SHA1 a5d15d1abd2a444ca028962c110e42ab64ffd050 SHA256 d56839a753b97f9e02c84b0ad4628b106cda269c328f39608b8baf3e6895a569
 MISC metadata.xml 711 RMD160 fc8a32ef389e34f90c14f2c26d75ac3cdc7e28a0 SHA1 b56f6ef2c44d658e3505f97c1686e52a40e4ee00 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk24WjYACgkQrnu0mw69JkomsAD/WXkSpmRJjZS/uLA5Wxe3KPhp
-DhEBqWFOGfP5/oXx2gsA/R7eS1+mXGHoHVtYCm+fF9AnFyM7VXikNQnpIkZzlx8r
-=lSYk
+iF4EAREIAAYFAk27wmYACgkQrnu0mw69Jkq/8wD+JucbRL/xcKiOGJPr34ooJgcx
+QEM2T5ks6W+TUHxoqa0A/jcv/iHlKo7PUffRZWiyA9Qr/398aiDtDFYg+zPC8Uqi
+=m7fv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild b/app-editors/xemacs/xemacs-21.5.31.ebuild
new file mode 100644
index 000000000000..8f982308045a
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.31.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.1 2011/04/30 08:03:43 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.
+
+EAPI="2"
+
+export WANT_AUTOCONF="2.5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft 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-base )
+	ldap? ( net-nds/openldap )
+	alsa? ( media-libs/alsa-lib )
+	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.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/Xaw3d )
+	xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	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 )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2"
+
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-emacs-1.2"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	# Fix problem caused by improper optimization with GCC 4.1.2 on x86
+	# (and possibly other arches, but only confirmed on x86). See
+	# http://tracker.xemacs.org/XEmacs/its/issue354 for the upstream
+	# bug.
+	epatch "${FILESDIR}"/${PN}-21.5.29-optimization-bug.patch
+
+	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 or use Xaw3d ; 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 )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--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 )"
+		myconf="${myconf} $(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"
+	use alsa && soundconf="${soundconf},alsa"
+
+	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
+
+	use debug && myconf="${myconf} --with-optimization=no --with-debug" ||
+		myconf="${myconf} --with-optimization=yes"
+
+	econf ${myconf} \
+		$(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 \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--with-optimizations \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs \
+		|| die "configuration failed"
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		datadir="${D}"/usr/share \
+		install gzip-el || die
+
+	# 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 ; 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 CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	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 ifunset
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+}