New pretest version. Remove old.
authorUlrich Müller <ulm@gentoo.org>
Tue, 4 May 2010 07:59:43 +0000 (07:59 +0000)
committerUlrich Müller <ulm@gentoo.org>
Tue, 4 May 2010 07:59:43 +0000 (07:59 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

app-editors/emacs-vcs/ChangeLog
app-editors/emacs-vcs/Manifest
app-editors/emacs-vcs/emacs-vcs-23.1.93.ebuild [deleted file]
app-editors/emacs-vcs/emacs-vcs-23.1.97.ebuild [moved from app-editors/emacs-vcs/emacs-vcs-23.1.94.ebuild with 98% similarity]

index e4382b1b2bbe3bb0114ada707ef250b71bcf379d..cea4acabd3a6631f4cb2c5068906402d66edbe2d 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.16 2010/05/01 15:16:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.17 2010/05/04 07:59:43 ulm Exp $
+
+*emacs-vcs-23.1.97 (04 May 2010)
+
+  04 May 2010; Ulrich Mueller <ulm@gentoo.org> -emacs-vcs-23.1.93.ebuild,
+  -emacs-vcs-23.1.94.ebuild, +emacs-vcs-23.1.97.ebuild:
+  New (upstream says final) pretest for Emacs 23.2. Remove old.
 
   01 May 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.1.95.ebuild,
   emacs-vcs-23.1.96.ebuild, emacs-vcs-23.1.9999-r3.ebuild,
index cf05f148dac669f2c7cc86896b0a2da61d10c961..dd5fd3025d30f1c4fe994dbd78574c87b80e15eb 100644 (file)
@@ -1,12 +1,20 @@
-DIST emacs-23.1.93.tar.gz 46419368 RMD160 7a6e55bb297361f3f7fd9b580896bb5d5d466170 SHA1 4d31cbea36c1f7ec404ad587ed801ae067238f33 SHA256 7b6f3dfdfa4202ba32deae82c744fb4791564cb762557d635c0e304404a5e23e
-DIST emacs-23.1.94.tar.gz 46816889 RMD160 6554eb9f3894b162afc05cc1e521e1502e7b0798 SHA1 6622b10cc1b2af9b3b4945b82a2c33f5392ef12d SHA256 35cf4ff3f382acce70fa8ede02ff2193aa00c1179a8d1416a1aa33f42faa3f95
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST emacs-23.1.95.tar.gz 46833045 RMD160 d05a16e2e7f7b1128afad02dd64edd755bed31da SHA1 337a69557efd7442b8facdf39b407b419ff57ce1 SHA256 765c08f3cae88e41832ff076012367f6184107a07a995249b37cd87f136861e8
 DIST emacs-23.1.96.tar.gz 46829092 RMD160 6ec849d82a2f75377d91140a2791672d6e73ffb7 SHA1 6736a9bb507a8dd32c20fb8c3828bbcd9a29ecc2 SHA256 c1f96dddf3ae043d116b101b6b57ed6b44fad6a1e7addb100fd81e41ce7984e1
-EBUILD emacs-vcs-23.1.93.ebuild 9733 RMD160 0121716962cc60dbcedba1c1d44240286c193887 SHA1 b233915bbe05303b58b5c40ece2a50c5a7d98f5d SHA256 9d1754a23fe2a2d884979c6b4523ca852c4fbe5a1466b450807b90546eb31d26
-EBUILD emacs-vcs-23.1.94.ebuild 9743 RMD160 cd1051ea79237db93758b91dd5aa9d92ba112f77 SHA1 fa86148bf68dc86cdb5b580d2af5638e6504c18e SHA256 6052b4ce39ac5f7b9bba6b45a76a35cbf48e040657c8da1ea1b6b04f0839a82f
+DIST emacs-23.1.97.tar.gz 46829080 RMD160 6fdf6a1552e701a0a7697fa8a112e256967447e1 SHA1 0ab25186f5fc46cb9e70020a42be7c23a55f0ffc SHA256 daf3ed9654eed3be5dda6f0bdf6d8748214d5f3896d749ef8988a03664e76a08
 EBUILD emacs-vcs-23.1.95.ebuild 9792 RMD160 c09ad7fff174b8bb98d1be435bd79cecde80c0a8 SHA1 9f37df80dc82633425fde42673f54a7bde960d4e SHA256 45b2941bd52c449d57ca84131f956b521117b9693b8b262a55616b7889d290ed
 EBUILD emacs-vcs-23.1.96.ebuild 9792 RMD160 404e6813964a633d524da9990259594b9541ca0b SHA1 38e0db524bb75580174bb787d38c3ca7a23f8633 SHA256 494d3017a5baa6399579697749bd619a484c19bf1198421db144840cbbc4a51b
+EBUILD emacs-vcs-23.1.97.ebuild 9792 RMD160 8b201f49d2377971a2884f71c8f53d9439f88cf7 SHA1 48f29ef563703d60bc601952851e3d70da229200 SHA256 7152ffb34c0861276ec7464610aa2c4c35413837ab3680b0175df7817866a3ac
 EBUILD emacs-vcs-23.1.9999-r3.ebuild 9785 RMD160 799a3ba27238898561c0c682167ef0d9bfcc5ed9 SHA1 d2a7ad84a50d13a265d96bcf04894d0b6cd7bcc2 SHA256 1c4127bbee917b3b7167cfbe4bcc4d7f0650325fe8964ac9acbefd89a908f35f
 EBUILD emacs-vcs-24.0.9999.ebuild 10037 RMD160 ef08b8a29131ba88aea50fe02487a39deeb63b29 SHA1 2e600845faa4bdd286b7be93b777a760b1029bfb SHA256 e8a038f5543b00c17183ca30dfc984d39cbeb115ea6590f319358f099640130b
-MISC ChangeLog 51844 RMD160 320dd8eb1305ccabf5b6e3b32cbf6d4d7c6e8565 SHA1 a5977f117d0f15caff5c44c464becb2f0ffa8dfa SHA256 c5c64deee4369b79f742ee42d2ef1f76988b55171115466ae478d3f3b79b3eb2
+MISC ChangeLog 52073 RMD160 cbe11f3de9059afd9926e2be1a59aeb3670d62c4 SHA1 19b7fb6199fdc7122b092bbc8225b17f6be1966d SHA256 6d508e50edcce2ec92ee19e48c599d4e8f2084bf2f3c79cc7a456f5e82fddf26
 MISC metadata.xml 1622 RMD160 01a46ab0aebc8acab07a5a874736783791b75c4e SHA1 c2869923f6e835df175a9a6f0d803170bf98fd85 SHA256 7875ea72b5aa0e9dd526c88692c08a3e1598e563d8e2d27e336fd1d5d707cb5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvf1AMACgkQOeoy/oIi7uwRQwCgvNmxRGu1vy2nfcRX5B5XHaQE
+kh0AoMiGEWi2CjIdH1bjcyi+5d+Kc9RL
+=qpkb
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.1.93.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.1.93.ebuild
deleted file mode 100644 (file)
index b62935b..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.93.ebuild,v 1.1 2010/02/27 07:06:01 ulm Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic
-
-if [ "${PV##*.}" = "9999" ]; then
-       inherit bzr
-       EMACS_BRANCH="trunk"
-       EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/"
-       EBZR_CACHE_DIR="emacs-${EMACS_BRANCH}"
-       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="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}-vcs"
-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//' >"${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 "${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
-
-       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
-}
similarity index 98%
rename from app-editors/emacs-vcs/emacs-vcs-23.1.94.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-23.1.97.ebuild
index 84170108d85f9b70aea5738e3b0dc36469b17cb0..e134c82f82825aaa322bf0b470a5a0331dced9d6 100644 (file)
@@ -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-vcs/emacs-vcs-23.1.94.ebuild,v 1.1 2010/03/11 16:40:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.97.ebuild,v 1.1 2010/05/04 07:59:43 ulm Exp $
 
 EAPI=2
 
@@ -279,6 +279,7 @@ pkg_postinst() {
        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