summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-07-30 14:54:35 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-07-30 14:54:35 +0000
commitde188179cd9eefbf0a038f8af44849b8a5c8d4dd (patch)
treec28cb0b6f8fe899c0d7a7b2a4bcf533c7770e661 /app-editors
parentThere's no >= zaptel 1.4.0 in tree. (diff)
downloadhistorical-de188179cd9eefbf0a038f8af44849b8a5c8d4dd.tar.gz
historical-de188179cd9eefbf0a038f8af44849b8a5c8d4dd.tar.bz2
historical-de188179cd9eefbf0a038f8af44849b8a5c8d4dd.zip
clean up
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-cvs/ChangeLog8
-rw-r--r--app-editors/emacs-cvs/Manifest18
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-23.0.94.ebuild296
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-23.0.95.ebuild296
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-23.0.96.ebuild296
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-23.0.9999-r2.ebuild294
-rw-r--r--app-editors/emacs-cvs/files/emacs-23.0.94-handle-xz-suffix.patch16
7 files changed, 12 insertions, 1212 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 8a376e7dfb26..04ff70fe259d 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/emacs-cvs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.253 2009/07/14 07:36:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.254 2009/07/30 14:54:35 fauli Exp $
+
+ 30 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ -emacs-cvs-23.0.94.ebuild, -files/emacs-23.0.94-handle-xz-suffix.patch,
+ -emacs-cvs-23.0.95.ebuild, -emacs-cvs-23.0.96.ebuild,
+ -emacs-cvs-23.0.9999-r2.ebuild:
+ clean up
14 Jul 2009; Ulrich Mueller <ulm@gentoo.org>
-files/emacs-23.0.92-sh.patch, -emacs-cvs-23.0.93.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 9757fee4370a..bc374d1596f9 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,21 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX emacs-23.0.94-handle-xz-suffix.patch 751 RMD160 6380952113ef9652c58f82de6b6a4254281721a6 SHA1 2666b767674a1b57853d8802e3243ce9b5f5b0cd SHA256 167b019518b147f737c7e69281a76d0e5651db44c82dff0834d6e2a964870bfc
-DIST emacs-23.0.94.tar.gz 42801442 RMD160 9efcf7ae17675a6b01665e3b844c7e570d47eddc SHA1 397cc514085d8aa25efe9e6bf4bfd27a97693870 SHA256 c391ec2d1baa9fad5fc503414d7781d5aabfc14c1157bb99453968096435ed6e
-DIST emacs-23.0.95.tar.gz 42792970 RMD160 07c3aed638dc5ba3d825215cdca9d280c888bb5e SHA1 05551d542a911c654589208b0d29dedcb5e34a80 SHA256 703001e949b426f99dcdb65eb563118a3214bd8e057bf930925984dc4d8434cf
-DIST emacs-23.0.96.tar.gz 42800061 RMD160 19cb2403a47f3b79c7e685b85e6d3b324b5eb538 SHA1 b8fc0c4f3484ef425bc36751d03aa368577dc674 SHA256 cfa7f694dd855b6f24506a4d20b0c7c7e4003d0c3c7673029c8d282978aa4d8a
-EBUILD emacs-cvs-23.0.94.ebuild 8922 RMD160 4ec46c8ad3f0bcbebc9431a11ec608608762d95f SHA1 e8c7aea5607179f3c6a47711572ac399f63273e1 SHA256 469cce1549b1de5caac9e656e9a03dbf544a5858b17c69a2fb4dbe699ab93949
-EBUILD emacs-cvs-23.0.95.ebuild 8924 RMD160 061f70bc7908daac82ea17654b85bc097112cd6f SHA1 2894ecd2d567c42d9336fbd26d4b65bf24b54127 SHA256 9512fd859830c60dbe32318550b184d6e79ee0f839d84c3d9d39ba60e4c233ac
-EBUILD emacs-cvs-23.0.96.ebuild 8929 RMD160 598e867c8d0a7690683bb55feb17d6f72682c657 SHA1 4faf19cfe0dff9e4475741dd42fa949931346dc0 SHA256 8f24845c8efb131c93c04e0ecde88cc5c52ccf6fb89c6ac58d3decaddc5755b5
-EBUILD emacs-cvs-23.0.9999-r2.ebuild 8888 RMD160 105c3dd4fe7123429880bbfcaf270d418776277f SHA1 5e36765337005cbcec522653127f86b5a19df1ca SHA256 389cbd96ac8091b4b925c3ca14068574c346f65fab179f68e83190b7bdd8bccb
EBUILD emacs-cvs-23.1.9999.ebuild 8871 RMD160 951cadd4a4e2d045049f0fea53bb2034b4add69c SHA1 0c11945e52d562bc5aff95b28c9f33ff3ca57f6d SHA256 8b715dc962b5d39c29cc62e0da43bc4a49a0940b3a3fded82eadba4e26a135bd
-MISC ChangeLog 47608 RMD160 41981852dffcdd34341ab5d1ae85814794bcb0a7 SHA1 52e10623f930921e6c3e2bd5954ad693f825df02 SHA256 f8d6d6e74505fc17d823d71090d6186aac45aee784a839919719bf2fc4989ed2
+MISC ChangeLog 47841 RMD160 1abf5ea623d8bcf3a699a25d47c9b11b56fa6a4d SHA1 cba0dbdee83e2e82521b4024de7291149e94e1c2 SHA256 9b7bf3c52a0deff42d9ed87686653db421dd4111e3dc34b90d065909588f99cc
MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkpcNfYACgkQOeoy/oIi7uwGiwCcCfwE1qEY6vbthCDRIijekScd
-B14AoJ7ZPUTzQIAT7BENRxIhXCzVgZI/
-=ZiMv
+iEYEARECAAYFAkpxtDoACgkQNQqtfCuFneM3dQCfe1uswfS3s1pyJXiEAv1Nlg6m
+T14An3UqQt+zn7aTvebXpIHXtPTjWPUo
+=oaej
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.94.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.94.ebuild
deleted file mode 100644
index f61832624ef2..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.94.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2009 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.94.ebuild,v 1.5 2009/06/19 22:42:51 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
- ECVS_AUTH="pserver"
- ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
- ECVS_MODULE="emacs"
- ECVS_BRANCH="HEAD"
- ECVS_LOCALNAME="emacs"
- inherit cvs
- SRC_URI=""
- S="${WORKDIR}/${ECVS_LOCALNAME}"
-else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
- ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
- # 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%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C unicode"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
- png? ( media-libs/libpng )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
- )
- )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
- >=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- if [ "${PV##*.}" = "9999" ]; then
- FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
- [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
- echo
- einfo "Emacs CVS branch: ${ECVS_BRANCH}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [ "${FULL_VERSION%.*}" = ${PV%.*} ] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- echo
- fi
-
- epatch "${FILESDIR}/emacs-${PV}-handle-xz-suffix.patch"
-
- 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 alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
- fi
- 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
-
- eautoreconf
-}
-
-src_configure() {
- ALLOWED_FLAGS=""
- strip-flags
- #unset LDFLAGS
- if use sh; then
- replace-flags -O[1-9] -O0 #262359
- else
- replace-flags -O[3-9] -O2
- fi
-
- 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_with gif) $(use_with jpeg)"
- myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
- myconf="${myconf} $(use_with tiff) $(use_with xpm)"
- myconf="${myconf} $(use_with xft)"
-
- if use xft; then
- myconf="${myconf} $(use_with m17n-lib libotf)"
- myconf="${myconf} $(use_with m17n-lib m17n-flt)"
- else
- myconf="${myconf} --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect because xft is not set."
- fi
-
- # 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
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=gtk"
- elif use Xaw3d; then
- einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
- myconf="${myconf} --with-x-toolkit=athena"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf="${myconf} --with-x-toolkit=motif"
- else
- einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
- fi
-
- local f tk=
- for f in gtk Xaw3d motif; do
- use ${f} || continue
- [ "${tk}" ] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- tk="${tk}${tk:+ }${f}"
- done
- else
- myconf="${myconf} --without-x"
- fi
-
- myconf="${myconf} $(use_with hesiod)"
- myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
- myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
- econf \
- --program-suffix=-${EMACS_SUFFIX} \
- --infodir=/usr/share/info/${EMACS_SUFFIX} \
- ${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- if [ "${PV##*.}" = "9999" ]; then
- emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
- # cleanup, otherwise emacs will be dumped again in src_install
- (cd src; emake versionclean)
- fi
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
- local i m
-
- 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
- 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
- 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 -rf "${D}"/usr/share/{applications,icons}
- rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
- keepdir /var/lib/games/emacs
-
- local c=";;"
- 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]
- c=""
- fi
-
- sed 's/^X//' >"${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X ${c}(setq find-function-C-source-directory
- X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
- X (let ((path (getenv "INFOPATH"))
- X (dir "/usr/share/info/${EMACS_SUFFIX}"))
- X (and path
- X ;; move Emacs Info dir to beginning of list
- X (setq Info-directory-list
- X (cons dir (delete dir (split-string path ":" t)))))))
- EOF
- elisp-site-file-install "${SITEFILE}" || die
-
- dodoc README BUGS || 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
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
- echo
-}
-
-pkg_postinst() {
- local f
- for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
- [ -e "${f}" ] || touch "${f}"
- done
-
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-
- echo
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "You can therefore test emacs-cvs along with the stable release."
- elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.95.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.95.ebuild
deleted file mode 100644
index 70272c612789..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.95.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2009 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.95.ebuild,v 1.1 2009/06/19 22:42:51 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
- ECVS_AUTH="pserver"
- ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
- ECVS_MODULE="emacs"
- ECVS_BRANCH="HEAD"
- ECVS_LOCALNAME="emacs"
- inherit cvs
- SRC_URI=""
- S="${WORKDIR}/${ECVS_LOCALNAME}"
-else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
- ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
- # 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%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C unicode"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
- png? ( media-libs/libpng )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
- )
- )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
- >=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- if [ "${PV##*.}" = "9999" ]; then
- FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
- [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
- echo
- einfo "Emacs CVS branch: ${ECVS_BRANCH}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [ "${FULL_VERSION%.*}" = ${PV%.*} ] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- echo
- fi
-
- epatch "${FILESDIR}/emacs-23.0.94-handle-xz-suffix.patch"
-
- 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 alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
- fi
- 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
-
- eautoreconf
-}
-
-src_configure() {
- ALLOWED_FLAGS=""
- strip-flags
- #unset LDFLAGS
- if use sh; then
- replace-flags -O[1-9] -O0 #262359
- else
- replace-flags -O[3-9] -O2
- fi
-
- 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_with gif) $(use_with jpeg)"
- myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
- myconf="${myconf} $(use_with tiff) $(use_with xpm)"
- myconf="${myconf} $(use_with xft)"
-
- if use xft; then
- myconf="${myconf} $(use_with m17n-lib libotf)"
- myconf="${myconf} $(use_with m17n-lib m17n-flt)"
- else
- myconf="${myconf} --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect because xft is not set."
- fi
-
- # 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
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=gtk"
- elif use Xaw3d; then
- einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
- myconf="${myconf} --with-x-toolkit=athena"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf="${myconf} --with-x-toolkit=motif"
- else
- einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
- fi
-
- local f tk=
- for f in gtk Xaw3d motif; do
- use ${f} || continue
- [ "${tk}" ] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- tk="${tk}${tk:+ }${f}"
- done
- else
- myconf="${myconf} --without-x"
- fi
-
- myconf="${myconf} $(use_with hesiod)"
- myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
- myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
- econf \
- --program-suffix=-${EMACS_SUFFIX} \
- --infodir=/usr/share/info/${EMACS_SUFFIX} \
- ${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- if [ "${PV##*.}" = "9999" ]; then
- emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
- # cleanup, otherwise emacs will be dumped again in src_install
- (cd src; emake versionclean)
- fi
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
- local i m
-
- 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
- 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
- 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 -rf "${D}"/usr/share/{applications,icons}
- rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
- keepdir /var/lib/games/emacs
-
- local c=";;"
- 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]
- c=""
- fi
-
- sed 's/^X//' >"${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X ${c}(setq find-function-C-source-directory
- X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
- X (let ((path (getenv "INFOPATH"))
- X (dir "/usr/share/info/${EMACS_SUFFIX}"))
- X (and path
- X ;; move Emacs Info dir to beginning of list
- X (setq Info-directory-list
- X (cons dir (delete dir (split-string path ":" t)))))))
- EOF
- elisp-site-file-install "${SITEFILE}" || die
-
- dodoc README BUGS || 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
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
- echo
-}
-
-pkg_postinst() {
- local f
- for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
- [ -e "${f}" ] || touch "${f}"
- done
-
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-
- echo
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "You can therefore test emacs-cvs along with the stable release."
- elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.96.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.96.ebuild
deleted file mode 100644
index 5ea63d427321..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.96.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2009 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.96.ebuild,v 1.2 2009/07/14 07:36:31 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
- ECVS_AUTH="pserver"
- ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
- ECVS_MODULE="emacs"
- ECVS_BRANCH="HEAD"
- ECVS_LOCALNAME="emacs"
- inherit cvs
- SRC_URI=""
- S="${WORKDIR}/${ECVS_LOCALNAME}"
-else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
- ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
- # 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%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C unicode"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
- png? ( media-libs/libpng )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
- )
- )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
- >=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- if [ "${PV##*.}" = "9999" ]; then
- FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
- [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
- echo
- einfo "Emacs CVS branch: ${ECVS_BRANCH}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [ "${FULL_VERSION%.*}" = ${PV%.*} ] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- echo
- fi
-
- epatch "${FILESDIR}/emacs-23.0.94-handle-xz-suffix.patch"
-
- 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 alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
- fi
- 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
-
- eautoreconf
-}
-
-src_configure() {
- ALLOWED_FLAGS=""
- strip-flags
- #unset LDFLAGS
- if use sh; then
- replace-flags -O[1-9] -O0 #262359
- else
- replace-flags -O[3-9] -O2
- fi
-
- 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_with gif) $(use_with jpeg)"
- myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
- myconf="${myconf} $(use_with tiff) $(use_with xpm)"
- myconf="${myconf} $(use_with xft)"
-
- if use xft; then
- myconf="${myconf} $(use_with m17n-lib libotf)"
- myconf="${myconf} $(use_with m17n-lib m17n-flt)"
- else
- myconf="${myconf} --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect because xft is not set."
- fi
-
- # 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
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=gtk"
- elif use Xaw3d; then
- einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
- myconf="${myconf} --with-x-toolkit=athena"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf="${myconf} --with-x-toolkit=motif"
- else
- einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
- fi
-
- local f tk=
- for f in gtk Xaw3d motif; do
- use ${f} || continue
- [ "${tk}" ] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- tk="${tk}${tk:+ }${f}"
- done
- else
- myconf="${myconf} --without-x"
- fi
-
- myconf="${myconf} $(use_with hesiod)"
- myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
- myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
- econf \
- --program-suffix=-${EMACS_SUFFIX} \
- --infodir=/usr/share/info/${EMACS_SUFFIX} \
- ${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- if [ "${PV##*.}" = "9999" ]; then
- emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
- # cleanup, otherwise emacs will be dumped again in src_install
- (cd src; emake versionclean)
- fi
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
- local i m
-
- 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
- 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
- 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 -rf "${D}"/usr/share/{applications,icons}
- rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
- keepdir /var/lib/games/emacs
-
- local c=";;"
- 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]
- c=""
- fi
-
- sed 's/^X//' >"${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X ${c}(setq find-function-C-source-directory
- X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
- X (let ((path (getenv "INFOPATH"))
- X (dir "/usr/share/info/${EMACS_SUFFIX}"))
- X (and path
- X ;; move Emacs Info dir to beginning of list
- X (setq Info-directory-list
- X (cons dir (delete dir (split-string path ":" t)))))))
- EOF
- elisp-site-file-install "${SITEFILE}" || die
-
- dodoc README BUGS || 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
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
- echo
-}
-
-pkg_postinst() {
- local f
- for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
- [ -e "${f}" ] || touch "${f}"
- done
-
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-
- echo
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "Therefore, several Emacs versions can be installed at the same time."
- elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r2.ebuild
deleted file mode 100644
index 6be4ae8c14d8..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2009 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.9999-r2.ebuild,v 1.2 2009/07/14 07:36:31 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
- ECVS_AUTH="pserver"
- ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
- ECVS_MODULE="emacs"
- ECVS_BRANCH="EMACS_23_1_RC"
- ECVS_LOCALNAME="emacs-23.1"
- inherit cvs
- SRC_URI=""
- S="${WORKDIR}/${ECVS_LOCALNAME}"
-else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
- ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
- # 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%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C unicode"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
- png? ( media-libs/libpng )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
- )
- )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
- >=app-emacs/emacs-common-gentoo-1[X?]"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- if [ "${PV##*.}" = "9999" ]; then
- FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
- [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
- echo
- einfo "Emacs CVS branch: ${ECVS_BRANCH}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [ "${FULL_VERSION%.*}" = ${PV%.*} ] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- echo
- fi
-
- 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 alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
- fi
- 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
-
- eautoreconf
-}
-
-src_configure() {
- ALLOWED_FLAGS=""
- strip-flags
- #unset LDFLAGS
- if use sh; then
- replace-flags -O[1-9] -O0 #262359
- else
- replace-flags -O[3-9] -O2
- fi
-
- 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_with gif) $(use_with jpeg)"
- myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
- myconf="${myconf} $(use_with tiff) $(use_with xpm)"
- myconf="${myconf} $(use_with xft)"
-
- if use xft; then
- myconf="${myconf} $(use_with m17n-lib libotf)"
- myconf="${myconf} $(use_with m17n-lib m17n-flt)"
- else
- myconf="${myconf} --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect because xft is not set."
- fi
-
- # 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
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=gtk"
- elif use Xaw3d; then
- einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
- myconf="${myconf} --with-x-toolkit=athena"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf="${myconf} --with-x-toolkit=motif"
- else
- einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
- fi
-
- local f tk=
- for f in gtk Xaw3d motif; do
- use ${f} || continue
- [ "${tk}" ] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- tk="${tk}${tk:+ }${f}"
- done
- else
- myconf="${myconf} --without-x"
- fi
-
- myconf="${myconf} $(use_with hesiod)"
- myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
- myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
- econf \
- --program-suffix=-${EMACS_SUFFIX} \
- --infodir=/usr/share/info/${EMACS_SUFFIX} \
- ${myconf} || die "econf emacs failed"
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- if [ "${PV##*.}" = "9999" ]; then
- emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
- # cleanup, otherwise emacs will be dumped again in src_install
- (cd src; emake versionclean)
- fi
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
- local i m
-
- 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
- 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
- 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 -rf "${D}"/usr/share/{applications,icons}
- rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
- keepdir /var/lib/games/emacs
-
- local c=";;"
- 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]
- c=""
- fi
-
- sed 's/^X//' >"${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X ${c}(setq find-function-C-source-directory
- X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
- X (let ((path (getenv "INFOPATH"))
- X (dir "/usr/share/info/${EMACS_SUFFIX}"))
- X (and path
- X ;; move Emacs Info dir to beginning of list
- X (setq Info-directory-list
- X (cons dir (delete dir (split-string path ":" t)))))))
- EOF
- elisp-site-file-install "${SITEFILE}" || die
-
- dodoc README BUGS || 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
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
- echo
-}
-
-pkg_postinst() {
- local f
- for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
- [ -e "${f}" ] || touch "${f}"
- done
-
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-
- echo
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "Therefore, several Emacs versions can be installed at the same time."
- elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-cvs/files/emacs-23.0.94-handle-xz-suffix.patch b/app-editors/emacs-cvs/files/emacs-23.0.94-handle-xz-suffix.patch
deleted file mode 100644
index 9345ceaabbd4..000000000000
--- a/app-editors/emacs-cvs/files/emacs-23.0.94-handle-xz-suffix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Automatically handle .xz suffix (XZ-compressed files)
-From Jim Meyering <meyering@redhat.com> on emacs-devel
-
---- a/lisp/jka-cmpr-hook.el
-+++ b/lisp/jka-cmpr-hook.el
-@@ -219,6 +219,10 @@ options through Custom does this automatically."
- "compressing" "gzip" ("-c" "-q")
- "uncompressing" "gzip" ("-c" "-q" "-d")
- t t "\037\213"]
-+ ["\\.xz\\(~\\|\\.~[0-9]+~\\)?\\'"
-+ "XZ compressing" "xz" ("-c" "-q")
-+ "XZ uncompressing" "xz" ("-c" "-q" "-d")
-+ t t "\3757zXZ\0"]
- ;; dzip is gzip with random access. Its compression program can't
- ;; read/write stdin/out, so .dz files can only be viewed without
- ;; saving, having their contents decompressed with gzip.