From 91f7dfc0c95e69d0b561a1709a081b9d6fc9ebf6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 8 May 2010 07:26:28 +0000 Subject: [PATCH] Version bump. New gconf USE flag. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- app-editors/emacs/ChangeLog | 9 +- app-editors/emacs/Manifest | 19 +- app-editors/emacs/emacs-23.1-r3.ebuild | 7 +- app-editors/emacs/emacs-23.2.ebuild | 313 +++++++++++++++++++++++++ app-editors/emacs/metadata.xml | 2 + 5 files changed, 342 insertions(+), 8 deletions(-) create mode 100644 app-editors/emacs/emacs-23.2.ebuild diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 92329bc61d30..2dc756f6f926 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.376 2010/05/07 05:57:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.377 2010/05/08 07:26:28 ulm Exp $ + +*emacs-23.2 (08 May 2010) + + 08 May 2010; Ulrich Mueller +emacs-23.2.ebuild, + metadata.xml: + Version bump, based on emacs-vcs-23.1.97.ebuild. New gconf USE flag. + Initial patchset includes patch for crt* start files dir from bug 306831. 07 May 2010; Jeroen Roovers emacs-21.4-r20.ebuild, emacs-22.3-r4.ebuild, emacs-23.1-r3.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 07808bb51e19..ed7227cb13ec 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e @@ -10,6 +13,8 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 DIST emacs-23.1-patches-5.tar.bz2 3414 RMD160 2ec70b92fcb77d357edcd9e2da54fa33cfb527ac SHA1 a1d851fcd490118f6e2f16a67b94dd89de5cc2f1 SHA256 f81df36a8e69010bd81ddfda36393d9ca0da205a9717ffd8721dff47320b14b1 DIST emacs-23.1-patches-7.tar.bz2 4271 RMD160 a4582c6e25b4c32f043cec503bb841c2c1c6ca16 SHA1 3fc42fcdd1034941f1a0f83ea7ddd3d86f77a157 SHA256 005cc13e4441a06a189b719ecc527e99b17518110a52b41bf20a2d6dacf13d11 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c +DIST emacs-23.2-patches-1.tar.bz2 2061 RMD160 ca10e6a59a8858082bea8ff71d43a2fafc1f5a73 SHA1 51434ca75e234751a32aba2027981f05da97a3ee SHA256 ac9b98dd9883d9749c5644c859019065923f4520c4fbd623dabacb1c050150f8 +DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5 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-r19.ebuild 5249 RMD160 37948b5917237c6ca7b148e6d36c5f10c9c6b205 SHA1 2f04b39e2e332b0b701beaeddfb941972b2e4e88 SHA256 8527a478c88151caf7b95fd799034c3f9d8f163bf55998c6d5a57ef7b14be59d @@ -17,6 +22,14 @@ EBUILD emacs-21.4-r20.ebuild 5257 RMD160 73732df2669f76b61575f65e79d73dcbd25ec4b EBUILD emacs-22.3-r3.ebuild 7833 RMD160 c9f82bfcff4c7408ee5f579f43ab9a3f7d56bdec SHA1 0f7e8ed4eae680ef56306ce6eb372113a3d8cb27 SHA256 c193c8947ba893368dbf06c9781d8d466b434854c42f37e0028c3577734c2bcb EBUILD emacs-22.3-r4.ebuild 7879 RMD160 f2d9b97992505588fbb17a3fde088132a79b54fc SHA1 88d9f5b6f04129fa179e4a4be5d53c8f999b88cf SHA256 4d96c24e76b159ebcb21695431b9a259bb3dcc9300166eb61098f16410d0d759 EBUILD emacs-23.1-r2.ebuild 9712 RMD160 be850522adf821e720b9539012b2fe0987d11170 SHA1 93e835258d58542e9f9e3610a2c1cab623d7477a SHA256 7d5a09f53e1f3dfee51885e9feb32235421df5bac033528b24f1339a3faa44a3 -EBUILD emacs-23.1-r3.ebuild 9768 RMD160 cd461c2abca69e6449236e20555caa3d9de305c6 SHA1 3b7979d17cc1c60853d6cb05f4dba61d3d0da095 SHA256 1a7d8f1cc1a5b339fe4ab2e91473f948fc6d64ae05381131f1274bba9c256819 -MISC ChangeLog 53208 RMD160 205c7f89561ed92bf959922cc8258e88ae25c19a SHA1 0f165642050caac411bc714a76e751abb421c7cd SHA256 49cb5bbb45d2ca6937a3303efb953698be5844b73c34860fa02f79d1d8f95da3 -MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7 +EBUILD emacs-23.1-r3.ebuild 9733 RMD160 04b68994e03699d738454b0224b332316af52a97 SHA1 0736ee582c7090ec34b3c0cbaa5ed84a8f9af3b9 SHA256 9ad475df8581b260ced2fd6d88ea305370e346bae89abaf3c02daeeb6d828014 +EBUILD emacs-23.2.ebuild 9795 RMD160 1f57901d1d0a4e5084a7ed4627c51db70550a553 SHA1 60fa96011c26933df98c4e925b043824449e6a52 SHA256 927d39edc4914438038e217b2d6f69c9d7bc38a9e2f336a995da92a6447439c1 +MISC ChangeLog 53466 RMD160 053c4bc38fa7311a16d5a7bef6207054147c7811 SHA1 e96e619282d5a6e1faff53bde170a31f860a0c85 SHA256 0d60bf27fd573e5f2285f73afb7b5d423e34a5d6f3afbfa4702bfb6096f9fdb2 +MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkvlEmMACgkQOeoy/oIi7uyM/ACfY6Rpl2OAObnWeFX50m+CFjM0 +VucAn3/mA09ez7eJ20C93RnslzZh3vDh +=zI4m +-----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-23.1-r3.ebuild b/app-editors/emacs/emacs-23.1-r3.ebuild index 485c8e2aaa42..a0f73b4cf63b 100644 --- a/app-editors/emacs/emacs-23.1-r3.ebuild +++ b/app-editors/emacs/emacs-23.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.7 2010/05/07 05:57:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.8 2010/05/08 07:26:28 ulm Exp $ EAPI=2 @@ -34,9 +34,7 @@ KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-f 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="!=app-editors/emacs-vcs-23.0* - !=app-editors/emacs-vcs-23.1.9999 - sys-libs/ncurses +RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) @@ -75,6 +73,7 @@ DEPEND="${RDEPEND} gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} + !=app-emacs/emacs-common-gentoo-1[X?]" EMACS_SUFFIX="emacs-${SLOT}" diff --git a/app-editors/emacs/emacs-23.2.ebuild b/app-editors/emacs/emacs-23.2.ebuild new file mode 100644 index 000000000000..18691fc9ad31 --- /dev/null +++ b/app-editors/emacs/emacs-23.2.ebuild @@ -0,0 +1,313 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2.ebuild,v 1.1 2010/05/08 07:26:28 ulm Exp $ + +EAPI=2 + +inherit autotools elisp-common eutils flag-o-matic + +if [ "${PV##*.}" = "9999" ]; then + inherit bzr + EMACS_BRANCH="emacs-23" + EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/" + EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" + SRC_URI="" +else + SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 + mirror://gentoo/${P}-patches-1.tar.bz2" + # 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="23" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="alsa 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" +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? ( media-libs/jpeg:0 ) + 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 branch: ${EMACS_BRANCH}" + einfo "Emacs version number: ${FULL_VERSION}" + [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ + || die "Upstream version number changed to ${FULL_VERSION}" + echo + else + EPATCH_SUFFIX=patch epatch + 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 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 + 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//' >"${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} "/usr/share/emacs/${FULL_VERSION}/src") + X (let ((path (getenv "INFOPATH")) + X (dir "/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`/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 || 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 +} + +pkg_postinst() { + local f + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + [ -e "${f}" ] || touch "${f}" + done + chown games:games "${ROOT}"/var/lib/games/emacs + + elisp-site-regen + emacs-infodir-rebuild + 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 + emacs-infodir-rebuild + eselect emacs update ifunset +} diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 74e0827dd067..efef7c8c0274 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -20,6 +20,8 @@ available separately. + Use gnome-base/gconf to read the system + font name Compress bundled Emacs Lisp source Enable support for net-dns/hesiod Add support for Emacs input methods -- 2.26.2