Fix crash when playing sounds, add esd USE flag, fix X dependencies.

(Portage version: 2.1.1-r2)

4 files changed, 256 insertions, 1 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index f354b22eca5c..d688b041db14 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.71 2006/12/11 19:00:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.72 2006/12/22 08:32:33 graaff Exp $
+
+*xemacs-21.4.20-r1 (22 Dec 2006)
+
+  22 Dec 2006; Hans de Graaff <graaff@gentoo.org>
+  +files/xemacs-21.4.20-linuxplay.patch, +xemacs-21.4.20-r1.ebuild:
+  Add patch for crashes when playing WAVs on AMD64 with Linux native sound;
+  enable esd USE flag, fix X and Xaw dependencies #148303.
 
 *xemacs-21.4.20 (11 Dec 2006)
 
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20-r1 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r1
new file mode 100644
index 000000000000..716056cfd79c
--- /dev/null
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.20-r1
@@ -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 faeb21de9da15cc2abd6c3fcdc1b6142 xemacs-21.4.20.tar.gz 8408589
+RMD160 95eb4d5fd9dfcc6575e805434daaf41701c8b5f0 xemacs-21.4.20.tar.gz 8408589
+SHA256 1062a9bfc719054e6873f9280d6ecc51fbed75a104e0582d378b7ee7bcac64f0 xemacs-21.4.20.tar.gz 8408589
diff --git a/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch b/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch
new file mode 100644
index 000000000000..e272345ac400
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.20-linuxplay.patch
@@ -0,0 +1,29 @@
+Index: linuxplay.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/linuxplay.c,v
+retrieving revision 1.13
+diff -u -B -r1.13 linuxplay.c
+--- linuxplay.c	2001/04/12 18:23:58	1.13
++++ linuxplay.c	2006/12/22 07:15:06
+@@ -290,7 +290,8 @@
+   fmtType        ffmt;
+   int            fmt,speed,tracks;
+   unsigned char *pptr,*optr,*cptr,*sptr;
+-  int            wrtn,rrtn,crtn,prtn;
++  int            wrtn,crtn;
++  size_t	 prtn,rrtn;
+   unsigned char         sndbuf[SNDBUFSZ];
+ 
+   /* We need to read at least the header information before we can start
+@@ -338,9 +339,9 @@
+                device; repeat until all data has been processed */
+   rrtn = length;
+   do {
+-    for (pptr = data; (prtn = parsesndfile((void **)&pptr,(size_t *)&rrtn,
++    for (pptr = data; (prtn = parsesndfile((void **)&pptr, &rrtn,
+ 					   (void **)&optr)) > 0; )
+-      for (cptr = optr; (crtn = sndcnv((void **)&cptr,(size_t *) &prtn,
++      for (cptr = optr; (crtn = sndcnv((void **)&cptr, &prtn,
+ 				       (void **)&sptr)) > 0; ) {
+ 	for (;;) {
+ 	  if ((wrtn = write(audio_fd,sptr,crtn)) < 0) {
diff --git a/app-editors/xemacs/xemacs-21.4.20-r1.ebuild b/app-editors/xemacs/xemacs-21.4.20-r1.ebuild
new file mode 100644
index 000000000000..f7c21707553e
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.20-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.20-r1.ebuild,v 1.1 2006/12/22 08:32:33 graaff Exp $
+
+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 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"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+PROVIDE="virtual/xemacs virtual/editor"
+
+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
+
+	# Fix constent crashes with the combination native sound,linux,wav
+	epatch "${FILESDIR}"/xemacs-21.4.20-linuxplay.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"
+
+		use tiff && myconf="${myconf} --with-tiff" ||
+			myconf="${myconf} --without-tiff"
+		use png && myconf="${myconf} --with-png" ||
+			myconf="${myconf} --without-png"
+		use jpeg && myconf="${myconf} --with-jpeg" ||
+			myconf="${myconf} --without-jpeg"
+		use xface && myconf="${myconf} --with-xface" ||
+			myconf="${myconf} --without-xface"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+		use motif && myconf="${myconf} --with-xim=motif" ||
+			myconf="${myconf} --with-xim=xlib"
+			use canna && myconf="${myconf} --with-canna" ||
+					myconf="${myconf} --without-canna"
+		use freewnn && myconf="${myconf} --with-wnn" ||
+					myconf="${myconf} --without-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="${soundcond},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
+	use alpha && myconf="${myconf} --with-system-malloc"
+
+	use ppc64 && myconf="${myconf} --with-system-malloc"
+
+	# 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
+
+	emake || die
+}
+
+src_install() {
+	make prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		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 rcs-checkin ; do
+		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+		dosym /usr/bin/${i}-xemacs /usr/bin/${i}
+	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
+}
+