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

Package-Manager: portage-2.1.1-r2

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index f354b22eca5c0622796f1bebef22db71b61ee6e0..d688b041db14ff9b5e14ebc64ac46a901d34ef4b 100644 (file)
--- 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/Manifest b/app-editors/xemacs/Manifest
index dfc1d9cd9fe2b494062eecc2f7d55549ba71c878..6ef1ad0a1ce31365aad710e050645b4464b69357 100644 (file)
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -18,6 +18,10 @@ AUX xemacs-21.4.19-texi.patch 1107 RMD160 2cedf0e0dfe50fdb2eb578fd7605629ea28a6f
 MD5 d702e84697988af2bd59a3b0dd1a0162 files/xemacs-21.4.19-texi.patch 1107
 RMD160 2cedf0e0dfe50fdb2eb578fd7605629ea28a6f61 files/xemacs-21.4.19-texi.patch 1107
 SHA256 9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5 files/xemacs-21.4.19-texi.patch 1107
+AUX xemacs-21.4.20-linuxplay.patch 1135 RMD160 c1a1e1e27b1295930dc158553f2b42801dbcb158 SHA1 c591a0e447bad6d6d411a997bae6e9512ad8b18e SHA256 ff2ee99319c639eb2a28d95bf1141ff9f690955588c8bb6437c2aaf29b6706d6
+MD5 283c5d6847037b9fbfd787e918fec0e3 files/xemacs-21.4.20-linuxplay.patch 1135
+RMD160 c1a1e1e27b1295930dc158553f2b42801dbcb158 files/xemacs-21.4.20-linuxplay.patch 1135
+SHA256 ff2ee99319c639eb2a28d95bf1141ff9f690955588c8bb6437c2aaf29b6706d6 files/xemacs-21.4.20-linuxplay.patch 1135
 AUX xemacs.desktop 1092 RMD160 d403dc435a74e15947ba510d65127894cb61a4b3 SHA1 819f3eb5f419c957843db2321a08cc57affa81a5 SHA256 d5dd098117cd70f82a9dcb9b74a31e379251d0c21526111d6cbfbb2397f9e7e6
 MD5 f68e3948040fa1187343f6f96fd0a144 files/xemacs.desktop 1092
 RMD160 d403dc435a74e15947ba510d65127894cb61a4b3 files/xemacs.desktop 1092
@@ -42,14 +46,18 @@ EBUILD xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab109
 MD5 37b66f3a6be83ba0305333ccaa9f13b1 xemacs-21.4.19.ebuild 5255
 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 xemacs-21.4.19.ebuild 5255
 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 xemacs-21.4.19.ebuild 5255
+EBUILD xemacs-21.4.20-r1.ebuild 5974 RMD160 b5c626e1aa1dbc5b54b6022e6a446239caf38dc0 SHA1 039e688c834cff00d0fe4af08aa6818a2a6c41e2 SHA256 0e68ea382265445e910141557562fef09a93f8ebe927ab6e6690f4040022551c
+MD5 d6a2cabf63866bb953a2fd9bca645d64 xemacs-21.4.20-r1.ebuild 5974
+RMD160 b5c626e1aa1dbc5b54b6022e6a446239caf38dc0 xemacs-21.4.20-r1.ebuild 5974
+SHA256 0e68ea382265445e910141557562fef09a93f8ebe927ab6e6690f4040022551c xemacs-21.4.20-r1.ebuild 5974
 EBUILD xemacs-21.4.20.ebuild 5686 RMD160 56739e8a7151bf793e2ae8ef67f3b39f20f081d0 SHA1 8fcd97b5b9afa6db46dcead265912a5c64a8a08a SHA256 88d4f9aa0cd2cba7a6d43dc013e5b01775fcdb51c95338f6879537969ee139a3
 MD5 fde5f0a71099884953a6ee530253caa2 xemacs-21.4.20.ebuild 5686
 RMD160 56739e8a7151bf793e2ae8ef67f3b39f20f081d0 xemacs-21.4.20.ebuild 5686
 SHA256 88d4f9aa0cd2cba7a6d43dc013e5b01775fcdb51c95338f6879537969ee139a3 xemacs-21.4.20.ebuild 5686
-MISC ChangeLog 13248 RMD160 073564c9c165f4d7f270abf1453172aafd062fd8 SHA1 6f00ade15e454cfc4076ca2cb8462349d3ce442d SHA256 bf0a8f50b120fa9958b1325f561f5151558f48ae4c9cf179680c69c93304d215
-MD5 9761c4ebaad28ec4780f51e2a5e6c341 ChangeLog 13248
-RMD160 073564c9c165f4d7f270abf1453172aafd062fd8 ChangeLog 13248
-SHA256 bf0a8f50b120fa9958b1325f561f5151558f48ae4c9cf179680c69c93304d215 ChangeLog 13248
+MISC ChangeLog 13536 RMD160 916a122d63b34d74559afbf1bb785cc3a2aedbe7 SHA1 1034d8a39dfec50ba6c21b1470acc4206230c3eb SHA256 1437bd85c40c87f855e71f80218ddbc4e71097343bab6907c49dc3f7a421bb52
+MD5 3c41a422301242cb45ecd7426e538e76 ChangeLog 13536
+RMD160 916a122d63b34d74559afbf1bb785cc3a2aedbe7 ChangeLog 13536
+SHA256 1437bd85c40c87f855e71f80218ddbc4e71097343bab6907c49dc3f7a421bb52 ChangeLog 13536
 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365
@@ -69,3 +77,6 @@ SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/di
 MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20 479
 RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20 479
 SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20 479
+MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r1 479
+RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r1 479
+SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r1 479

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 (file)
index 0000000..716056c
--- /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 (file)
index 0000000..e272345
--- /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 (file)
index 0000000..f7c2170
--- /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
+}
+