commit: 7891db76b4914bfc7d5705fd66a4f96c950ece86 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Mon Jul 20 00:24:42 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Jul 20 00:26:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7891db76
app-editors/emacs: sync with tree version Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA app-editors/emacs/Manifest | 4 ++-- app-editors/emacs/emacs-24.4-r99.ebuild | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index a13576d..d12ade5 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -4,7 +4,7 @@ AUX emacs-24.4-configure.patch 334 SHA256 696710ea84e88a364bd89c9c66393b01b2b878 AUX emacs-24.4-lisp.patch 421 SHA256 da45d30d4e305ba5220749d3ac884aaeac395bc896839a5e7a24fb112912cbff SHA512 7dda7632f7af4207c94bf2b4384d07bb13ef4562ade02393c668b35ff48d7b64d95a9c05d8700c2ba272abf69e8b9c38a690b10afa86b8857a2ba34cb344f3a3 WHIRLPOOL 28e3346a1b47f8421d56ec37005a806828f1f6995cd4dc213ac8a6011457a7d1d0524f8418a2801e176c5ea09cb5910cd6432a55c592d679f7752c3df23ca339 AUX emacs-24.4-preload-hack.patch 343 SHA256 289febdc960bee609514fe5291fb3d60cc9b505345853370aa94b9bd9ccb5fd2 SHA512 ee765cc9f3a84b48c00a0c8a36934af6da737fa6b9f9d993e0e5e1c8b9f05cf7b1f96c260daba10e4b4df149abcf8ea125cf8d6ebbe5e2c0d508007e381ecd6b WHIRLPOOL f5c1c6313392325949edc955d9f1b3dc74395ff18cd214f5bef6f8f77ce1975233c870101a03d5218da007a61f3107474ef461d129313b00b07da762970b749a AUX preload.c 1868 SHA256 3498abf641e809c06bf6a265d54880e93ee31f7abf81210856b6dbef7d267129 SHA512 6268255b7afa8455ad7ce63ef6f01a7d114b53fbb3dc557b187de0ee6514b33b3419d70b8d7984dc289f5eed075a30b508133147821f77c4345df5cbd62e616e WHIRLPOOL 0c72d97de94cf5e1cf6a8ee4f8f42800d63f35465ea22f8c409857620ecc37e304ff6c2c4670659a063e5f275488fcdd1b45226d9d0130c4506480df7708bff6 -DIST emacs-24.4-patches-3.tar.xz 3780 SHA256 2dd1ba1e9cca9121731d14da30ecf3eb720c07e9644a7b9d75e3f02ebc2089d7 SHA512 dde60b26a7dffca1f80937af406ec8a7b4dd8c2563f57c290629acc4767ef38075fcc42ca62c5f172c972fc3cb6c2c0539d3db641386edc68a842bc6cf81237c WHIRLPOOL 3da7034ac9ce495f57ad5bd82f6f8a4d8a4baddd4126b6753423f5cf58aa01873838e22b2908b8c2e4cd48590dd7fb7ea3a520e1bf43be7d0eaf02583bdc9f6f +DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b -EBUILD emacs-24.4-r99.ebuild 10878 SHA256 7d6518ae5880a7ad2e28e5db8f79d60269c3bb5098a45c901d536cf6cc1d9b9b SHA512 d4f03b20f86ad1bb76c8430e0a9c2b889a1c395e5352574f40a1f4b144a1ad86de6aef1a9235e66e3e70f09ce869a6cfe5b84bf05f661866125779fda41648eb WHIRLPOOL 0125360801336dca7da14cf3549b68abbce92bdb543d97e3589c270a8586a33eaee15b9e620447d1d9e7b745b99ed063e804e4c5120a287314c889976bebe0a6 +EBUILD emacs-24.4-r99.ebuild 10789 SHA256 6067cff390730bda0078c7c16aaec9ab4db8666c01d11b94a0957087d0f26f04 SHA512 2545da07feb8134bc45d60bea3893f2743e5bf970e3fd88f1241550241a917c7008c0fda1795f514c9c224896c205be17e9b031a66247001ce8fb3e01cf3952a WHIRLPOOL 23b287a3e850eefb24e7aaa1f59ab3b2af1ff2be43a9ecef2320995d0503b95625424a08175247f759cf45f6d7a2bc9f2e487c7fe332c3639306d33545b4d408 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6 diff --git a/app-editors/emacs/emacs-24.4-r99.ebuild b/app-editors/emacs/emacs-24.4-r99.ebuild index ee2e5c3..31224d7 100644 --- a/app-editors/emacs/emacs-24.4-r99.ebuild +++ b/app-editors/emacs/emacs-24.4-r99.ebuild @@ -1,25 +1,25 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.1 2015/01/23 20:38:44 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r4.ebuild,v 1.11 2015/04/17 10:42:05 zlogene Exp $ EAPI=5 -inherit elisp-common eutils flag-o-matic multilib readme.gentoo +inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="http://www.gnu.org/software/emacs/"; SRC_URI="mirror://gnu/emacs/${P}.tar.xz - http://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"; + http://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"; LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" -KEYWORDS="amd64 ~arm ~mips ~ppc ~x86" +KEYWORDS="amd64 arm ~mips ppc x86" 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-eselect/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 ) @@ -42,7 +42,7 @@ RDEPEND="sys-libs/ncurses jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:= ) + tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( @@ -101,7 +101,7 @@ src_prepare() { sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ || die "unable to sed ctags.1" - #AT_M4DIR=m4 eautoreconf + AT_M4DIR=m4 eautoreconf } src_configure() { @@ -189,7 +189,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) \ @@ -206,9 +206,6 @@ src_configure() { } src_compile() { - echo $S - $(tc-getCC) -shared -fPIC -o preload.so "${FILESDIR}/preload.c" || die - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 emake }
