New snapshot of trunk. Remove old.
authorUlrich Müller <ulm@gentoo.org>
Sun, 1 Mar 2015 10:29:11 +0000 (10:29 +0000)
committerUlrich Müller <ulm@gentoo.org>
Sun, 1 Mar 2015 10:29:11 +0000 (10:29 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

app-editors/emacs-vcs/ChangeLog
app-editors/emacs-vcs/Manifest
app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild [deleted file]
app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150228.ebuild [moved from app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild with 98% similarity]

index 4aeb891d2401e6c7dcab13deef293e68ac1c7e03..8fbcc3f46b46cb4a382bc951e1d559d04829c5c0 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.187 2015/02/28 20:48:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.188 2015/03/01 10:28:58 ulm Exp $
+
+*emacs-vcs-25.0.50_pre20150228 (01 Mar 2015)
+
+  01 Mar 2015; Ulrich Müller <ulm@gentoo.org>
+  -emacs-vcs-25.0.50_pre20141110.ebuild, -emacs-vcs-25.0.50_pre20141231.ebuild,
+  +emacs-vcs-25.0.50_pre20150228.ebuild:
+  New snapshot of trunk. Remove old.
 
   28 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.90-r1.ebuild,
   emacs-vcs-25.0.50_pre20150131.ebuild, emacs-vcs-25.0.9999-r1.ebuild:
index fd3e1eea2701fa4488ca53fb94fa540029968ea4..27f0c6ddd9fccac2870977bf9140b0e50b05514d 100644 (file)
@@ -3,28 +3,26 @@ Hash: SHA256
 
 DIST emacs-24.4-patches-4.tar.xz 4652 SHA256 8b97fe775ed120df42e6f3afbe3ce503c0fedd8957caa759649323ac340f2922 SHA512 b8f8aea92472b5c074fc4cb2198b329e7b0496a70ba04d76eea4f420e398f3882b89d848020750659f60828217ea3155f4d53078edc8dc715b2946b8a239157a WHIRLPOOL e5e92ce3fba0e62ba3135e89ab8de9b6196f9a342048dbe679e06c3530a305311a1b300b72abdee50416d989cb55ca053ea1e0b259e63cc56260bfd58d43894a
 DIST emacs-24.4.90.tar.xz 39752368 SHA256 cec2204ec0134dfac9987dde3aff95e4a02538d4ce63e8d7c55b6a409aa04b36 SHA512 c7fe2ab40b1a28a97342753afb7fd5c24751ad51a144c723c6c1be517b81006b4641f1f4e833b8424ac00107992934f4e4520dd7aa92074e44ab98a148a17eed WHIRLPOOL b20c133381617f15ee2babca36164a104f18da0f38ae310db4cbc539fa988832a4b7d78acc0e023e4b8c92a877decbce44d45028c8b8ecee708c092dfe27e39d
-DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668
-DIST emacs-25.0.50_pre20141231.tar.xz 24688612 SHA256 15bc6b8e1923bb6c1e18e3a8d89652c6594d72fbd1e3c15898ab9df03d19ad77 SHA512 b544f3530c707927c8ef4614b0804505e6cb32d8d6cef45f7aff56f67d632906d447d381a374ef37c6c46660cba1bb53dc7adead308bd902951abcc475593c75 WHIRLPOOL 0f373c4ef413a88e91e41b707686413a93661121453f3a80bff1cba75a17271dd30cd8dc64037487d2dcb2e3f4681af3bc989668c931b006a1bb2742eb5a9d5b
 DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a
+DIST emacs-25.0.50_pre20150228.tar.xz 24749116 SHA256 8e442cbb27e0b39aee9ebcd981512870a7030ecdd4f7941c3ea43dfbb0635635 SHA512 a9f3f3fe5bb2d662c06317c630af40c48b47b33f5cfdbc2a3fa592ac27cb9b9e1c91524326def931b931fc4a35056bac45b7836e24e550088965783dad2c3188 WHIRLPOOL 9349f8f94873a2addc75af295852434a6609bc88f2acb9ef45b24947a8d5f2b058b2e3a0d461eb2ce34816b4895225fdbd939c4ed366608949ca13c354a74185
 EBUILD emacs-vcs-24.4.90-r1.ebuild 11527 SHA256 af9d6a9607e4bce9eddd909ed0ff1fe2a3e274aa55f0daef6600f324b77c53ef SHA512 7ca61abd79446fad970deec4779bcf153c9e10b1f28f5f19156b24913aae6074a507da069d1e997a4b141b2dbf60b0479b3ea47cd7427eb775eb2ac82213c335 WHIRLPOOL a30bd9527d65df834e21739c75b5ca21e387904931d0b6cf444f4e6e2caf5cb44cfa3c04ab73c67369f41a93967614cd0f0e48cafda34b0e945809c724e8db09
 EBUILD emacs-vcs-24.4.9999-r2.ebuild 11456 SHA256 d506a7c926f276a4c1da9b3370b9819e1a98b36c10f1212b68224638c5babb12 SHA512 1e7f6541525d6f794f5f65f2eee3b035b08b664ac2d03ecd80fb09f1bb0399caca4c192fd0396159fe0616548954aa48839daa5dbe0ca212c557fcfe84ae4b9a WHIRLPOOL e6f8a303aad8c2874b795e1ac9510389b9fdcc7b74caf9db803f9c8838b4322573fb67a42f9b972b4dce04eecf1656de429f39a2fb48d78011b530bb833285ef
-EBUILD emacs-vcs-25.0.50_pre20141110.ebuild 11646 SHA256 f15d77e96a3e2a6fc89232bab924c48e500c1b4915dab9d2008aff5f041dc7b1 SHA512 7862776776d9eac9140b46986784004b947138bb644349cd43513111abab2316f1f1eb1085c46423605cd342a57081e4514897dae3e0e93fab4aa6e86710285f WHIRLPOOL 83cecd399eba34c71ea127b3dbfb417cc2e3204304fe8f90f506fd4b79708d773569feefabc339f4d70c4de8bd207c77eb1144f36d0a92c92c580e7112ca8c71
-EBUILD emacs-vcs-25.0.50_pre20141231.ebuild 11480 SHA256 b3fb6853c5582c0169628bd1b1170f7cec437c71d58579efc8daf526bce290f8 SHA512 e7cf64c2ecd757d88689996a047a0297732e2c7970bcc08342dadb58a6bc0244cfde587f4b78018db2d5d17a9a2a13ad68ba7e6a89fb76b276aff0f541608693 WHIRLPOOL cf3cdd3d45155c49330820f47235a3ccdda1a71c432afad960bcb612d8f75a61a2526ee641346cb50c93cd425e3754c607d2975950264f033c039e10d99d326c
 EBUILD emacs-vcs-25.0.50_pre20150131.ebuild 11462 SHA256 d694f7c745e4fe0bcbd32a2ed2bcd390493db3c84387ad58ac6d1a0bda3b5c72 SHA512 76bccb3cbf8a1d2339011d4f5a5b973c388c823d2372731ce3d067b904accd645ab8d05f03041cf609c647375544f06afd2405ba62e1193ca008c1207df8e567 WHIRLPOOL 9d4b6581f030958af6d849242d3dcbe5c9f3bab5544c93874a50fff3ba618cffd460a27eec435da16071df167741afd99796694c98b1c34dd0edccc3b3c3f535
+EBUILD emacs-vcs-25.0.50_pre20150228.ebuild 11462 SHA256 a825ead7b98aeab6b375153e5c6358668307a3b08785d03d6f06174302529ac0 SHA512 63ccdb4ce9105d39576e9a649c7eabec3276a74721417fa3236f67d368129c3bcc5acb9ffbdaa8de008ff2aefe914dd187ae2f304ff863386e411bbd26a61b02 WHIRLPOOL fdc0d15de1d63a7f95bc8aba8ac6cfc0475735172bb9e73f51db12239c0d9f4083a39630624d782053d9eb95c45aca840af62ab5f2eba9b2030d848e2e805b63
 EBUILD emacs-vcs-25.0.9999-r1.ebuild 11455 SHA256 9bcc9c4a9a8b6a10e98ec4a86a473ba40d25d33db98e27f1f12d2ec3b0655823 SHA512 9e1b3124fe5d95b96d249ff72153a4f49fc36fda3b846d5498ebe03253227aea2cc84cc46a66427ba3b9e1fd9f465847d47bc541a8aa35b60cfdaeb7c38d4536 WHIRLPOOL 23b7a8fccef2599aac210d6efd970f6d652d414885ab86537414c146298cc77036c0c892202123a64b56835948c40a437db71c402b199725c5dc5e16e74a57a3
-MISC ChangeLog 83574 SHA256 920074e648bc0d177a3313e19c2c771159d8cc38de054d3b320037850888ef9d SHA512 07ab06e29160f7c4697ef8b074a8bb28bcfa227603f0f9aed45f38a17d9ff7dfd831f2a8764553505827eb7e7503475d557932cc007e332e20e8a85d976ce82d WHIRLPOOL 3c2b7bac5997acdf614e8faf86ba29376b6a22b257c56803bee10e138c6df82e801c7aadb3b1fba16c1617a6e1bb41077ebac4acbc5bcd8df9a8ff342ccc8afb
+MISC ChangeLog 83826 SHA256 253ce54a77d833e0c265733e4954a2388c65a8d427297914cab9bee5010a4771 SHA512 c241ce0f94488918b4d8a364ee07924f7b3e58540966383fcff3002f46162fda98eecf61200d3f01a68a9251f6ec656162c3bcb56826020e5e4c144f799bb3f9 WHIRLPOOL 8e31d56296a69db57b126d81bae3ff7848e2390a4aa066a5fede3b344f28927f9e09ba9df5ba79ea6e8353a5c898f4743b1b8b002b2dac5195fee5a4c8defe56
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJU8imcAAoJEJQzkH1pP7W4DEwL/1hn5t+6OsjEHeLzVWsf+f9J
-4sdxMpPyadnfwaG+7RKzyHitlKQ26P14rePYrghPZulyHKw7SYvKGxAFNAlApqoX
-g1S3JMtQgwGLgUOo0S0dvvf9YSzyToDb2NofkFfbiw7dkJfGLAzCoASJkwQgPS0r
-56vrkid8Rj0xl9dTyTvgmVcAtNV+Hr8dmoXuWgTkAhS3Csi8i6ChAoxpgEPxStGf
-FLHd9Cez6+VS1Dz+fEuwCpypqA+HAr2UjTzeNK9GgHmE/kLz5FQixa8iqjIrydzy
-2Fastnw6S80lZslRvblsjFxL625z6nuMTeXYU4gsu1ghuxgMuLvjMMMaaGWAzrbR
-c2QqE9t/00vttqbIWVXm0JbZL71hV2KynNp2fjI3Sz8KT2FZMSa73EzdbG2y3Zwm
-K83Zbegl+wrFBst++rpgFrTm+0sSUW1eKrN9sEgV+FI6z44ulMCdi2N8jX5DjwtA
-ZzYjHwPVc3hJKN0wTB1SQctQlT5hvraSpyDgcEqfMw==
-=JYtN
+iQGcBAEBCAAGBQJU8un2AAoJEJQzkH1pP7W4gZsL/iXs7sgv+BiEHorzfwlWCyy4
+01AqzJEoIY7PmWBCBgrANO0jONEEsOyfUNO/ml43zQiXJu6V8j7/wbxWZzJPA3th
+v/RAwh1Q575BBrqHLH2+dXCFKyhpyna5I3uiZTGSA2mUMuR27+tEzBKNtXMGzLs2
+6lRRxDMDVY/iqhlAH0oVPBqv56RpPjX88nJsv4OFrALcTd3IhxdXMBzDtTAsRokn
+D+5YF6SYGsdgMsYJhRGdJcdiDQ30aAggH7f2eSn1D1nEXlTW5r70vEYYiqQKqp/h
+lUJutTg2qNrG1MlJqERddrVHVN1PPp6p5KKwqg+T8BMVvMZjE9cLdsczZjvZXsRi
+ckJFsPmCoXUs5vaqbkXLanJIdTXtA+XLFlLnJApD3KXcmtuU4RfGxWL0kb/oJjoE
+ANtAn6vahKj8TOeKHVyzCXg/h60QnwMF7piyH50qa+ZuWgu99CGuXylZAkLrOz4B
+6Pb+dZK4JGvPVUy9fxslfyVggX0xDIH/4p7jgdYyYQ==
+=D3Ay
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild
deleted file mode 100644 (file)
index 30ddafe..0000000
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.3 2015/02/17 08:23:32 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-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}"
-       EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-       EBZR_WORKDIR_CHECKOUT="t"       #434746
-       inherit bzr
-       S="${EBZR_UNPACK_DIR}"
-else
-       SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-               mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-       # 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}"
-       S="${WORKDIR}/emacs"
-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 HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.16
-       >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-       net-libs/liblockfile
-       acl? ( virtual/acl )
-       alsa? ( media-libs/alsa-lib )
-       dbus? ( sys-apps/dbus )
-       gfile? ( >=dev-libs/glib-2.28.6 )
-       gnutls? ( net-libs/gnutls )
-       gpm? ( sys-libs/gpm )
-       hesiod? ( net-dns/hesiod )
-       kerberos? ( virtual/krb5 )
-       libxml2? ( >=dev-libs/libxml2-2.2.0 )
-       selinux? ( sys-libs/libselinux )
-       zlib? ( sys-libs/zlib )
-       X? (
-               x11-libs/libXmu
-               x11-libs/libXt
-               x11-misc/xbitmaps
-               gconf? ( >=gnome-base/gconf-2.26.2 )
-               gsettings? ( >=dev-libs/glib-2.28.6 )
-               gif? ( media-libs/giflib )
-               jpeg? ( virtual/jpeg:0= )
-               png? ( >=media-libs/libpng-1.4:0= )
-               svg? ( >=gnome-base/librsvg-2.0 )
-               tiff? ( media-libs/tiff:0 )
-               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? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               Xaw3d? ( x11-libs/libXaw3d )
-                               !Xaw3d? ( athena? ( x11-libs/libXaw ) )
-                       )
-               )
-       )"
-
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       gzip-el? ( app-arch/gzip )
-       pax_kernel? (
-               sys-apps/attr
-               sys-apps/paxctl
-       )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-       DEPEND="${DEPEND}
-       sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-       if [[ ${PV##*.} = 9999 ]]; then
-               FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-                       configure.ac)
-               [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-               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}"
-       fi
-
-       epatch_user
-
-       # Fix filename reference in redirected man page
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -pie                                       #526948
-
-       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; then
-               use sound || ewarn \
-                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-               myconf+=" --with-sound=alsa"
-       else
-               myconf+=" --with-sound=$(usex sound oss)"
-       fi
-
-       if use X; then
-               myconf+=" --with-x --without-ns"
-               myconf+=" $(use_with gconf)"
-               myconf+=" $(use_with gsettings)"
-               myconf+=" $(use_with toolkit-scroll-bars)"
-               myconf+=" $(use_with gif)"
-               myconf+=" $(use_with jpeg)"
-               myconf+=" $(use_with png)"
-               myconf+=" $(use_with svg rsvg)"
-               myconf+=" $(use_with tiff)"
-               myconf+=" $(use_with xpm)"
-               myconf+=" $(use_with imagemagick)"
-
-               if use xft; then
-                       myconf+=" --with-xft"
-                       myconf+=" $(use_with m17n-lib libotf)"
-                       myconf+=" $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf+=" --without-xft"
-                       myconf+=" --without-libotf --without-m17n-flt"
-                       use m17n-lib && ewarn \
-                               "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-               fi
-
-               local f
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-                       for f in motif Xaw3d athena; do
-                               use ${f} && ewarn \
-                                       "USE flag \"${f}\" has no effect if \"gtk\" is set."
-                       done
-               elif use motif; then
-                       einfo "Configuring to build with Motif toolkit"
-                       myconf+=" --with-x-toolkit=motif"
-                       for f in Xaw3d athena; do
-                               use ${f} && ewarn \
-                                       "USE flag \"${f}\" has no effect if \"motif\" is set."
-                       done
-               elif use athena || use Xaw3d; then
-                       einfo "Configuring to build with Athena/Lucid toolkit"
-                       myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-               else
-                       einfo "Configuring to build with no toolkit"
-                       myconf+=" --with-x-toolkit=no"
-               fi
-       elif use aqua; then
-               einfo "Configuring to build with Nextstep (Cocoa) support"
-               myconf+=" --with-ns --disable-ns-self-contained"
-               myconf+=" --without-x"
-       else
-               myconf+=" --without-x --without-ns"
-       fi
-
-       # Save version information in the Emacs binary. It will be available
-       # in variable "system-configuration-options".
-       myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-       if [[ ${PV##*.} = 9999 ]]; then
-               myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-       fi
-
-       econf \
-               --program-suffix="-${EMACS_SUFFIX}" \
-               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-               --localstatedir="${EPREFIX}"/var \
-               --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-               --with-gameuser="${GAMES_USER_DED:-games}" \
-               --without-compress-install \
-               --with-file-notification=$(usev gfile || usev inotify || echo no) \
-               $(use_enable acl) \
-               $(use_with dbus) \
-               $(use_with gnutls) \
-               $(use_with gpm) \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               $(use_with libxml2 xml2) \
-               $(use_with selinux) \
-               $(use_with wide-int) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       emake
-}
-
-src_install () {
-       emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-       mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-               || die "moving emacs executable failed"
-       mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-               || die "moving emacs man page failed"
-
-       # 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/{appdata,applications,icons}
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       # remove COPYING file (except for etc/COPYING used by describe-copying)
-       rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-       if use gzip-el; then
-               # compress .el files when a corresponding .elc exists
-               find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-                       -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-               assert "gzip .el failed"
-       fi
-
-       local cdir
-       if use source; then
-               cdir="/usr/share/emacs/${FULL_VERSION}/src"
-               insinto "${cdir}"
-               # This is not meant to install all the source -- just the
-               # C source you might find via find-function
-               doins src/*.{c,h,m}
-       elif has installsources ${FEATURES}; then
-               cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-       fi
-
-       sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-       X
-       ;;; ${PN}-${SLOT} site-lisp configuration
-       X
-       (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-       Y  (setq find-function-C-source-directory
-       Y       "${EPREFIX}${cdir}")
-       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
-       fi
-
-       DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-               through the Emacs eselect module, which also redirects man and info
-               pages. Therefore, several Emacs versions can be installed at the
-               same time. \"man emacs.eselect\" for details.
-               \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-               strongly recommended that you use app-admin/emacs-updater to rebuild
-               all byte-compiled elisp files of the installed Emacs packages."
-       use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-               Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-               machine would satisfy basic Emacs requirements under X11.
-               See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-               for how to enable anti-aliased fonts."
-       use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-               \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-               it into /Applications by yourself."
-       readme.gentoo_create_doc
-}
-
-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"
-       elif [[ -d "${ED}"${infodir} ]]; then
-               # 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() {
-       elisp-site-regen
-
-       local pvr
-       for pvr in ${REPLACING_VERSIONS}; do
-               [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-       done
-       readme.gentoo_print_elog
-
-       if use livecd; then
-               # force an update of the emacs symlink for the livecd/dvd,
-               # because some microemacs packages set it with USE=livecd
-               eselect emacs update
-       elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-               # refresh symlinks in case any installed files have changed
-               eselect emacs set ${EMACS_SUFFIX}
-       else
-               eselect emacs update ifunset
-       fi
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}
similarity index 98%
rename from app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150228.ebuild
index bb4deb0f1141aee8f8d0976728b753a1f164356a..afcda7cb8f44cb34bdae1ef84004e925406c2601 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150228.ebuild,v 1.1 2015/03/01 10:28:58 ulm Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
        >=app-admin/eselect-emacs-1.16
-       >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+       >=app-emacs/emacs-common-gentoo-1.5[games?,X?]
        net-libs/liblockfile
        acl? ( virtual/acl )
        alsa? ( media-libs/alsa-lib )
@@ -207,7 +207,7 @@ src_configure() {
                --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
                --localstatedir="${EPREFIX}"/var \
                --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-               --with-gameuser="${GAMES_USER_DED:-games}" \
+               --with-gameuser=":gamestat" \
                --without-compress-install \
                --with-file-notification=$(usev gfile || usev inotify || echo no) \
                $(use_enable acl) \