Add version 21.4.19-r1 with new USE flags and several bugfixes.

Package-Manager: portage-2.1.1-r2

5 files changed, 261 insertions, 5 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 94d0c235c2e2..feff0bd770fa 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,15 @@
 # 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.66 2006/11/26 13:39:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.67 2006/12/02 14:16:32 graaff Exp $
+
+*xemacs-21.4.19-r1 (02 Dec 2006)
+
+  02 Dec 2006; Hans de Graaff <graaff@gentoo.org> +files/xemacs.desktop,
+  +xemacs-21.4.19-r1.ebuild:
+  Only unpack NeXT icons when needed. Add pop and gif USE flags. Add eolconv USE
+  flag; closes #64734. Modernize handling of some configuration options. Remove
+  unneeded info files; closes #109945. Add a desktop file and icon; closes
+  #152968.
 
   26 Nov 2006; Hans de Graaff <graaff@gentoo.org> xemacs-21.4.19.ebuild:
   Use autotools class to handle support for correct version of autoconf. Support
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index f4c441a4e3a3..b0a51526535b 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -14,6 +14,10 @@ AUX xemacs-21.4.17-gdbm.patch 639 RMD160 1cf73cd98df2189c37e98ed198fb3c1941f967b
 MD5 0da90396cb9e3ca915e9e00a2f99ee32 files/xemacs-21.4.17-gdbm.patch 639
 RMD160 1cf73cd98df2189c37e98ed198fb3c1941f967b4 files/xemacs-21.4.17-gdbm.patch 639
 SHA256 9e7d5cbdf3b8f60e6135187d32f3fe8f83281a14752eb16c0e018eef15491525 files/xemacs-21.4.17-gdbm.patch 639
+AUX xemacs.desktop 1092 RMD160 d403dc435a74e15947ba510d65127894cb61a4b3 SHA1 819f3eb5f419c957843db2321a08cc57affa81a5 SHA256 d5dd098117cd70f82a9dcb9b74a31e379251d0c21526111d6cbfbb2397f9e7e6
+MD5 f68e3948040fa1187343f6f96fd0a144 files/xemacs.desktop 1092
+RMD160 d403dc435a74e15947ba510d65127894cb61a4b3 files/xemacs.desktop 1092
+SHA256 d5dd098117cd70f82a9dcb9b74a31e379251d0c21526111d6cbfbb2397f9e7e6 files/xemacs.desktop 1092
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.4.17.tar.gz 10626826 RMD160 d42ca370ba916f0147b368bd7db2cc6c523646ae SHA1 274812bee5f8010ca3d56b517026270d94415f33 SHA256 b4134cf75b69e4a89fbc73c75c84fa8dc3cdcc8bd5f48aa489bf894040aefa17
 DIST xemacs-21.4.19.tar.gz 11122888 RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 SHA1 638a58db6794d3424e13ad65932697ad1343ab69 SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d
@@ -21,14 +25,18 @@ EBUILD xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f
 MD5 8b1f6863027886f7a8fc5accd066d487 xemacs-21.4.17.ebuild 5055
 RMD160 70037d0363a969817440bff94cc0c1c5877396f6 xemacs-21.4.17.ebuild 5055
 SHA256 2dab6dff04290d0aa17cd38648c9ca65c13a5129459c35d22b6fa95d5a789590 xemacs-21.4.17.ebuild 5055
+EBUILD xemacs-21.4.19-r1.ebuild 5407 RMD160 3f54f6ba950f3b46dd76439009c9b7bd86c60426 SHA1 95c7cd90c566c9324d12b6198d8b0b63e840e660 SHA256 bfa46e192ab67c3e018fafa11e8876732823012096318f413cdc63ad7a7523df
+MD5 a1eaaf4177957227f51b65b66c5e180f xemacs-21.4.19-r1.ebuild 5407
+RMD160 3f54f6ba950f3b46dd76439009c9b7bd86c60426 xemacs-21.4.19-r1.ebuild 5407
+SHA256 bfa46e192ab67c3e018fafa11e8876732823012096318f413cdc63ad7a7523df xemacs-21.4.19-r1.ebuild 5407
 EBUILD xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 SHA1 8f7acdc0032b170626d226bccd0f30380c493fb7 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8
 MD5 37b66f3a6be83ba0305333ccaa9f13b1 xemacs-21.4.19.ebuild 5255
 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 xemacs-21.4.19.ebuild 5255
 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 xemacs-21.4.19.ebuild 5255
