From: Ulrich Müller Date: Wed, 18 Apr 2007 21:41:56 +0000 (+0000) Subject: Use eselect-emacs for symlink updating; fixes #167883. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b48396fb5f2ab3f8b28212466474ced79af1fc31;p=gentoo.git Use eselect-emacs for symlink updating; fixes #167883. Package-Manager: portage-2.1.2.4 --- diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog index cb86f81ba13c..1064a9fb683c 100644 --- a/app-editors/xemacs/ChangeLog +++ b/app-editors/xemacs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/xemacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.82 2007/03/06 08:06:39 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.83 2007/04/18 21:41:56 ulm Exp $ + +*xemacs-21.4.20-r3 (18 Apr 2007) + + 18 Apr 2007; Ulrich Mueller +xemacs-21.4.20-r3.ebuild: + Install ctags.1 and etags.1 man pages under different names to avoid file + collisions with GNU Emacs; use emacs select module for updating of the + corresponding symlinks; fixes #167883. 06 Mar 2007; Hans de Graaff -files/emodules.info-21.4.8-gentoo.patch, diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index ca2c7f51bf1e..31349658e9ec 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92 MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 files/README.Gentoo 1426 @@ -28,10 +31,14 @@ EBUILD xemacs-21.4.20-r2.ebuild 6382 RMD160 4c7702c2b9cdb8d493c5007ff69ca0a66678 MD5 d93cd340795f6bf6bcc9c01a074ebae3 xemacs-21.4.20-r2.ebuild 6382 RMD160 4c7702c2b9cdb8d493c5007ff69ca0a666781128 xemacs-21.4.20-r2.ebuild 6382 SHA256 009c87f96487e5482b78775b82ee86c19ffe4ec181dbc891f90749675baf4232 xemacs-21.4.20-r2.ebuild 6382 -MISC ChangeLog 15192 RMD160 cb2c5724cd946bf5fcc4fc61c8198a0ea1584583 SHA1 152a86f57c254b8f1af6a2c057551a292577177f SHA256 5df849b8de53d43be8878a3b7a4d98f4321712402a34a367c72fa9de11081255 -MD5 8ac7d78476fe531b541f14c322457ebc ChangeLog 15192 -RMD160 cb2c5724cd946bf5fcc4fc61c8198a0ea1584583 ChangeLog 15192 -SHA256 5df849b8de53d43be8878a3b7a4d98f4321712402a34a367c72fa9de11081255 ChangeLog 15192 +EBUILD xemacs-21.4.20-r3.ebuild 6581 RMD160 16ca03f4110fb18a3746d051b82c6cb2cd8ecb04 SHA1 9944dd66371febc60806408ab288ab1866282284 SHA256 cfc3a6a2531072b6a3e8a38e23b92b3f0a4d013b80f11552cde4b69fddcd8d0e +MD5 8445bcd4ccae5da26a4ca58b7c22c275 xemacs-21.4.20-r3.ebuild 6581 +RMD160 16ca03f4110fb18a3746d051b82c6cb2cd8ecb04 xemacs-21.4.20-r3.ebuild 6581 +SHA256 cfc3a6a2531072b6a3e8a38e23b92b3f0a4d013b80f11552cde4b69fddcd8d0e xemacs-21.4.20-r3.ebuild 6581 +MISC ChangeLog 15488 RMD160 2f023ee38ecfd49982f51914e6870de269ed4e04 SHA1 fbac7bc8bf9ac9e3b5a525f122b11169960b47a2 SHA256 a072463403057b2b3eafab67d0fd8ba79859041dd79c0ef44ca1b739fa54927a +MD5 3a20cb9ed38fd194fcb5ee96efb7f690 ChangeLog 15488 +RMD160 2f023ee38ecfd49982f51914e6870de269ed4e04 ChangeLog 15488 +SHA256 a072463403057b2b3eafab67d0fd8ba79859041dd79c0ef44ca1b739fa54927a ChangeLog 15488 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365 @@ -42,3 +49,13 @@ SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/di MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r2 479 RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r2 479 SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r2 479 +MD5 860ba1eea1427bc1afbbe83b973c5af8 files/digest-xemacs-21.4.20-r3 479 +RMD160 50b7164833764e4eb89d40f125a488c7201d835e files/digest-xemacs-21.4.20-r3 479 +SHA256 e8e79285b714e784a08a5b88e8cc1e5a725b99edd91820b7d259ad9d9a6fee67 files/digest-xemacs-21.4.20-r3 479 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) + +iD8DBQFGJpEmOeoy/oIi7uwRAugFAJ48+8/Uw5BYFtnRXNtSN0t66y6w2QCgzMoL +PX6rxX06MmmbvXyMTCwNYRU= +=nSo6 +-----END PGP SIGNATURE----- diff --git a/app-editors/xemacs/files/digest-xemacs-21.4.20-r3 b/app-editors/xemacs/files/digest-xemacs-21.4.20-r3 new file mode 100644 index 000000000000..716056cfd79c --- /dev/null +++ b/app-editors/xemacs/files/digest-xemacs-21.4.20-r3 @@ -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/xemacs-21.4.20-r3.ebuild b/app-editors/xemacs/xemacs-21.4.20-r3.ebuild new file mode 100644 index 000000000000..b25cd8ca939a --- /dev/null +++ b/app-editors/xemacs/xemacs-21.4.20-r3.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/04/18 21:41:56 ulm Exp $ + +# Note: xemacs currently does not work with a hardened profile. If you +# want to use xemacs on a hardened profile then compile with the +# -nopie flag in CFLAGS or help fix bug #75028. + +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="~amd64 ~hppa ~sparc ~x86" +IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim 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 + >=app-admin/eselect-emacs-0.7-r1" + +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" + + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" + else + myconf="${myconf} --with-xim=xlib" + fi + else + myconf="${myconf} --with-xim=no" + fi + + 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, this should be fixed in 21.4.21 and has been fixed + # in 21.5 for sure. + use alpha && myconf="${myconf} --with-system-malloc" + use ppc64 && myconf="${myconf} --with-system-malloc" + use ia64 && 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" + done + + # rename man pages + for i in ctags etags; do + mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" + 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 +} + +pkg_postinst() { + eselect emacs update --if-unset +} + +pkg_postrm() { + eselect emacs update --if-unset +}