Substitute the built_with_use check for libX11 by a USE dependency; therefore, change EAPI to 2.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 112 insertions, 12 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 69adc3c61272..1124588b3d96 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -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@gentoo.org> +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@gentoo.org>
   -files/emacs-22.1-freebsd-sparc.patch,
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ac8adfeb9343..ae9135a3d100 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,16 +12,17 @@ DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r5.ebuild 2629 RMD160 03464aef9aba114c10a960141791db06863b3d31 SHA1 88cfdacff5d07aba75b31942ba2f66ae2a17e788 SHA256 9ea826f0882053d9e56f73f259f88d77ccdcc117ff8793898f24b8647bb68b9d
+EBUILD emacs-18.59-r5.ebuild 2627 RMD160 d3be1dd6c3759bc8f0c97ef437009f975953c02c SHA1 865d25d03a6da0e3002cd06a29ad12625e7bdb25 SHA256 16380feb45628eff4059bf448db22da935ce2b3fbfc97eac6db66d1f5e616882
+EBUILD emacs-18.59-r6.ebuild 2513 RMD160 8d8b8e8a4726c96eba85871332a5dd8481375c4c SHA1 c90e37a50dae7fbf295a4d52ec4dc90538fd3b9a SHA256 073bd68daa84247131018f5e84fcfa8a37bf081b68c28b64c52d24bad9ccea5a
 EBUILD emacs-21.4-r17.ebuild 5434 RMD160 cde44890dd918f4e72fc2dac635cf43507ca7103 SHA1 f9e58f0367f04ea0b512105ac86dee5b8f4623ed SHA256 eb31b78ea205a19daa9e742025d277b228a36ebb297e50f662fa1622541d1a2f
 EBUILD emacs-22.3-r1.ebuild 8041 RMD160 2e3b9ec92e99749fc77fa03e0f6349d30f9e95aa SHA1 8ef0f6dba6e220ffbc261e12ec175c33dd779b64 SHA256 a1724ffbfa17887cea8b9b608553d0cc27bef293751b342c1a000038804ecd22
 EBUILD emacs-22.3.ebuild 7744 RMD160 58a606af901b41673591cffe8d17d65f1b9bf59f SHA1 3dcdff928569f0a62c273b36b4ad4ad1163e06ce SHA256 a73b5f647b51a7147a33623d5cf6a8ae995cb30ce11c0d9906ea03b26da46f44
-MISC ChangeLog 42286 RMD160 fa22bf83a14f6dfc62fe4b4e2057b1666f789a46 SHA1 4482426b715560c6319bcd605c537765ea8d0dc6 SHA256 6c10f076662f8bcf54ec7d12dcefd660d6839e859429c1ccb0e2808401038b7c
-MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
+MISC ChangeLog 42490 RMD160 926ab21529e9c448f51b2396be10e467f3227436 SHA1 ae698e57a1d2d0842eda5b8270301aa0b571598c SHA256 5fb9f0aae19e7bc2c8700a29cdf018c57f656d313786b3213c0fbc3f47800ff7
+MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAklSGr0ACgkQOeoy/oIi7uyrZQCg1aFYcHNVbnUc0ZIdHJJEXwk7
-jYUAoNjsCn2F70CoT+9yMer6P7kKQE/R
-=Q1HQ
+iEYEARECAAYFAkl59lYACgkQOeoy/oIi7uz5GQCgnp9xu8Z7a1tsXBZSJU0LrIYt
+AzsAoLrS6MQAXuw16t1XpSK+AuGc0ruu
+=GudS
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild
index 27d1c1b48119..91a4a2ac03fd 100644
--- a/app-editors/emacs/emacs-18.59-r5.ebuild
+++ b/app-editors/emacs/emacs-18.59-r5.ebuild
@@ -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 @@ src_compile() {
 	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() {
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
new file mode 100644
index 000000000000..73928416971f
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r6.ebuild
@@ -0,0 +1,93 @@
+# 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
+}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 7ef4be9b35d0..74e0827dd067 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -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