[gentoo-commits] gentoo-x86 commit in app-editors/emacs: metadata.xml ChangeLog emacs-18.59-r5.ebuild emacs-18.59-r6.ebuild

[Ulrich Mueller (ulm)]

ulm         09/01/23 16:53:41

  Modified:             metadata.xml ChangeLog emacs-18.59-r5.ebuild
  Added:                emacs-18.59-r6.ebuild
  Log:
  Substitute the built_with_use check for libX11 by a USE dependency; therefore, change EAPI to 2.
  (Portage version: 2.2_rc23/cvs/Linux i686)

Revision  Changes    Path
1.5                  app-editors/emacs/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	31 Jul 2008 15:58:24 -0000	1.4
+++ metadata.xml	23 Jan 2009 16:53:41 -0000	1.5
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <longdescription>
-  GNU Emacs is an extensible, customizable text editor—and more. At its core
+  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 wide



1.292                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.292&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.292&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.291&r2=1.292

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog	24 Dec 2008 11:18:38 -0000	1.291
+++ ChangeLog	23 Jan 2009 16:53:41 -0000	1.292
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.291 2008/12/24 11:18:38 ulm Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.292 2009/01/23 16:53:41 ulm Exp $
+
+*emacs-18.59-r6 (23 Jan 2009)
+
+  23 Jan 2009; Ulrich Mueller <ulm@g.o> +emacs-18.59-r6.ebuild:
+  Substitute the built_with_use check for libX11 by a USE dependency;
+  therefore, change EAPI to 2.
 
   24 Dec 2008; Ulrich Mueller <ulm@g.o>
   -files/emacs-22.1-freebsd-sparc.patch,



1.8                  app-editors/emacs/emacs-18.59-r5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild?r1=1.7&r2=1.8

Index: emacs-18.59-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-18.59-r5.ebuild	26 Nov 2008 21:14:50 -0000	1.7
+++ emacs-18.59-r5.ebuild	23 Jan 2009 16:53:41 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.7 2008/11/26 21:14:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.8 2009/01/23 16:53:41 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -61,7 +61,7 @@
 	replace-flags -O[3-9] -O2
 	strip-flags
 
-	emake -j"1" CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
 }
 
 src_install() {



1.1                  app-editors/emacs/emacs-18.59-r6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild?rev=1.1&content-type=text/plain

Index: emacs-18.59-r6.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r6.ebuild,v 1.1 2009/01/23 16:53:41 ulm Exp $

EAPI=2

inherit eutils toolchain-funcs flag-o-matic

DESCRIPTION="The extensible self-documenting text editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
	mirror://gentoo/${P}-patches-3.tar.bz2"

LICENSE="GPL-1 GPL-2 BSD as-is"
SLOT="18"
KEYWORDS="~x86"
IUSE="X"

RDEPEND="sys-libs/ncurses
	>=app-admin/eselect-emacs-1.2
	X? ( x11-libs/libX11[-xcb] )"
DEPEND="${RDEPEND}"

MY_BASEDIR="/usr/share/emacs/${PV}"
MY_LOCKDIR="/var/lib/emacs/lock"

src_prepare() {
	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
	EPATCH_SUFFIX=patch epatch
}

src_configure() {
	# autoconf? What's autoconf? We are living in 1992. ;-)
	local arch
	case ${ARCH} in
		x86)   arch=intel386 ;;
		*)	   die "Architecture ${ARCH} not supported" ;;
	esac
	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
	sed -e "${cmd}" src/config.h-dist >src/config.h

	cat <<-END >src/paths.h
		#define PATH_LOADSEARCH "${MY_BASEDIR}/lisp"
		#define PATH_EXEC "${MY_BASEDIR}/etc"
		#define PATH_LOCK "${MY_LOCKDIR}/"
		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
	END

	# -O3 and -finline-functions cause segmentation faults at run time.
	filter-flags -finline-functions
	replace-flags -O[3-9] -O2
	strip-flags
}

src_compile() {
	# Do not use the sandbox, or the dumped Emacs will be twice as large
	SANDBOX_ON=0
	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
}

src_install() {
	local i

	dodir ${MY_BASEDIR}
	dodir /usr/share/man/man1
	make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \
		MANDIR="${D}/usr/share/man/man1" || die
	chmod -R go-w "${D}${MY_BASEDIR}"
	rmdir "${D}${MY_BASEDIR}/lock"

	dodir ${MY_LOCKDIR%/*}
	diropts -m0777
	keepdir ${MY_LOCKDIR}

	for i in emacsclient etags ctags; do
		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die "mv ${i} failed"
	done
	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die "mv emacs failed"
	mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
	dosym ../emacs/${PV}/info /usr/share/info/emacs-${SLOT}

	dodoc README PROBLEMS
}

pkg_postinst() {
	eselect emacs update ifunset
}

pkg_postrm() {
	eselect emacs update ifunset
}