diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-11-17 11:08:58 +0100 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-11-17 11:08:58 +0100 |
commit | 764b8472fb8c028ab8023c8c0a25add7379e3627 (patch) | |
tree | f8be5a888048ffcde2e6aa493c47a25240a8bc49 /app-editors | |
parent | Version number has changed upstream. (diff) | |
download | emacs-764b8472fb8c028ab8023c8c0a25add7379e3627.tar.gz emacs-764b8472fb8c028ab8023c8c0a25add7379e3627.tar.bz2 emacs-764b8472fb8c028ab8023c8c0a25add7379e3627.zip |
app-editors/emacs-vcs moved to Portage tree.
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 34 | ||||
-rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild | 329 | ||||
-rw-r--r-- | app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch | 38 | ||||
-rw-r--r-- | app-editors/emacs-vcs/metadata.xml | 45 |
4 files changed, 0 insertions, 446 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog deleted file mode 100644 index f501280..0000000 --- a/app-editors/emacs-vcs/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -# ChangeLog for app-editors/emacs-vcs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 24 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Update dependency after package move from x11-libs/openmotif to - x11-libs/motif. - - 04 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Sync from Portage tree. - - 13 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Sync from Portage tree. - - 12 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Use lightweight checkout for WORKDIR, bug 434746. - - 12 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Bootstrapping in src_compile shouldn't be needed, because we already call - eautoreconf in src_prepare. - - 12 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Undo previous change. Sync from Portage tree. - - 25 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: - Display some elog messages only on first installation. - -*emacs-vcs-24.2.9999 (25 Aug 2012) - - 25 Aug 2012; Ulrich Müller <ulm@gentoo.org> - +files/emacs-24.0.92-ns-appdirs.patch, +emacs-vcs-24.2.9999.ebuild, - +metadata.xml: - Copied from Portage tree. - diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild deleted file mode 100644 index 02610df..0000000 --- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild +++ /dev/null @@ -1,329 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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}" - EBZR_WORKDIR_CHECKOUT="t" #434746 - inherit bzr - SRC_URI="" -else - SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz - mirror://gnu-alpha/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 HPND MIT W3C unicode PSF-2" -SLOT="24" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel 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 - >=app-emacs/emacs-common-gentoo-1.3[games?,X?] - 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 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - 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 ) - 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/motif-2.3:0 ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - dbus? ( virtual/pkgconfig ) - gnutls? ( virtual/pkgconfig ) - libxml2? ( virtual/pkgconfig ) - X? ( virtual/pkgconfig ) - gzip-el? ( app-arch/gzip ) - pax_kernel? ( sys-apps/paxctl )" - -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(emacs,[ \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 - - 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.ac \ - || die "unable to sed configure.ac" - 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 "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \ - || die "unable to sed configure.ac" - fi - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - 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 - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x --without-ns" - myconf="${myconf} $(use_with gconf)" - myconf="${myconf} $(use_with gsettings)" - 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 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=$(usex gtk3 gtk3 gtk2)" - local f - for f in athena Xaw3d motif; do - use ${f} && ewarn "USE flag \"${f}\" ignored" \ - "(superseded by \"gtk\")" - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - use motif && ewarn "USE flag \"motif\" ignored" \ - "(superseded by \"athena\" or \"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 - else - myconf="${myconf} --without-x --without-ns" - fi - - # Save version information in the Emacs binary. It will be available - # in variable "system-configuration-options". - myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}" - if [[ ${PV##*.} = 9999 ]]; then - 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} \ - --program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --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 libxml2 xml2) \ - $(use_with selinux) \ - $(use_with wide-int) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake -} - -src_install () { - emake DESTDIR="${D}" NO_BIN_LINK=t install - - # move man pages to the correct place - local m - 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 -rf "${ED}"/var - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - 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} - 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 - 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 - eselect emacs update ifunset - - if use X; then - 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." - elog - fi - - 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." - elog - 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 -} diff --git a/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch b/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch deleted file mode 100644 index 7834d04..0000000 --- a/app-editors/emacs-vcs/files/emacs-24.0.92-ns-appdirs.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- emacs-24.0.92-orig/Makefile.in -+++ emacs-24.0.92/Makefile.in -@@ -469,21 +469,6 @@ - -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) - rm -f $(DESTDIR)${bindir}/$(EMACS) - -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) -- if test "${ns_appresdir}" != ""; then \ -- ( cd ${ns_appresdir} ; \ -- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ -- if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ -- rm -fr share ) ; \ -- ( cd ${ns_appbindir} ; \ -- if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \ -- rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \ -- ln -sf ../libexec/* . ; fi ; fi ) ; \ -- else true ; fi -- --## FIXME is the emacs-24* bit above really necessary and correct? --## What if I have 24.1 and 24.2 installed at the same time? --## In any case, it should use something like echo $version | sed 's/\..*//' --## instead of hard-coding a version. - - ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html - ## Needs to be the user running install, so configure can't set it. ---- emacs-24.0.92-orig/leim/Makefile.in -+++ emacs-24.0.92/leim/Makefile.in -@@ -259,11 +259,6 @@ - [ -n "$${installuser}" ] && break ; \ - done ; \ - find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' -- if [ "${ns_appresdir}" != "" ]; then \ -- ( cd ${ns_appresdir} ; \ -- if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ -- rm -fr share ) ; \ -- else true ; fi - - clean mostlyclean: - rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \ diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml deleted file mode 100644 index b68a939..0000000 --- a/app-editors/emacs-vcs/metadata.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>emacs</herd> -<longdescription> - GNU Emacs is an extensible, customizable text editor - and more. At its core - is an interpreter for Emacs Lisp, a dialect of the Lisp programming language - with extensions to support text editing. The features of GNU Emacs include: - * Content-sensitive editing modes, including syntax coloring, for a variety - of file types including plain text, source code, and HTML. - * Complete built-in documentation, including a tutorial for new users. - * Full Unicode support for nearly all human languages and their scripts. - * Highly customizable, using Emacs Lisp code or a graphical interface. - * A large number of extensions that add other functionality, including a - project planner, mail and news reader, debugger interface, calendar, and - more. Many of these extensions are distributed with GNU Emacs; others are - available separately. -</longdescription> -<use> - <flag name='athena'>Enable the MIT Athena widget set - (<pkg>x11-libs/libXaw</pkg>)</flag> - <flag name='games'>Support shared score files for games</flag> - <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system - font name</flag> - <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the - system font name</flag> - <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of - version 2 (<pkg>x11-libs/gtk+</pkg>)</flag> - <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag> - <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag> - <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image - processing</flag> - <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead - of the internal Lisp implementations</flag> - <flag name='pax_kernel'>Enable building under a PaX enabled kernel - (<pkg>sys-apps/paxctl</pkg>)</flag> - <flag name='source'>Install C source files and make them available for - find-function</flag> - <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in - preference to Emacs' own scrollbars</flag> - <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit). - This option has an effect only on architectures where "long" and - "long long" types have different size.</flag> -</use> -</pkgmetadata> |