bug 58350

5 files changed, 228 insertions, 7 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index a84666862d90..09299fbc7dec 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.47 2004/08/20 16:55:58 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.48 2004/08/28 00:47:59 rac Exp $
 
+*xemacs-21.4.15-r2 (27 Aug 2004)
+
+  27 Aug 2004; Robert Coie <rac@gentoo.org> +files/xemacs-21.4.15-gdbm.patch,
+  +xemacs-21.4.15-r2.ebuild:
+  gdbm 1.8.3 - bug 58350
 
   20 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xemacs-21.4.15-r1.ebuild:
   ppc keyworded.
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bc085590226f..0076c2aabafb 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,18 +1,21 @@
+MD5 cd336f54fb85ddaeaf1a46bda0909ddb xemacs-21.4.9.ebuild 4175
+MD5 8969be8ce5aa5f477f398d3f8cbd6a0f ChangeLog 8945
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
+MD5 3d03ec4070b885c2a3f559f981968635 xemacs-21.4.15-r2.ebuild 5112
 MD5 e575bd3c0a8ac4756e3bb8b118c525ef xemacs-21.4.12.ebuild 4944
-MD5 0851d9f93b92221bab351c17dc2668f8 xemacs-21.4.15-r1.ebuild 5046
 MD5 d85746730e29499fb423dbf3b90c3378 xemacs-21.4.15.ebuild 3832
-MD5 cd336f54fb85ddaeaf1a46bda0909ddb xemacs-21.4.9.ebuild 4175
-MD5 7f95b3687493944933b76e04768df700 ChangeLog 8784
-MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
+MD5 0851d9f93b92221bab351c17dc2668f8 xemacs-21.4.15-r1.ebuild 5046
 MD5 6d3780dc77d3dd7c017d8864d2f0b07d files/digest-xemacs-21.4.12 130
+MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
+MD5 27a8dcab7441389fc05c3406096bb8be files/emodules.info-gentoo.patch 479
 MD5 70d163ee0eb6f3a0aaa7c0ddccd6a3d7 files/digest-xemacs-21.4.15 204
-MD5 6a3d383a050855607a702a56c850ff1a files/digest-xemacs-21.4.15-r1 130
 MD5 892c698f9b7d3ca42a83df34518b0946 files/digest-xemacs-21.4.9 273
+MD5 6a3d383a050855607a702a56c850ff1a files/digest-xemacs-21.4.15-r2 130
 MD5 115eb28610752622c6d6e1189d9e5ec8 files/emodules.info-21.4.8-gentoo.patch 468
-MD5 27a8dcab7441389fc05c3406096bb8be files/emodules.info-gentoo.patch 479
 MD5 ace9b77c4d23c9500c1e81a3606545f8 files/quick-fix.patch 393
 MD5 39fc9657b72b09c8b91f52ee50758ad2 files/xemacs-21.4.12-ppc.diff 1075
 MD5 94beef92edcaf12edef657556fbb7a7e files/xemacs-21.4.8-ppc.diff 1032
 MD5 678239bc0954d838f5a9c53a6570c850 files/xemacs-21.4.9-ppc-glibc-2.3.x.diff 1112
 MD5 c72c4643e7b5e7c44a57766a88838600 files/xemacs-21.4.9-ppc.diff 1031
