diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-03-01 07:16:06 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-03-01 07:16:06 +0000 |
commit | 3c877adc4fbc23bbb160f2f61fe95f79238697ac (patch) | |
tree | e6c4f5c69c7ab8e230723330a1bee987a25b95da /app-editors | |
parent | ppc/ppc64 stable wrt #348508 (diff) | |
download | historical-3c877adc4fbc23bbb160f2f61fe95f79238697ac.tar.gz historical-3c877adc4fbc23bbb160f2f61fe95f79238697ac.tar.bz2 historical-3c877adc4fbc23bbb160f2f61fe95f79238697ac.zip |
Version bump. The sound USE flag is global now.
Package-Manager: portage-2.1.9.41/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 8 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 13 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.3_rc1.ebuild | 315 | ||||
-rw-r--r-- | app-editors/emacs/metadata.xml | 1 |
4 files changed, 330 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 4f60f44cdd57..b0ae136c2e4c 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.408 2011/02/02 17:41:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.409 2011/03/01 07:16:06 ulm Exp $ + +*emacs-23.3_rc1 (01 Mar 2011) + + 01 Mar 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-23.3_rc1.ebuild, + metadata.xml: + Version bump. The sound USE flag is global now. 02 Feb 2011; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r7.ebuild, emacs-23.2-r3.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 0406d7464bdd..cef3bdc44e40 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -12,6 +12,8 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c DIST emacs-23.2-patches-4.tar.bz2 3599 RMD160 f807bb451ba0ceb78bd83e03dbc251b0ef2fd8b8 SHA1 ffe81a3c26f565bb110afc140088675b60243b82 SHA256 4d78a6f63f780861b1c294f1d2dae6645fa4c256e823a1221c3f59eaf291ba91 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5 +DIST emacs-23.3-rc1.tar.gz 47666911 RMD160 d32ec80b29f79f950ab5547a45ae6434edf24618 SHA1 cc0d85a2f1cc59ab008f5ef96f5c37318f1a6e0b SHA256 c0d11df5e95d1b4b8f56344f0835f06592eafbbf397893ccc3bc71f0cefaaaa3 +DIST emacs-23.3_rc1-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a EBUILD emacs-21.4-r22.ebuild 5176 RMD160 1fa570948a1de7c16e24fd97bf98062d08c76786 SHA1 f398f96f53735b83b0f7ef0333573da2b094c0a6 SHA256 f2b61e2616727544f5f4e14f45567014d24162986bd10e411aaa904ace6d65fd @@ -20,12 +22,13 @@ EBUILD emacs-22.3-r6.ebuild 8052 RMD160 444100251b38e4c011889290c70e1e1d0a29416c EBUILD emacs-22.3-r7.ebuild 7921 RMD160 dff6ec3eecfecfef38cb63587fdfa72e16727c3a SHA1 d21be9d321e4039ad00df13ccd1c20062b1fb74b SHA256 bcf19019cb6b517d49921061b5763a1b416c70425ff83909f8e7bb9fd3a4c9e7 EBUILD emacs-23.2-r2.ebuild 10008 RMD160 47d6ab99e7483fe18a7fece0a31f1f0ad19fdfef SHA1 57367184d44c8e170f3186cf84c007a4d9be7fd3 SHA256 44fd93a28deb705d0cdbf741bb3ce65ae0c6bdc1b06d147b76abf085cd1cc4f9 EBUILD emacs-23.2-r3.ebuild 10106 RMD160 e2aa2d221aa78bf7a0dac97d93fac57895130563 SHA1 c958bf2de91e39317e455628ce787fc7b03d9649 SHA256 d708191def58c7fa19256f785616608c0709ff8c5c5a5c7c11cb882cb9844ea6 -MISC ChangeLog 58275 RMD160 56b69ad8475d830db6918e7b940dfc840d0c62c8 SHA1 57afff4bd6b82c9eb46119b1cc653c8507cd0e6f SHA256 4a3f0e4ec5aba50119ca2f68df8b925cb1bbe20ec3765b02dcc6ab3c4e8349e2 -MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010 +EBUILD emacs-23.3_rc1.ebuild 10098 RMD160 15c1ae81e9415c705af874c44302231205abc031 SHA1 d8e868999d34afa82ab1ee633057872ef5344722 SHA256 f6df1b6de3cd70b50662b02c62112e00773b6aae03c1c3839ac7abe9c2705ff1 +MISC ChangeLog 58444 RMD160 e18b2bb0cf31a96207b72b9b20eebf896778500f SHA1 115529347c94fb838b344695a6508383a82fc351 SHA256 40c439e6f4eae07d1645e9907a8ae57e3bd04df47293da36c4929874e2955af6 +MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1hb0oACgkQOeoy/oIi7ux0UACfUOPnY8Jh2EFl6o21HNtxxfXO -IW8An1g03qar0R5pkgPMFfisA0DCB6BO -=Htx/ +iEYEARECAAYFAk1snsYACgkQOeoy/oIi7uxHQQCgrjkEGF0Rcaoq+ssxJKjQ+CO+ +VmAAnjVQpHMiqNZxT0ZB9G3FNKhrg6NK +=vcGI -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-23.3_rc1.ebuild b/app-editors/emacs/emacs-23.3_rc1.ebuild new file mode 100644 index 000000000000..1f3b01fc07d4 --- /dev/null +++ b/app-editors/emacs/emacs-23.3_rc1.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3_rc1.ebuild,v 1.1 2011/03/01 07:16:06 ulm Exp $ + +EAPI=4 +WANT_AUTOMAKE="none" + +inherit autotools elisp-common eutils flag-o-matic multilib + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" +SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/${P/_/-}.tar.gz + mirror://gentoo/${P}-patches-1.tar.bz2" + +LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode" +SLOT="23" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" +REQUIRED_USE="aqua? ( !X )" +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 + gconf? ( >=gnome-base/gconf-2.26.2 ) + 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 ) + 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-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" +# 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}" + +src_prepare() { + EPATCH_SUFFIX=patch epatch + + 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 + 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 --without-ns" + myconf="${myconf} $(use_with gconf)" + 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 + elif use aqua; then + einfo "Configuring to build with Cocoa support" + myconf="${myconf} --with-ns --disable-ns-self-contained" + myconf="${myconf} --without-x" + else + myconf="${myconf} --without-x --without-ns" + fi + + myconf="${myconf} $(use_with hesiod)" + myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" + myconf="${myconf} $(use_with gpm) $(use_with dbus)" + + # 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}" \ + ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + 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 + + if use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die + einfo "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." + einfo "You may want to copy or symlink it into /Applications by yourself." + fi +} + +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 +} diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index efef7c8c0274..adb9915f4e11 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -26,7 +26,6 @@ <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag> <flag name='leim'>Add support for Emacs input methods</flag> <flag name='sendmail'>Build Emacs with MTA support</flag> - <flag name='sound'>Enable sound</flag> <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars</flag> </use> |