Remove the (commented out) XFT support in favour of the emacs-unicode-2 branch suppor...

Package-Manager: portage-2.1.1_pre4-r3

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index bdecefac6999449be980d87d9f8283dbad25c3cd..62f52d9fa42083b5b23ec5198f40b80560c82cc8 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.47 2006/06/26 22:21:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.48 2006/08/07 05:24:48 mkennedy Exp $
+
+*emacs-cvs-22.0.50-r3 (07 Aug 2006)
+
+  07 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +emacs-cvs-22.0.50-r3.ebuild:
+  Remove the (commented out) XFT support in favour of the emacs-unicode-2
+  branch support in the emacs-cvs-23.0.0 ebuild; Support the source USE flag
+  which would install the Emacs C source.
 
   26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   emacs-cvs-22.0.50-r2.ebuild:

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 50e78fc3d174184871dab6ea85c5063ca46da4c7..4fe9d97f2f27f698cf4cd6d0a9c2073c78240597 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -45,14 +42,18 @@ EBUILD emacs-cvs-22.0.50-r2.ebuild 5667 RMD160 08160668ed3fb04403c4e548430f2d53a
 MD5 53fac4bcb3b5ccfd522499c9fb1da9ad emacs-cvs-22.0.50-r2.ebuild 5667
 RMD160 08160668ed3fb04403c4e548430f2d53a80bca55 emacs-cvs-22.0.50-r2.ebuild 5667
 SHA256 f109229610bbc841d665819f192785f8dae11400c6d3e2face2067697af6cd9a emacs-cvs-22.0.50-r2.ebuild 5667
+EBUILD emacs-cvs-22.0.50-r3.ebuild 4801 RMD160 c00571fded192032e9d2076229d5b979051524e3 SHA1 b7c530e092c999cb5c930019a03f2ef5d577a338 SHA256 2cd29ae460a482803f2fcd801029f53526bb47ea6dd410e623f4841307d19810
+MD5 ff72081d45eb72e4fa440265cf03d56f emacs-cvs-22.0.50-r3.ebuild 4801
+RMD160 c00571fded192032e9d2076229d5b979051524e3 emacs-cvs-22.0.50-r3.ebuild 4801
+SHA256 2cd29ae460a482803f2fcd801029f53526bb47ea6dd410e623f4841307d19810 emacs-cvs-22.0.50-r3.ebuild 4801
 EBUILD emacs-cvs-23.0.0.ebuild 5212 RMD160 7326b14349ccc989cc9621c3544c3b51ad9dbba4 SHA1 19d7942f6076a3bb7932495261513f4e9c76754d SHA256 d6296a96a34c99873295b6f75fc342031662e4d8a7aff8883f26798ef21446fd
 MD5 7be05f3cfe422addc9f1bcaba9722fec emacs-cvs-23.0.0.ebuild 5212
 RMD160 7326b14349ccc989cc9621c3544c3b51ad9dbba4 emacs-cvs-23.0.0.ebuild 5212
 SHA256 d6296a96a34c99873295b6f75fc342031662e4d8a7aff8883f26798ef21446fd emacs-cvs-23.0.0.ebuild 5212
-MISC ChangeLog 8074 RMD160 84421e3f24bcadc1b694c797ec004fd9e6d5aef0 SHA1 1caa84c599586c60a7985f873d1f4c384f47d29d SHA256 a97f618cb94e4fccc4e09c43e46249db0ff6c910c28377e9ec4a2f492ad7102e
-MD5 29e3643aed96be49c15e4cccafeda467 ChangeLog 8074
-RMD160 84421e3f24bcadc1b694c797ec004fd9e6d5aef0 ChangeLog 8074
-SHA256 a97f618cb94e4fccc4e09c43e46249db0ff6c910c28377e9ec4a2f492ad7102e ChangeLog 8074
+MISC ChangeLog 8389 RMD160 aac5e84c9e5103225eeaff252e2288f36fc55adf SHA1 7a3fb11dd34389e4712bf91a79203136c14c1f23 SHA256 3384af96b94efc2a7eaa5d81d40b44dc996e8615348812edc294b83bdab6ca12
+MD5 c5fc0f7d272ed3eb97006709615b7aa6 ChangeLog 8389
+RMD160 aac5e84c9e5103225eeaff252e2288f36fc55adf ChangeLog 8389
+SHA256 3384af96b94efc2a7eaa5d81d40b44dc996e8615348812edc294b83bdab6ca12 ChangeLog 8389
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -63,13 +64,9 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r2 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r2 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r2 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r3 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r3 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r3 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0 1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEoF3XAiZjviIA2XgRAtWVAJ9DWk8XCZb0CglMuHQrjYI3fr/j9QCfUJCy
-rz4hH/i3ydFcCSDcxOSBmS0=
-=qfTg
------END PGP SIGNATURE-----

diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
new file mode 100644 (file)
index 0000000..28fa544
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild,v 1.1 2006/08/07 05:24:48 mkennedy Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+inherit elisp-common cvs alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source"
+
+S=${WORKDIR}/emacs
+
+DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND=">=sys-libs/ncurses-5.3
+       spell? ( || ( app-text/ispell app-text/aspell ) )
+       X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+       X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
+               jpeg? ( >=media-libs/jpeg-6b )
+               tiff? ( >=media-libs/tiff-3.5.7 )
+               png? ( >=media-libs/libpng-1.2.5 )
+               gtk? ( =x11-libs/gtk+-2* )
+               !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+       sys-libs/zlib
+       >=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.50"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+       cvs_src_unpack
+       cd ${S};
+       epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+       use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+}
+
+src_compile() {
+       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
+       ALLOWED_FLAGS=" "
+       strip-flags
+       unset LDFLAGS
+       replace-flags -O[3-9] -O2
+       sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+       local myconf
+
+       if use X; then
+               myconf="${myconf} --with-x"
+               myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
+               myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+               myconf="${myconf} $(use_with gif) $(use_with png)"
+               if use gtk; then
+                       einfo "Configuring to build with GTK support"
+                       myconf="${myconf} --with-x-toolkit=gtk"
+               else
+                       einfo "Configuring to build with lucid toolkit support"
+                       myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
+                       myconf="${myconf} --without-gtk"
+                       myconf="${myconf} --with-x-toolkit=lucid"
+               fi
+       else
+               myconf="${myconf} --without-x"
+       fi
+       if use aqua ; then
+               einfo "Configuring to build with Carbon Emacs"
+               econf \
+                       --enable-carbon-app=/Applications/Gentoo \
+                       --without-x \
+                       $(use_with jpeg) $(use_with tiff) \
+                       $(use_with gif) $(use_with png) \
+                        || die "econf carbon emacs failed"
+               make bootstrap || die "make carbon emacs bootstrap failed"
+       fi
+       econf \
+               --program-suffix=.emacs-${SLOT} \
+               --without-carbon \
+               ${myconf} || die "econf emacs failed"
+       make bootstrap || die "make emacs bootstrap failed"
+}
+
+src_install () {
+       make DESTDIR=${D} install || die
+       rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
+
+       if use aqua ; then
+               einfo "Installing Carbon Emacs..."
+               dodir /Applications/Gentoo/Emacs.app
+               pushd mac/Emacs.app
+               tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
+               popd
+       fi
+
+       # fix info documentation
+       einfo "Fixing info documentation..."
+       dodir /usr/share/info/emacs-${SLOT}
+       mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+       for i in ${D}/usr/share/info/*
+       do
+               if [ "${i##*/}" != emacs-${SLOT} ] ; then
+                       mv ${i} ${i/info/info/emacs-${SLOT}}.info
+                       gzip -9 ${i/info/info/emacs-${SLOT}}.info
+               fi
+       done
+
+       if has_version 'app-text/aspell' ; then
+               # defaults to aspell if installed
+               elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+       fi
+       insinto /etc/env.d
+       cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+       einfo "Fixing manpages..."
+       for m in  ${D}/usr/share/man/man1/* ; do
+               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+       done
+
+       if use source; then
+               insinto /usr/share/emacs/${SLOT}/src
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.[ch]
+               cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+               elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+       fi
+       dodoc BUGS ChangeLog README
+       insinto /usr/share/applications
+       doins ${FILESDIR}/${DFILE}
+}
+
+update-alternatives() {
+       for i in emacs emacsclient etags ctags b2m ebrowse \
+               rcs-checkin grep-changelog ; do
+               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
+       done
+}
+
+pkg_postinst() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+}
+
+pkg_postrm() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+}

diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
@@ -0,0 +1 @@
+