+MD5 6a3d383a050855607a702a56c850ff1a files/digest-xemacs-21.4.15-r1 130
+MD5 f6e1525d3bd987735c9b4bdd169b1591 files/xemacs-21.4.15-gdbm.patch 670
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.15-r2 b/app-editors/xemacs/files/digest-xemacs-21.4.15-r2
new file mode 100644
index 000000000000..daf9ca3600d6
--- /dev/null
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.15-r2
@@ -0,0 +1,2 @@
+MD5 b80e040d9cb85c9210999554dc210fa6 xemacs-21.4.15.tar.gz 10652161
+MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571
diff --git a/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
new file mode 100644
index 000000000000..4ad6c82bd598
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
@@ -0,0 +1,16 @@
+--- xemacs-21.4.15/configure.in.orig	2004-01-24 15:37:54.000000000 +1100
++++ xemacs-21.4.15/configure.in	2004-08-25 11:08:37.532591944 +1000
+@@ -4420,11 +4420,11 @@
+ dnl Check for DBM support in libgdbm.
+ if test "$with_database_gdbm" != "no"; then
+   AC_CHECK_LIB(gdbm, dbm_open, [
+-   with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
++   with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+    if test "$with_database_gdbm" = "yes"; then
+      XE_DIE("Required GNU DBM support cannot be provided.")
+    fi
+-   with_database_gdbm=no])
++   with_database_gdbm=no],-lgdbm_compat)
+ fi
+ 
+ dnl Check for DBM support in libc and libdbm.
diff --git a/app-editors/xemacs/xemacs-21.4.15-r2.ebuild b/app-editors/xemacs/xemacs-21.4.15-r2.ebuild
new file mode 100644
index 000000000000..ad8f2b847a41
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.15-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.15-r2.ebuild,v 1.1 2004/08/28 00:47:59 rac Exp $
+
+inherit 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="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna  athena neXt Xaw3d berkdb"
+
+# esound is know to cause problems in XEmacs
+#esd? ( media-sound/esound )
+RDEPEND="virtual/libc
+	!virtual/xemacs
+
+	berkdb? ( =sys-libs/db-1* >=sys-libs/gdbm-1.8.0 )
+	>=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 )
+
+	nas? ( media-libs/nas )
+
+	dnd? ( x11-libs/dnd )
+
+	X? ( virtual/x11 )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	athena? ( virtual/x11 )
+	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 ) )"
+DEPEND="${RDEPEND}
+	>=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
+	unpack NeXT_XEmacs.tar.gz
+
+	cd ${S}
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
+
+	# see bug 58350
+	epatch ${FILESDIR}/${P}-gdbm.patch
+	autoconf-2.13
+
+	epatch ${FILESDIR}/quick-fix.patch
+	# copy Next_XEmacs icons into toolbar dir
+	cp ${WORKDIR}/NeXT.XEmacs/xemacs-icons/* ${S}/etc/toolbar/
+}
+
+src_compile() {
+	local myconf=""
+
+	if use X; then
+
+		myconf="--with-widgets=lucid"
+		myconf="${myconf} --with-dialogs=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		myconf="${myconf} --with-menubars=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-widgets=athena"
+			if use Xaw3d ; then
+				myconf="${myconf} --with-athena=xaw3d"
+			elif use neXt ; then
+				myconf="${myconf} --with-athena=next"
+			else
+				myconf="${myconf} --with-athena=3d"
+			fi
+			myconf="${myconf} --with-dialogs=athena"
+			myconf="${myconf} --with-scrollbars=lucid"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+
+		myconf="${myconf}
+			--with-gif=no"
+
+		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
+
+	use gpm	&& myconf="${myconf} --with-gpm" ||
+		myconf="${myconf} --without-gpm"
+	use postgres && myconf="${myconf} --with-postgresql" ||
+		myconf="${myconf} --without-postgresql"
+	use ldap && myconf="${myconf} --with-ldap" ||
+		myconf="${myconf} --without-ldap"
+
+	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
+
+	local soundconf="native"
+
+	use nas	&& soundconf="${soundconf},nas"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	local dbconf="gnudbm"
+	if use berkdb; then
+		myconf="${myconf} --with-database=${dbconf}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	# fixes #21264
+	use alpha && myconf="${myconf} --with-system-malloc"
+
+	use ppc64 && myconf="${myconf} --with-system-malloc"
+
+	./configure ${myconf} \
+		--prefix=/usr \
+		--with-pop \
+		--with-ncurses \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		|| die
+
+	# emake dont work on faster boxes it seems
+	# azarah (04 Aug 2002)
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man/man1 \
+		infodir=${D}/usr/share/info \
+		install gzip-el || die
+
+	# 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 files
+	cd ${D}/usr/share/info
+	rm -f dir info.info texinfo* termcap*
+	cd ${S}
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc ${FILESDIR}/README.Gentoo
+	rm -f ${D}/usr/share/info/emodules.info~*
+}