diff options
author | Ulrich Müller <ulm@gentoo.org> | 2007-10-12 08:27:14 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2007-10-12 08:27:14 +0000 |
commit | 1eaf65a10cd140ad43ead14888db85fbd8f60978 (patch) | |
tree | 5056db8ae6e21a9b0d5ca6ea6f06a9235e8324db /app-editors | |
parent | Remove old versions and SLOT for bug 159995. Also quote ${D} in the remaining... (diff) | |
download | historical-1eaf65a10cd140ad43ead14888db85fbd8f60978.tar.gz historical-1eaf65a10cd140ad43ead14888db85fbd8f60978.tar.bz2 historical-1eaf65a10cd140ad43ead14888db85fbd8f60978.zip |
Snapshot of Emacs unicode-2 branch, before the multi-tty merge.
Package-Manager: portage-2.1.3.12
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 10 | ||||
-rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild | 4 | ||||
-rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild | 235 | ||||
-rw-r--r-- | app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920 | 3 | ||||
-rw-r--r-- | app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch (renamed from app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch) | 0 |
5 files changed, 249 insertions, 3 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index bbc85b7a5c37..89b0ae84a1e9 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.160 2007/10/12 06:32:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.161 2007/10/12 08:27:14 ulm Exp $ + +*emacs-cvs-23.0.0_p20070920 (12 Oct 2007) + + 12 Oct 2007; Ulrich Mueller <ulm@gentoo.org> + -files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch, + +files/emacs-cvs-makeinfo-regexp.patch, + +emacs-cvs-23.0.0_p20070920.ebuild: + Snapshot of Emacs unicode-2 branch, before the multi-tty merge. 12 Oct 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-23.0.0-r7.ebuild: Remove defunct ebuild for unicode-2 branch. diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild index 19e425149a5d..9b4c11ed45e4 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.1.50_p20070829-r1.ebuild,v 1.3 2007/10/10 06:31:21 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild,v 1.4 2007/10/12 08:27:14 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" @@ -69,7 +69,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" - epatch "${FILESDIR}/${P}-makeinfo-regexp.patch" + epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild new file mode 100644 index 000000000000..cba9c1260ebb --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.1 2007/10/12 08:27:14 ulm Exp $ + +WANT_AUTOCONF="2.5" +WANT_AUTOMAKE="latest" + +inherit autotools elisp-common eutils flag-o-matic + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-3 FDL-1.2 BSD" +SLOT="23-unicode" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="alsa gif gpm gtk gzip-el hesiod jpeg motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" +RESTRICT="strip" + +X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" + +RDEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-0.7-r1 + sys-libs/zlib + hesiod? ( net-dns/hesiod ) + spell? ( || ( app-text/ispell app-text/aspell ) ) + alsa? ( media-sound/alsa-headers ) + gpm? ( sys-libs/gpm ) + X? ( + $X_DEPEND + x11-misc/emacs-desktop + gif? ( media-libs/giflib ) + jpeg? ( media-libs/jpeg ) + tiff? ( media-libs/tiff ) + png? ( media-libs/libpng ) + svg? ( >=gnome-base/librsvg-2.0 ) + xpm? ( x11-libs/libXpm ) + xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) + gtk? ( =x11-libs/gtk+-2* ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3d ) + !Xaw3d? ( + motif? ( virtual/motif ) + ) + ) + )" + +DEPEND="${RDEPEND} + gzip-el? ( app-arch/gzip )" + +# FULL_VERSION keeps the full version number, which is needed in order to +# determine some path information correctly for copy/move operations later on +FULL_VERSION="${PV%%_*}" +EMACS_SUFFIX="emacs-${SLOT}" + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ + -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ + "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" + if ! use gzip-el; then + # Emacs' build system automatically detects the gzip binary and + # compresses el files. We don't want that so confuse it with a + # wrong binary name + sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ + || die "unable to sed configure.in" + fi + + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" + epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" + # ALSA is detected and used even if not requested by the USE=alsa flag. + # So remove the automagic check + use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" + + eautoreconf +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + ALLOWED_FLAGS="" + strip-flags + unset LDFLAGS + replace-flags -O[3-9] -O2 + + local myconf + + if use alsa && ! use sound; then + echo + einfo "Although sound USE flag is disabled you chose to have alsa," + einfo "so sound is switched on anyway." + echo + myconf="${myconf} --with-sound" + else + myconf="${myconf} $(use_with sound)" + fi + + if use X; then + myconf="${myconf} --with-x" + myconf="${myconf} $(use_with toolkit-scroll-bars)" + myconf="${myconf} $(use_enable xft font-backend)" + myconf="${myconf} $(use_with xft freetype)" + myconf="${myconf} $(use_with xft)" + myconf="${myconf} $(use_with jpeg) $(use_with tiff)" + myconf="${myconf} $(use_with gif) $(use_with png)" + myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" + + # GTK+ is the default toolkit if USE=gtk is chosen with other + # possibilities. Emacs upstream thinks this should be standard + # policy on all distributions + if use gtk; then + echo + einfo "Configuring to build with GTK support, disabling all other toolkits" + echo + myconf="${myconf} --with-x-toolkit=gtk" + elif use Xaw3d; then + einfo "Configuring to build with Xaw3d(athena) support" + myconf="${myconf} --with-x-toolkit=athena" + myconf="${myconf} --without-gtk" + elif use motif; then + einfo "Configuring to build with motif toolkit support" + myconf="${myconf} --with-x-toolkit=motif" + myconf="${myconf} --without-gtk" + else + einfo "Configuring to build with no toolkit" + myconf="${myconf} --with-x-toolkit=no" + myconf="${myconf} --without-gtk" + fi + else + myconf="${myconf} --without-x" + fi + + myconf="${myconf} $(use_with hesiod)" + myconf="${myconf} $(use_with gpm)" + + econf \ + --program-suffix=-${EMACS_SUFFIX} \ + --infodir=/usr/share/info/${EMACS_SUFFIX} \ + --without-carbon \ + ${myconf} || die "econf emacs failed" + + emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" +} + +src_install () { + emake install DESTDIR="${D}" || die "make install failed" + + rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ + || die "removing duplicate emacs executable failed" + mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ + || die "moving Emacs executable failed" + + # move info documentation to the correct place + einfo "Fixing info documentation ..." + for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do + mv ${i} ${i}.info || die "mv info failed" + done + + # move man pages to the correct place + einfo "Fixing manpages ..." + for m in "${D}"/usr/share/man/man1/* ; do + mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed" + done + + # avoid collision between slots, see bug #169033 e.g. + rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores + keepdir /var/lib/games/emacs/ + + if use source; then + insinto /usr/share/emacs/${FULL_VERSION}/src + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.[ch] + sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF + (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + X (setq find-function-C-source-directory + X "/usr/share/emacs/${FULL_VERSION}/src")) + EOF + elisp-site-file-install 00${PN}-${SLOT}-gentoo.el + fi + + dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed" +} + +emacs-infodir-rebuild() { + # Depending on the Portage version, the Info dir file is compressed + # or removed. It is only rebuilt by Portage if our directory is in + # INFOPATH, which is not guaranteed. So we rebuild it ourselves. + + local infodir=/usr/share/info/${EMACS_SUFFIX} f + einfo "Regenerating Info directory index in ${infodir} ..." + rm -f "${ROOT}"${infodir}/dir{,.*} + for f in "${ROOT}"${infodir}/*.info*; do + [[ ${f##*/} == *[0-9].info* ]] \ + || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null + done + echo +} + +pkg_postinst() { + test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || + cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el + + local f + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + test -e ${f} || touch ${f} + done + + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update --if-unset + + if use X; then + elog "You need to install some fonts for Emacs. Under monolithic" + elog "XFree86/Xorg you typically had such fonts installed by default." + elog "With modular Xorg, you will have to perform this step yourself." + elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" + elog "machine would satisfy basic Emacs requirements under X11." + fi + + echo + elog "You can set the version to be started by /usr/bin/emacs through" + elog "the Emacs eselect module. Man and info pages are automatically" + elog "redirected, so you are to test emacs-cvs along with the stable" + elog "release. \"man emacs.eselect\" for details." +} + +pkg_postrm() { + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update --if-unset +} diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920 new file mode 100644 index 000000000000..6fd38247c586 --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920 @@ -0,0 +1,3 @@ +MD5 d41d8cd98f00b204e9800998ecf8427e emacs-cvs-23.0.0_p20070920.tar.bz2 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 emacs-cvs-23.0.0_p20070920.tar.bz2 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 emacs-cvs-23.0.0_p20070920.tar.bz2 0 diff --git a/app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch b/app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch index 6e0c2aa9f945..6e0c2aa9f945 100644 --- a/app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch +++ b/app-editors/emacs-cvs/files/emacs-cvs-makeinfo-regexp.patch |