-MISC ChangeLog 12020 RMD160 ae3deac9be99718b44105974d7cd15fb32686e9c SHA1 4a156bfb3bd207ae8e4cb3a5249653ab960840c4 SHA256 fe1f8013875f87b3b28be937b962159dc3ac258e720e1d67cda2ffce19b758cf
-MD5 e02efaab75a119812b6b8a9ebd506a22 ChangeLog 12020
-RMD160 ae3deac9be99718b44105974d7cd15fb32686e9c ChangeLog 12020
-SHA256 fe1f8013875f87b3b28be937b962159dc3ac258e720e1d67cda2ffce19b758cf ChangeLog 12020
+MISC ChangeLog 12404 RMD160 905c0795c7b565157331dd7c83a0991db7c789bc SHA1 b523c9315c59d3ad249d473e9bd4b0c2e0e5b689 SHA256 96364254b71a77b0a90e2b176fd8d5ba88de4c520b0feaaa96da9faafed7bada
+MD5 eb735d94ed2d3d6bfa8204a2c1d27243 ChangeLog 12404
+RMD160 905c0795c7b565157331dd7c83a0991db7c789bc ChangeLog 12404
+SHA256 96364254b71a77b0a90e2b176fd8d5ba88de4c520b0feaaa96da9faafed7bada ChangeLog 12404
 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea
 MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365
@@ -39,3 +47,6 @@ SHA256 040735bf31c71d29c042ed014cc6b0ddfc42d139d7e6482ceed287fce360c2fe files/di
 MD5 ab3fb5219939083562a9fe2fd5c588da files/digest-xemacs-21.4.19 482
 RMD160 08b6ce96a97da0c37b941073a5414d7fa03299b6 files/digest-xemacs-21.4.19 482
 SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/digest-xemacs-21.4.19 482
+MD5 ab3fb5219939083562a9fe2fd5c588da files/digest-xemacs-21.4.19-r1 482
+RMD160 08b6ce96a97da0c37b941073a5414d7fa03299b6 files/digest-xemacs-21.4.19-r1 482
+SHA256 82c5f4c35e2008e6497baacaa4d06c7b07b9b9ebeebdc12a433fd8ae1262391f files/digest-xemacs-21.4.19-r1 482
diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.19-r1 b/app-editors/xemacs/files/digest-xemacs-21.4.19-r1
new file mode 100644
index 000000000000..f2cd097270f6
--- /dev/null
+++ b/app-editors/xemacs/files/digest-xemacs-21.4.19-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 3f753e2cc22a428c7d775339f29c7e46 xemacs-21.4.19.tar.gz 11122888
+RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 xemacs-21.4.19.tar.gz 11122888
+SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d xemacs-21.4.19.tar.gz 11122888
diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop
new file mode 100644
index 000000000000..11482b40a114
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs.desktop
@@ -0,0 +1,34 @@
+[Desktop Entry]
+Name=XEmacs Text Editor
+Name[bg]=редактор XEmacs
+Name[ca]=Editor XEmacs
+Name[cs]=Editor XEmacs
+Name[da]=XEmacs tekstredigerer
+Name[de]=XEmacs Texteditor
+Name[eo]=La redaktilo XEmakso
+Name[es]=Emacs para X
+Name[et]=Emacs X'i kasutajaliidesega
+Name[fi]=XEmacs editori
+Name[fr]=Éditeur XEmacs
+Name[hu]=XEmacs szövegszerkesztő
+Name[is]=XEmacs-ritill
+Name[it]=Emacs per X
+Name[ja]=XEmacs テキスト・エディター
+Name[mk]=Софистицираниот XEmacs уредувач
+Name[no]=XEmacs-tekstredigerer
+Name[pt]=Editor XEmacs
+Name[ro]=Editorul XEmacs
+Name[ru]=Редактор XEmacs
+Name[sk]=Editor XEmacs
+Name[sl]=Urejevalnik XEmacs
+Name[uk]=Редактор XEmacs
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=xemacs %f
+Icon=xemacs
+Type=Application
+Terminal=false
+Categories=Application;Development;TextEditor;
+Encoding=UTF-8
+StartupWMClass=Emacs
diff --git a/app-editors/xemacs/xemacs-21.4.19-r1.ebuild b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild
new file mode 100644
index 000000000000..6f9f93026fe5
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.19-r1.ebuild
@@ -0,0 +1,196 @@
+# 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.19-r1.ebuild,v 1.1 2006/12/02 14:16:32 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 gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+DEPEND="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 )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	athena? ( || ( ( $X_DEPEND	x11-libs/libXaw ) 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 ) )
+	>=sys-libs/ncurses-5.2
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )"
+
+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}/emodules.info-21.4.8-gentoo.patch
+
+	# see bug 58350
+	epatch ${FILESDIR}/${PN}-21.4.17-gdbm.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="--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
+
+		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
+
+	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"
+
+	# 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
+
+	# 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
+	rm -f "${D}"/usr/share/info/emodules.info~*
+
+	insinto /usr/share/pixmaps
+	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+}
+