diff options
Diffstat (limited to 'app-editors/emacs-vcs')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 30 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild | 353 |
3 files changed, 375 insertions, 15 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 120e0644e6f2..94b24d72f2bd 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.80 2012/01/28 11:44:38 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.81 2012/01/29 17:41:12 ulm Exp $ + +*emacs-vcs-24.0.93 (29 Jan 2012) + + 29 Jan 2012; Ulrich Müller <ulm@gentoo.org> +emacs-vcs-24.0.93.ebuild: + New pretest version. 28 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-23.4.9999.ebuild, emacs-vcs-24.0.9999-r3.ebuild: diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index ab6bf2f158e7..1cc28192d6b6 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -3,25 +3,27 @@ Hash: SHA1 DIST emacs-23.3-patches-4.tar.bz2 19275 RMD160 9a5d61bcf60422efd44efc5f206d9baf8e742bd6 SHA1 695d786f1d43ddbc0c269c780a43cfed9aeb35f0 SHA256 0d4393e221b78bd97c39a10f6e4206d2dbbcee7062e9626d37a3a45c72b34636 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f +DIST emacs-24.0.93.tar.gz 51257120 RMD160 6a3b6ae0ecab96a53828856de6db0c016cc5d47f SHA1 0b98ecf3e9f44497bfaf4203c2afc81252c4bafe SHA256 4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe EBUILD emacs-vcs-23.4.9999.ebuild 11183 RMD160 944d9981ea522e0cc75f8d8cace4b58efa6f3d64 SHA1 03177b048d4f72abcdc0d426d2c4406db13b4d4d SHA256 61a2c95095bd3e2fdfe5830991139732cb864ab5d0a434a0677615a84adf2193 EBUILD emacs-vcs-24.0.92-r1.ebuild 11483 RMD160 3af9f27f668b3b921499cfe00a718dc1277be4f7 SHA1 1c7e08cc9c39c4db9f5dd155343f940f720e38d1 SHA256 3884e1a38da0c27fb6274a2989626a70100592dfa72ae2c36c0338ff6e20eeec +EBUILD emacs-vcs-24.0.93.ebuild 11472 RMD160 ec24c6bedd305928ab5061a06b6387572409fab6 SHA1 ee4ca37b6cc195f36096bc3fd50197b4646f8c3d SHA256 22993e13f3e3b31c336f03d63c6a7a46136c0cf874d66f43068b187cf3401eab EBUILD emacs-vcs-24.0.9999-r3.ebuild 11477 RMD160 c779beb80bbe3850d2710b62ff3ae62979a14a19 SHA1 f2a419906b694ce591fade3f55f2feefae301e1d SHA256 b9d253c6831ac49cdb8f26ca1df7f118d264f5b23bc04e8f346321a516dac78d -MISC ChangeLog 63585 RMD160 c126531b2ddf5055af5e6cf5323f922dd25c70dd SHA1 c5f49d5b1829b83435c98ed2a59e8b08f9890a5c SHA256 78b4b987224ab13ccf6f1a38d70236930ef1bf130d3d65a51ed34f7e00e4e56f +MISC ChangeLog 63717 RMD160 1221ddebf010f417885c55fe57e995f13ae14212 SHA1 94e0180d9355d51caaa116231f9638f6c05c1514 SHA256 6b66204e6a3445967d61d4463bb028e820a1c08475fc33b9d6eaea95ea4b6971 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPI9/WAAoJEDxpGckxwJCB6rYP/38Gn2qDJxPPhuKsQgFOcv7j -innTAVztS0aOOQ+CXdRCZKIJpu4McZTNzsQYwbuhu80dTuFRvvcTdI4l53vJFQOB -D8pqUm2milSDrcD/wQRXHZ6CzyWdNGZP7JSzLmsfG9LfTsgXsVVHd2asKI6WOMTM -WJAiz44FOC8gEj35Lp/0BK2zuEGa2pDCo3PqOslKSVlO5j1s4McMc2VMVU/kviuf -BLunbUOSj+FdpHmPh11xShGWqV6pJhBa628CuX9GV2gS0cjQ1U1uiNm9E2rHMX7V -qnqe/HV1iOXVRtPNkmLJEzwege0wX5Go/AxHPiD3OaohahFz8AiyjBAX5FskpaWE -uZYtefmD6j4EBRqywBODbU0kcp59P9utvQTOEyqGPwZL0SC6Df8cmL3goCzbusWd -hxIp8m+ZIOt41V52fHJgU51lStaBvUUZ03nhPit9IYEXzfwlwgn5rOQRWKTZ38AO -qfaDBzZZFzV4/1j/iwOTvZSUfiw8n5ffPTJsyHqsrIlSbWx5ShYLDNX+gBYHxHKB -t3g9llEQpFuEza8QF/uoS6YCOo2k9QyQh3esztRWEHTg6G4yCX6vjJn/TA2SBXUI -OOC8nto82odqaUtIYtrVI9GWIaF/OBqb6Znl5Syy8k/FNMr0gSXvQDqfMPl3WieI -FN3XaX0HuRIvCqWoTOyL -=HN41 +iQIcBAEBAgAGBQJPJYTpAAoJEDxpGckxwJCBuscP/j1FRlvaA2GqSz+kZT0gWQEX +mJLuql2kbadYxkwjNHH8dpcZG5k44Ae+GyUt8ZeAEGAtR38rxFfvQEzNQ2P5VdZU +os2RL0UKxH/U3O93i6J7NXegU3P819fV+3W62V19HFgQBmQNqiGEsqvBuecpaQdY +8nzSfZtTK3sV85RPqYdoozs5oveTwbZc813quFmuarzZbWRK+WFPZ1tgikH4PJWE +jBie72MHyl9Hox4mYJ1FC0L/paGYNhjVn+lwRmJ5rBG75Z2Yg56NR/erKH5BaQ9J +RhNqFiLSasvHPIBh6glrJopKwzpeaFw2Vy3oEjU1F6yJ6J8LIUFSJUteFZ5jbzUD +btmOdRlMPS4xS506R1dhPmSibxFtlHQ06z06tZhERiNx50TH6wNneHqconIWdEhu +CW1Zt7VjrfsVWE9qgVv37SgajQ12nveOZV41IzWSUUIPFsqWLZB5oZ909STf0VV4 +HK1TV40W04qAPA2lHj3QhgDkwa/SJTIoIQjk0aKtx38k47V6Y5A9QkwFpxhcuP85 +Gn4OdPlOC7xyKf/mkgg0BZywPMzhmJiFqlxjbVcm5GOdFX0MmjFyO5d0TFGJ52nP +IMBn/TWl569JAfGiwf6hSbEjualSXFw4BkQSxOfUoqT7xEtKILNhY3dzBPEJYIZ+ +OJCmZaUVlB/uxRM2U35X +=bTHS -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild new file mode 100644 index 000000000000..a65f36759afd --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild @@ -0,0 +1,353 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild,v 1.1 2012/01/29 17:41:12 ulm Exp $ + +EAPI=4 + +inherit autotools elisp-common eutils flag-o-matic multilib + +if [[ ${PV##*.} = 9999 ]]; then + EBZR_PROJECT="emacs" + EBZR_BRANCH="trunk" + EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" + # "Nosmart" is much faster for initial branching. + EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" + inherit bzr + SRC_URI="" +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 MIT W3C unicode PSF-2" +SLOT="24" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="alsa athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" + +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 ) + gnutls? ( net-libs/gnutls ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + selinux? ( sys-libs/libselinux ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gsettings? ( >=dev-libs/glib-2.28.6 ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg ) + png? ( >=media-libs/libpng-1.4:0 ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) + 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? ( + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + ) + !gtk? ( + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( + athena? ( x11-libs/libXaw ) + !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) + ) + ) + )" + +DEPEND="${RDEPEND} + alsa? ( dev-util/pkgconfig ) + dbus? ( dev-util/pkgconfig ) + gnutls? ( dev-util/pkgconfig ) + libxml2? ( dev-util/pkgconfig ) + X? ( dev-util/pkgconfig ) + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + >=app-emacs/emacs-common-gentoo-1.3[X?]" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ + configure.in) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EBZR_BRANCH}" + einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + 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 + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + ALLOWED_FLAGS="" + strip-flags + + if use sh; then + replace-flags -O[1-9] -O0 #262359 + elif use ia64; then + replace-flags -O[2-9] -O1 #325373 + else + replace-flags -O[3-9] -O2 + fi + + local myconf + + if use alsa && ! use sound; then + einfo "Although sound USE flag is disabled you chose to have alsa," + einfo "so sound is switched on anyway." + myconf="${myconf} --with-sound" + else + myconf="${myconf} $(use_with sound)" + fi + + if use X; then + myconf="${myconf} --with-x --without-ns" + myconf="${myconf} $(use_with gconf)" + myconf="${myconf} $(use_with gsettings)" + myconf="${myconf} $(use_with toolkit-scroll-bars)" + myconf="${myconf} $(use_with wide-int)" + 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 imagemagick)" + + if use xft; then + myconf="${myconf} --with-xft" + myconf="${myconf} $(use_with m17n-lib libotf)" + myconf="${myconf} $(use_with m17n-lib m17n-flt)" + else + myconf="${myconf} --without-xft" + myconf="${myconf} --without-libotf --without-m17n-flt" + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)" + local f + for f in athena Xaw3d motif; do + use ${f} && ewarn "USE flag \"${f}\" ignored" \ + "(superseded by \"gtk\")" + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + use motif && ewarn "USE flag \"motif\" ignored" \ + "(superseded by \"athena\" or \"Xaw3d\")" + 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 + + ! use gtk && use gtk3 \ + && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set." + else + myconf="${myconf} --without-x --without-ns" + fi + + if [[ ${PV##*.} = 9999 ]]; then + # These variables are not needed for building. We add them to + # configure options because they are stored in the Emacs binary + # and available in variable "system-configuration-options". + myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" + fi + + # According to configure, this option is only used for GNU/Linux + # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell + # out the location because $(get_libdir) does not necessarily return + # something that matches the host OS's libdir naming (e.g. RHEL). + local crtdir=$($(tc-getCC) -print-file-name=crt1.o) + crtdir=${crtdir%/*} + + econf \ + --program-suffix=-${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --with-crt-dir="${crtdir}" \ + --with-gameuser="${GAMES_USER_DED:-games}" \ + --without-compress-info \ + --disable-maintainer-mode \ + $(use_with hesiod) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with gpm) \ + $(use_with dbus) \ + $(use_with gnutls) \ + $(use_with libxml2 xml2) \ + $(use_with selinux) \ + ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + if [[ ${PV##*.} = 9999 ]]; then + emake CC="$(tc-getCC)" bootstrap + # cleanup, otherwise emacs will be dumped again in src_install + (cd src; emake versionclean) + fi + # set last component of emacs-version to (package revision + 1) + touch src/emacs-${FULL_VERSION}.${PR#r} + emake CC="$(tc-getCC)" +} + +src_install () { + local i m + + emake install DESTDIR="${D}" + + rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ + || die "removing duplicate emacs executable failed" + mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ + || die "moving Emacs executable failed" + + # move man pages to the correct place + for m in "${ED}"/usr/share/man/man1/* ; do + mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" + done + + # move info dir to avoid collisions with the dir file generated by portage + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ + || die "moving info dir failed" + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${ED}"/usr/share/{applications,icons} + rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores + keepdir /var/lib/games/emacs + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp + + 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/*.{c,h,m} + doins -r src/{m,s} + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README + c="" + fi + + sed 's/^X//' >"${T}/${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} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share/info + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setq Info-directory-list (prune-directory-list (cdr p))))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [[ -f ${ED}${infodir}/dir.orig ]]; then + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" + else + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${ED}"${infodir}/dir{,.*} + for f in "${ED}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${ED}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + local f + for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + [[ -e ${f} ]] || touch "${f}" + done + chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs + + elisp-site-regen + eselect emacs update ifunset + + if use X; then + elog "You need to install some fonts for Emacs." + elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" + elog "machine would satisfy basic Emacs requirements under X11." + elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" + elog "for how to enable anti-aliased fonts." + elog + fi + + 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." + elog + elog "If you upgrade from a previous major version of Emacs, then it is" + elog "strongly recommended that you use app-admin/emacs-updater to rebuild" + elog "all byte-compiled elisp files of the installed Emacs packages." +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} |