diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-03-04 21:04:12 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-03-04 21:04:12 +0000 |
commit | 24b1984f93bdd30c64e91369445a63c202aedca9 (patch) | |
tree | e39d09b0c61f4006dd49ddead6627bc16cd0a084 /app-editors/emacs-vcs | |
parent | Add dependency on libXp. (diff) | |
download | emacs-24b1984f93bdd30c64e91369445a63c202aedca9.tar.gz emacs-24b1984f93bdd30c64e91369445a63c202aedca9.tar.bz2 emacs-24b1984f93bdd30c64e91369445a63c202aedca9.zip |
Try linking against Xaw3dxft for utf-8 font support in Xaw3d widgets.
svn path=/emacs-overlay/; revision=1631
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 5 | ||||
-rw-r--r-- | app-editors/emacs-vcs/Manifest | 9 | ||||
-rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild | 340 |
3 files changed, 350 insertions, 4 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 25d640f..aaeeea0 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*emacs-vcs-24.0.9999-r2 (04 Mar 2011) + + 04 Mar 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-vcs-24.0.9999-r2.ebuild: + Try linking against Xaw3dxft for utf-8 font support in Xaw3d widgets. + *emacs-vcs-23.3.9999 (01 Mar 2011) 01 Mar 2011; Ulrich Mueller <ulm@gentoo.org> -emacs-vcs-23.2.9999-r1.ebuild, diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 8e265de..1a54d9d 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -3,12 +3,13 @@ Hash: SHA1 EBUILD emacs-vcs-23.3.9999.ebuild 10450 RMD160 dfb8831d42395e9b43596e952fa0cb96e4d26062 SHA1 05aa204f10721b08ad8bcfd243b16ff2401bab4d SHA256 fafed8dfb9cb85062a7962e087c1cfbcdc167f3d9bc5fe7b6974f598a71a6a04 EBUILD emacs-vcs-24.0.9999-r1.ebuild 10586 RMD160 272e292b8bd8caecc0600eb4eaa15f1196418f1f SHA1 f8662ebfa6f37abc4606b010819cfc8f42ec1989 SHA256 b115cede392560400b906232f8369546254b295b0f6b63af722394525b47df79 -MISC ChangeLog 2529 RMD160 5196b84fc4e0ac1aed4ac177cb3f6be94eba7935 SHA1 c61177a3a645d40e9780d8cbe6ee219665b58101 SHA256 76256368bc5f48cbda803bfdb5bbb726d33a6ddcb56010888f9b3b244a58bf32 +EBUILD emacs-vcs-24.0.9999-r2.ebuild 10612 RMD160 7fd5a1385108d03be8c8cb026aac2ccd2962293a SHA1 fe12395374f016c3e39457b391111e3a2cab3cac SHA256 2e879bcb52cbef733d34518e2e7e31bb169beffb03a61bb01c26ba851a7d2f87 +MISC ChangeLog 2720 RMD160 59fade36e203a8b037fa50a6b5e673ad04bde729 SHA1 84a7f4472bdd6a04ba4ef8b6ce1a2881aa1001c4 SHA256 340d4f045b63fa552191fd9909eae3c38f9840b927248c9e7a91258e942c2648 MISC metadata.xml 1801 RMD160 606c780a3e86f485699157f14a35ca0e5da1d3c2 SHA1 05839ee25c6f6389e8eb80d783df895d59600a90 SHA256 bdc233a1795f52900dbe4d0a39c0e56d4eb5ba1c4842b9c46bae47f7052d5d74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1tJu0ACgkQOeoy/oIi7uyjPACfVXeuojuF4L8ocO3s3b25bVG2 -UhoAoKbG77TkXPjiAbQIMI2zf2KHx7z/ -=19d2 +iEYEARECAAYFAk1xUggACgkQOeoy/oIi7uzJqgCg610svXRFkhsGe4lA9Fdn5ofU +1i4AoMEga409uP3UtgPPG+eMGYa3XHUk +=+JXR -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild new file mode 100644 index 0000000..5f24746 --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2011 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.9999-r1.ebuild,v 1.4 2011/02/02 19:29:05 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" +SLOT="24" +KEYWORDS="" +IUSE="alsa dbus gconf gif gnutls gpm gtk gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux 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 ) + gnutls? ( net-libs/gnutls ) + selinux? ( sys-libs/libselinux ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg ) + png? ( media-libs/libpng ) + 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? ( x11-libs/gtk+:2 ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3dxft ) + !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) + ) + )" + +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" + +pkg_setup() { + local olddir="${EBZR_STORE_DIR}/emacs-${EBZR_BRANCH#emacs-}" + if [ -d "${olddir}" ]; then + ewarn "bzr.eclass uses branches instead of checkouts now." + ewarn "Therefore, you may remove the old bzr checkout:" + ewarn "rm -rf ${olddir}" + fi +} + +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" + echo + einfo "Emacs branch: ${EBZR_BRANCH}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + echo + fi + + sed -i -e 's:X11/Xaw3d:&xft:' configure.in src/*.c lwlib/*.c || die + sed -i -e '/AC_CHECK_LIB\|LUCID_LIBW/s:Xaw3d:&xft:' configure.in || die + + 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 + filter-flags -fstack-protector -fstack-protector-all #285778 + + 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 + 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 gconf) $(use_with libxml2 xml2)" + 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 imagemagick) $(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 + + # 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} \ + --with-crt-dir="${crtdir}" \ + --with-gameuser="${GAMES_USER_DED:-games}" \ + --without-compress-info \ + $(use_with hesiod) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with gpm) \ + $(use_with dbus) \ + $(use_with gnutls) \ + $(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 + 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 + + 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//' >"${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 + echo + 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." + fi + + 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." + echo + 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 +} |