New pretest version.
authorUlrich Müller <ulm@gentoo.org>
Thu, 1 Dec 2011 07:54:38 +0000 (07:54 +0000)
committerUlrich Müller <ulm@gentoo.org>
Thu, 1 Dec 2011 07:54:38 +0000 (07:54 +0000)
Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

app-editors/emacs-vcs/ChangeLog
app-editors/emacs-vcs/Manifest
app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild [new file with mode: 0644]

index 298e94b35cf403b8985c318da9201a1f06a289d9..59bf2441f071608df72d37bca0375353ad79c718 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.68 2011/11/28 11:07:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.69 2011/12/01 07:54:38 ulm Exp $
+
+*emacs-vcs-24.0.92 (01 Dec 2011)
+
+  01 Dec 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-vcs-24.0.92.ebuild:
+  New pretest version.
 
   28 Nov 2011; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Update longdescription.
index bc560a08d9330ed512ac297a6c1d0f3a59a1750b..73b6bbc9ddd4b51619a7b451fa3128a2ea6f6f34 100644 (file)
@@ -3,16 +3,18 @@ Hash: SHA1
 
 DIST emacs-24.0.90.tar.gz 50961184 RMD160 aa7f7997240f5b9db2979e0ba25ac762f796711b SHA1 a37880965d1763215bae935f1f28dd9e6505dd8c SHA256 629ca66cfa529a783a9e372e010a8b8d8b3d65e1e5105ef94f1621a403b9cb83
 DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe
+DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f
 EBUILD emacs-vcs-23.3.9999.ebuild 10908 RMD160 a7f4a6432e6a8a951816acd8590a309bb6c5080e SHA1 fc0be729616dba48286cdb60fa88fc9757170757 SHA256 28518fd0986dcaee87d961ad3b996c7dc7d28f93fffbec3275902ae42f7d48aa
 EBUILD emacs-vcs-24.0.90.ebuild 10938 RMD160 2365702c56ed715def9c2292e28957664445f13d SHA1 6503983bdb8dbfa391f4d5043699cf4224458311 SHA256 1043ef192f565778445d7abfbc511251f5c97914b9e68cefaf6ea2c4b4129f53
 EBUILD emacs-vcs-24.0.91.ebuild 10624 RMD160 e16057279741ef65b57c82a0930359b9d354759a SHA1 ebc8d0ef376e4c808615f12b3fffd66d0af15ad1 SHA256 9bc0bac03d6c7557f43be2455274891423fa241fec0695f92a91e986052493c9
+EBUILD emacs-vcs-24.0.92.ebuild 10624 RMD160 695333260127a1953de772743e05161391f582c7 SHA1 3c4592015213cf87bfc2829b5bd46261690a0382 SHA256 27fbfefc65a9c333acc4ec614d2f922458e62380d927a9ce02a468fa2380d3f0
 EBUILD emacs-vcs-24.0.9999-r1.ebuild 10630 RMD160 45a53dd2bba49ede4cb3a1033bbd1d9a788af151 SHA1 4c407f87852fec6ebce5587b76e2d8f4678cf93c SHA256 ac77d42a7add721f019fb64d6deb167e73f9117d14120d1d35df80c43eeef1d5
-MISC ChangeLog 60824 RMD160 0034fb22d4b1d80c0ab23618eee34494db5a1950 SHA1 6e603518b6cefb868acc1fdbeae060ec22f6d18c SHA256 fe83c2dcbad4c4d8305cd1c79b91a3edcd43fd7586fb21027798065501a90168
+MISC ChangeLog 60956 RMD160 500e96ff274d4683aef3a2fd67f9a37ef9f0aa0b SHA1 ae988f8caa0f988d301d445744686af22c04adea SHA256 e424189ad5d327bc85fc816ccbdec4af147d49c756826ce429ac46328d5af600
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7TbZoACgkQOeoy/oIi7uzkSwCeM3DIbIzFrY+EV5Jre2Fzkvac
-vF4An2liwno873/n6h7QCPiAYiESD/Hq
-=O0pi
+iEYEARECAAYFAk7XNQkACgkQOeoy/oIi7uwbsQCfQEg+8d91Re1LJtS8l7/9jND/
+UFYAn1CP8VQLKPvRqyJaofGPz6xb+Zkr
+=fBtx
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
new file mode 100644 (file)
index 0000000..fdda60f
--- /dev/null
@@ -0,0 +1,335 @@
+# 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.92.ebuild,v 1.1 2011/12/01 07:54:38 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 )
+       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 )
+               libxml2? ( >=dev-libs/libxml2-2.2.0 )
+               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}
+       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=$(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 "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
+               einfo "Emacs version number: ${FULL_VERSION}"
+               [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+                       || die "Upstream version number changed to ${FULL_VERSION}"
+               echo
+       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
+               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 gsettings)"
+               myconf="${myconf} $(use_with libxml2 xml2)"
+               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)"
+               elif use Xaw3d || use athena; then
+                       einfo "Configuring to build with Athena/Lucid toolkit"
+                       myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d 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
+
+               local f tk=
+               for f in gtk Xaw3d athena 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
+
+       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} \
+               --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
+       # 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
+
+       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
+       mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
+               || die "moving info dir failed"
+}
+
+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
+}