From 38c3a2a55fe23328eedb3d2301494261e4d98d86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Wed, 12 Nov 2014 08:46:40 +0000 Subject: [PATCH] New live ebuilds, upstream uses git now. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8! --- app-editors/emacs-vcs/ChangeLog | 9 +- app-editors/emacs-vcs/Manifest | 21 +- .../emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild | 363 ++++++++++++++++++ .../emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 363 ++++++++++++++++++ 4 files changed, 737 insertions(+), 19 deletions(-) create mode 100644 app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild create mode 100644 app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index f4726b9a2f9d..da3f887b9828 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.175 2014/11/11 18:31:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.176 2014/11/12 08:45:37 ulm Exp $ + +*emacs-vcs-25.0.9999-r1 (12 Nov 2014) +*emacs-vcs-24.4.9999-r2 (12 Nov 2014) + + 12 Nov 2014; Ulrich Müller +emacs-vcs-24.4.9999-r2.ebuild, + +emacs-vcs-25.0.9999-r1.ebuild: + New live ebuilds, upstream uses git now. *emacs-vcs-25.0.50_pre20141110 (11 Nov 2014) diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 4adf3b690e20..663455bf0c58 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,25 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST emacs-25.0.50_pre20141031.tar.xz 24539480 SHA256 ff6af35edc35441465e4b41893573ff72cb85218ebe1c02b211286c72aefe645 SHA512 2abbde5906be73f2b4ca0375a9f138a08c671cbdfecb96e92f4b606ac05177dfbc7afe9409f0b6774497800eb4efe1a461c9c6d64f2a2494a8b27aa0b26e1c44 WHIRLPOOL ac12e7f4577d0b1f42fbe46a333ab0d67eddaf1ab5e723ab9fc3f7c305db453f77fdb4e5919049fe297f3bf2e273b35627c88d8e447d2b335f52ae6fa15ace39 DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668 EBUILD emacs-vcs-24.4.9999-r1.ebuild 11632 SHA256 d8d079db36efb24def4c020ef86a1a345820d197697a51d983e64700d827d9fe SHA512 a5603c1c3085f6e02455a4fd4e1931bbca8c7443eae873fbf5e82e1b1419db27308bbaeade47f37266f795f3bc4e41ad36001df3a48f072c89f730f1de7a092e WHIRLPOOL 3417cdd1a8ea2a545b989564e780666516ee4c1a63f02033d10b4dc922161986fe2a57b85005a7d4d351f6153a88c96ef64ad2a79ad3efb291393ac49aaecf29 +EBUILD emacs-vcs-24.4.9999-r2.ebuild 11454 SHA256 a5a2538022d65c11f90c70e659478396d37bd025cc098cb85092e6561edb9eed SHA512 89775f4d5341b9095dafeec87c9fa262e87c2988a20c42cb4151dd0cf8e04ae136c9c588cde7da1a3caee6ed251530835287bfbba4efc2fab77ccbea1f4c1272 WHIRLPOOL 7b282562343aae530fb24483c82c4d38cc46f361a6de81c61d1d04a67ab85b9f49a7dcf05e42123295f2538d72ec0b3d48c61677d35fef7a892e5c5a5aa7e9c8 EBUILD emacs-vcs-25.0.50_pre20141031.ebuild 11636 SHA256 dd43a7095fdfbc3a63fc7bf7d481901f1ca4040f52eeb9f8a21b02a993959369 SHA512 e06c06284c11ff9b40e2c37dcbde020737e3d2d7fd7d12985ca306baf32e25e3d8cbfba97ea8ffbba2ef4d10c156095ab4a5dd5af42bf1a43a50e08159732634 WHIRLPOOL c3ec5a8ca084fd524b91fcadb5962a46968632ca0a885454704dcb7f0d2e4d5da0277851e7c3715606346b947994b6f8cf73ac36abcdc4f4370bcb01a41783ee EBUILD emacs-vcs-25.0.50_pre20141110.ebuild 11636 SHA256 1bc17ed06e754a01ca220644a362b2b4147002aa517c2633712e15f75068842c SHA512 69f6a8e2af940e09474bf4b815d8c4ee8828ad6c1ebac0d9ce58738ee54743dfdb50b71338dd1bc88892d1d29bebac4df467baeefbfcf0ea7845c32b560bc7ec WHIRLPOOL 5b05eb7105f666f9d2a37dacc465b0105bc0814ae7118a7e821d62df6677f409d271651958721e1838946d848e560263a9b7d1e30d9e124f97028e8dc89a8319 +EBUILD emacs-vcs-25.0.9999-r1.ebuild 11452 SHA256 c9e98dcece756deec16449afe947f35ac8d7b1d8ac67d9d5649fba073cb2d05d SHA512 d06144ae8452ee298adec62cc94abf77eeb2eaaf33b5a8eb075e38b398a99f461d10d5f8a75009538ae35af996da06e521dfc054749603d84183e5ec0ebad6f9 WHIRLPOOL 7d96cd07de0f4c94a16759d266250e5970acb5db38e331b46c5fb8474e0d405550c4a9ae975a4ac62fd52a622d46875fb2a91ef0ba2cc626654e2237c17f4605 EBUILD emacs-vcs-25.0.9999.ebuild 11626 SHA256 894ce78d304cc2e77c0aa4dbbf4a56e0cb993d6f407cff335ae085340beed4f0 SHA512 8f2cf672bb38e571adf6bf008ccd4f30fa911c304d131467ddd82cbabc5ed9d023d40d01a18c089d94dbbd5e06873da1e830b96859cd5ec2a6dfd3f372765756 WHIRLPOOL a604fd7900bbae23e3da85d03178506a5eaae2e04bc4976ad2645327ec9c97e98c4f1fcdb48afb20de1d423e0aaae957118addb4f42404546cb57f9a3b4b7b62 -MISC ChangeLog 81403 SHA256 cf7465c8595c22dd2249a3b6614dcb4b9b3c2085eb2d30ebc231f469f936909b SHA512 01ae79b23fb3cfb630f1cb43a633aafc6d7f6365b42026c509501ba05dbce24085d38b8aa905aa22c71472ae0672b01a722851bfd6fe30724a27388b6e82c8cc WHIRLPOOL eb378eecbd5a80697ba538fa12701f1019edd2ccab870bbb0186986160fd229754c268f6238e70e8bc38f641d301dac1d33e32d43f00c6cc6cc5cb4172844bc1 +MISC ChangeLog 81637 SHA256 61298326888049dea2cfeda3a2ac7976876acf70a43078788d5d995880253022 SHA512 33f10ed0419c89f87fd9ecfcf831c6708db620853b8fcb832c58fe9886b0bca4d22cfdc218c9d6ef27a0c9ad1310c1d1c2a3ed2d550affc418a7b75f6e65cc4d WHIRLPOOL 8024a4285381052cc83df9f1ba0f21642be67fa131bbd7d08654b2e88e487bf623a22f050427f34b86c401f52c94953713df7678122a34b11f2bdd19aa687b61 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQGcBAEBCAAGBQJUYlbuAAoJEJQzkH1pP7W4lX0L/Ai74a5JLY8Aoaf92QzhnE1A -jQYfQlzquNzd18eomUVmEei8osi6sh4lj7wnYuZtxAR0qHYH7TvjsSeKItel55ZX -UrWwziOB/uHzaliEy8j9qFmLIfZBgqmbqNZ9tXpDwQIvnb6wQ1/OC+MW2cWmuQ/b -kyEjFIU064OhNYfG8Mlu1kAo7/Vd0EVzP5k3BU36jv9HwM43+H9k1Cy5rmfH5mBa -Vji+CyZGa2VWiQbzacX4Lmwk9SqwpWDIN919ZwQPPq1v8kW1eWb+Fa8wfakue0xY -PKgiJqz6Z8UrcO4f7IPdC/G/ec1P9nvoE7E6vMd8zrQBfUHmefdsQNfjmxVYIjso -s5QhDIFe8hkkZlGoVW4OH/SBQueE0P2CXMqzCkpcdBqnLiN0KGhGZAZ2hLH/NkHi -glt4F6g8ehTtY2o/fF0bb9XRc6U4TrM8mLXXTI/LW9q+KHEeCJrfBFv9EhNEnOfL -hxPcliyqpPcmbezJkCAN89sx66zacKJUxIl4hmKJpA== -=JPru ------END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild new file mode 100644 index 000000000000..2cfd60d1196d --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2014 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.4.9999-r2.ebuild,v 1.1 2014/11/12 08:45:37 ulm Exp $ + +EAPI=5 + +inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" + EGIT_BRANCH="emacs-24" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_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="24" +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 ) + 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: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + 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+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}" + 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/{applications,icons} + rm -rf "${ED}"/var + + # remove unused /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 +} diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild new file mode 100644 index 000000000000..c170e57434d5 --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2014 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.9999-r1.ebuild,v 1.1 2014/11/12 08:45:37 ulm Exp $ + +EAPI=5 + +inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" + EGIT_BRANCH="master" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_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 ) + 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: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + 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+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}" + 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/{applications,icons} + rm -rf "${ED}"/var + + # remove unused /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 +} -- 2.26.2