removed ~arch from use flags for 21.4.10-r1, fixed use flags, added 21.4.11_rc1

5 files changed, 204 insertions, 6 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 34d3778e2f66..0841dab8ce9b 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.28 2002/12/24 23:27:34 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.29 2003/01/01 11:32:46 rendhalver Exp $
 
+*xemacs-21.4.10-r2 (01 Jan 2003)
+  01 Jan 2002: Rendhalver <rendhalver@gentoo.org> : fixed use flags
+
+*xemacs-21.4.10-r1 (01 Jan 2003)
+  01 Jan 2002: Rendhalver <rendhalver@gentoo.org> : fixed use flags
+  removed ~arch mask
+	
 *xemacs-21.4.10-r2 (24 Dec 2002)
 
   24 Dec 2002: Jared Hudson <jhhudso@gentoo.org> : Removed sandbox disabling
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.11_rc1 b/app-editors/xemacs/files/digest-xemacs-21.4.11_rc1
new file mode 100644
index 000000000000..fdee0590e415
--- /dev/null
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.11_rc1
@@ -0,0 +1 @@
+MD5 2cff2e2fc849a8cba7a2ea41682ce961 xemacs-21.4.11rc1.tar.gz 10613932
diff --git a/app-editors/xemacs/xemacs-21.4.10-r1.ebuild b/app-editors/xemacs/xemacs-21.4.10-r1.ebuild
index 9c2f44f01148..a8824bf9640c 100644
--- a/app-editors/xemacs/xemacs-21.4.10-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r1.ebuild,v 1.2 2002/12/16 00:14:37 rendhalver Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r1.ebuild,v 1.3 2003/01/01 11:32:46 rendhalver Exp $
 
-IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena next xaw3d"
+IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena neXt Xaw3d"
 
 # this is just TEMPORARY until we can get to the core of the problem
 SANDBOX_DISABLED="1"
@@ -61,7 +61,7 @@ PROVIDE="virtual/xemacs"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc ~sparc"
+KEYWORDS="x86 -ppc sparc"
 
 
 src_unpack() {
diff --git a/app-editors/xemacs/xemacs-21.4.10-r2.ebuild b/app-editors/xemacs/xemacs-21.4.10-r2.ebuild
index 5cd1ed0850ab..92fd42aee314 100644
--- a/app-editors/xemacs/xemacs-21.4.10-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.10-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r2.ebuild,v 1.1 2002/12/24 23:27:34 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r2.ebuild,v 1.2 2003/01/01 11:32:46 rendhalver Exp $
 
-IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena next xaw3d"
+IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena neXt Xaw3d"
 
 LICENSE="GPL-2"
 
diff --git a/app-editors/xemacs/xemacs-21.4.11_rc1.ebuild b/app-editors/xemacs/xemacs-21.4.11_rc1.ebuild
new file mode 100644
index 000000000000..c28041aec813
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.11_rc1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.11_rc1.ebuild,v 1.1 2003/01/01 11:32:46 rendhalver Exp $
+
+IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif freewnn canna lucid athena neXt Xaw3d"
+
+# this is just TEMPORARY until we can get to the core of the problem
+SANDBOX_DISABLED="1"
+
+LICENSE="GPL-2"
+# handle _rc versions
+MY_PV="${PV/_}"
+MY_PN="${PN}-${MY_PV}"
+MY_PV2="${MY_PV/rc1}"
+S="${WORKDIR}/${PN}-${MY_PV2}"
+DESCRIPTION="XEmacs is a highly customizable open source text editor and application development system."
+
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/pretest/${PN}-${MY_PV}.tar.gz"
+
+HOMEPAGE="http://www.xemacs.org"
+
+# esound is know to cause problems in XEmacs
+#esd? ( media-sound/esound )
+
+RDEPEND="virtual/glibc
+	!virtual/xemacs
+
+	>=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 )
+
+	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 )
+	freewnn? ( app-i18n/freewnn )"
+
+DEPEND="${RDEPEND}
+	>=sys-libs/ncurses-5.2"
+
+PDEPEND="app-xemacs/efs
+		 app-xemacs/xemacs-base
+		 mule? app-xemacs/mule-base"
+
+PROVIDE="virtual/xemacs"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc ~sparc"
+
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}.tar.gz
+	
+	cd ${S}
+	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	
+	if [ ${ARCH} = "ppc" ] ; then
+		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+	fi
+
+}
+
+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 && mconf="${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"
+
+	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}"
+
+	./configure ${myconf} \
+		--prefix=/usr \
+		--with-pop \
+		--with-ncurses \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-database=gnudbm \
+		--with-site-lisp=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
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	
+	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-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc ${FILESDIR}/README.Gentoo
+	rm -f ${D}/usr/share/info/emodules.info~*
+}
+