Upstream repository has been branched for the 23.2 release.
authorUlrich Müller <ulm@gentoo.org>
Wed, 10 Mar 2010 08:18:58 +0000 (08:18 +0000)
committerUlrich Müller <ulm@gentoo.org>
Wed, 10 Mar 2010 08:18:58 +0000 (08:18 +0000)
Package-Manager: portage-2.2_rc66/cvs/Linux i686

app-editors/emacs-vcs/ChangeLog
app-editors/emacs-vcs/Manifest
app-editors/emacs-vcs/emacs-vcs-23.1.9999-r3.ebuild [new file with mode: 0644]
app-editors/emacs-vcs/emacs-vcs-23.1.9999-r50.ebuild [moved from app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild with 98% similarity]

index a2cb6b8af5136d2d7415fd81baa17f6b9e0993d5..967c3ff0d33adecbe215f6a15ba54b5850b68343 100644 (file)
@@ -1,6 +1,15 @@
 # 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.9 2010/02/27 07:06:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.10 2010/03/10 08:18:58 ulm Exp $
+
+*emacs-vcs-23.1.9999-r50 (10 Mar 2010)
+*emacs-vcs-23.1.9999-r3 (10 Mar 2010)
+
+  10 Mar 2010; Ulrich Mueller <ulm@gentoo.org>
+  -emacs-vcs-23.1.9999-r2.ebuild, +emacs-vcs-23.1.9999-r3.ebuild,
+  +emacs-vcs-23.1.9999-r50.ebuild:
+  Upstream repository has been branched for the 23.2 release. 23.1.9999-r3 is
+  the live ebuild for the emacs-23 branch, 23.1.9999-r50 for the trunk.
 
 *emacs-vcs-23.1.93 (26 Feb 2010)
 
index 97be8cbb512feeaf892d0def9aded5637bad77ab..8b0041a5d1ea70b0231b05ceda4b2b570a73771f 100644 (file)
@@ -9,13 +9,14 @@ EBUILD emacs-vcs-23.1.90-r1.ebuild 9736 RMD160 91836e958e137c009b085601d72b36f8e
 EBUILD emacs-vcs-23.1.91.ebuild 9733 RMD160 9373de40a567a6b88a0367447cab4b09a56e7786 SHA1 fea9bde12d3346f3d6fe2b2d02266fb3261d960e SHA256 d1ca2bba9830efb1a074c666853e6b24f491eb83488cf79244823671e8e6b7c3
 EBUILD emacs-vcs-23.1.92.ebuild 9733 RMD160 f16dca432cfee383194e468e5a7706471d5d301b SHA1 c0e9f26960fe1886c4e7dc98d09896a738c01555 SHA256 ed3f4fcf81a40c8cfedf83951bafea5d20ebae68f1ca141a4eb9bbc982906f13
 EBUILD emacs-vcs-23.1.93.ebuild 9733 RMD160 0121716962cc60dbcedba1c1d44240286c193887 SHA1 b233915bbe05303b58b5c40ece2a50c5a7d98f5d SHA256 9d1754a23fe2a2d884979c6b4523ca852c4fbe5a1466b450807b90546eb31d26
-EBUILD emacs-vcs-23.1.9999-r2.ebuild 9992 RMD160 bfa6315c72710ac336b9412dcbcb41327cfc4174 SHA1 5a06ed5c0f6000798d691f45c218ab80f6803c82 SHA256 6dd7d6d83f4547408d7396a22c7eaf9abe57989fdf52f6f589b08326c6badf94
-MISC ChangeLog 50371 RMD160 d2ded9a36dee68a5f36cf4c26f56162506465723 SHA1 874bc1e844ae0f6986b3748a3943ba6f7130133d SHA256 d6a8b37427f1099d329bcbfee4947e832744a70f33af0c98f587ba7c8db9d38e
+EBUILD emacs-vcs-23.1.9999-r3.ebuild 9736 RMD160 7dded29f58aec1c4bcaf048f6adb080fa2143976 SHA1 9faa6f0acd528390070e98f1797ce8b86762b7d1 SHA256 1ceca4bb1c3ffd6025b5fc86cbde99f03a8412b52f79a426a237117efcb8f70e
+EBUILD emacs-vcs-23.1.9999-r50.ebuild 9996 RMD160 b7511649ab51eecd0da1dccabe8245af01343078 SHA1 883ea854e42d1794610592c38f46f38393171e7c SHA256 1292920aff68d43d1ca8d5c5f1b84bdcf840f9045e360b98f1b006b4eefafdf1
+MISC ChangeLog 50749 RMD160 0d9efd42d2cb5e9d2838aa841ddbb19742d7731f SHA1 80486d1c85a8f01564c400095d61e49117fe1afb SHA256 5e91915e8daf637b81dae6e54ae3a8f57cd8b933fc846cd572bfd343290411b6
 MISC metadata.xml 1622 RMD160 01a46ab0aebc8acab07a5a874736783791b75c4e SHA1 c2869923f6e835df175a9a6f0d803170bf98fd85 SHA256 7875ea72b5aa0e9dd526c88692c08a3e1598e563d8e2d27e336fd1d5d707cb5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuIxG8ACgkQOeoy/oIi7uxk2QCgli63AOEpoIUbjl4tGj6obPmL
-l80AoNJ18hnJuIslHDr6ORJe4Sb+1cCu
-=zPIR
+iEYEARECAAYFAkuXVh4ACgkQOeoy/oIi7uzaCgCfTqQji4H8cXXHGp90Q9XqQaN4
+iysAn1MEjdjclaDZRYeiXRQEpPSRqfpW
+=/InH
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r3.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r3.ebuild
new file mode 100644 (file)
index 0000000..1f38c33
--- /dev/null
@@ -0,0 +1,311 @@
+# 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.9999-r3.ebuild,v 1.1 2010/03/10 08:18:58 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://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 ~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.9999-r2.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-23.1.9999-r50.ebuild
index 341e741e6259b4ab58aa8fc50b8b68654f5b42b4..94a27f9d514ef3f8f411bd5dc7cdd901306ba65b 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.9999-r2.ebuild,v 1.7 2010/02/13 18:24:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r50.ebuild,v 1.1 2010/03/10 08:18:58 ulm Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ 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}"
+       EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}"
        SRC_URI=""
 else
        SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz