Add site initialisation for Info. Rename site-init file.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686

3 files changed, 272 insertions, 5 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3a6949141ae2..b4c15ffe4cf2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.287 2008/11/26 21:11:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.288 2008/11/29 20:38:52 ulm Exp $
+
+*emacs-22.3-r1 (29 Nov 2008)
+
+  29 Nov 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-22.3-r1.ebuild:
+  Add site initialisation for Info, so that Emacs' dir is first in list;
+  this will also help to get the right documentation if Emacs is started
+  as emacs-${SLOT}. Rename site-init file to 20${PN}-${SLOT}-gentoo.el.
 
   26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r17.ebuild,
   emacs-22.3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d0a73b811441..9cabbfd1f90a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -23,13 +23,14 @@ EBUILD emacs-18.59-r5.ebuild 2629 RMD160 03464aef9aba114c10a960141791db06863b3d3
 EBUILD emacs-21.4-r15.ebuild 5251 RMD160 6cb3de4ad357b8982fbc64dd2cad6bc1ee3bcbe4 SHA1 76a2ba348fd5ac93dd326a9fedf77550dbb51464 SHA256 00a75f9804a8df387aafa4380dd5855ba6991b69e1a68a5965fd69614b677d73
 EBUILD emacs-21.4-r17.ebuild 5433 RMD160 5da8ea5cf7c1dca685eb767c086069e6fb006f75 SHA1 2bbb50a49d78cbf4d38448a06e5347d34d6b41ad SHA256 5165e106e2c421ef82144fe2256a4685bc86dd53d100c840b9f3dbd4f3d214ee
 EBUILD emacs-22.2-r3.ebuild 8196 RMD160 ecf047909794fd1ed3f26912de31febe6e5f600d SHA1 99a3dc7eae2347db5afe59159f427997509e15a5 SHA256 24ef32b3fd737117e814d46811796756d3cdfcc7ab7c075555b8c3796494e47f
+EBUILD emacs-22.3-r1.ebuild 8041 RMD160 2e3b9ec92e99749fc77fa03e0f6349d30f9e95aa SHA1 8ef0f6dba6e220ffbc261e12ec175c33dd779b64 SHA256 a1724ffbfa17887cea8b9b608553d0cc27bef293751b342c1a000038804ecd22
 EBUILD emacs-22.3.ebuild 7741 RMD160 e097d334d6f9abd1ab3e33eee9650a5a54fbce1f SHA1 825f8c7733180099eb76520f87c8b5c81bb87bb6 SHA256 f14ac1a184161d537b06b353ae6623461df56cbb51e51432038d5bc40ad73ee5
-MISC ChangeLog 41412 RMD160 1f899b108390bbc48745e05b93830c4efd321568 SHA1 3217c4aafd11951a5000a5ba0dc4e8bd8af9d655 SHA256 411b776dfc2c8bd01594530e8c4400bee86f2bc166c6d21ca9f4d6907b7db84f
+MISC ChangeLog 41731 RMD160 cd1e296507431233ec51b0d16b8118d9d79d075f SHA1 28ca20ebe019c13f4317ec2f87ee65c961f1a3c4 SHA256 952d55ef1d07c1cc585187391673e66e3cb572539fa94f21930b23881dc6ab90
 MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkktvHIACgkQOeoy/oIi7uyxBgCg0Jhx5u3SU32fPDZI+f96Cucl
-NuUAoKRy96UZeVMMGTrJ9o8xci3N9nuu
-=Byq6
+iEYEARECAAYFAkkxqI4ACgkQOeoy/oIi7uzSCACcCFap1J9o8nheiFiuUJAwXw/o
+GIIAn2FuMy9bZt673A3IEQYm8kIlnht6
+=9OVx
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.3-r1.ebuild b/app-editors/emacs/emacs-22.3-r1.ebuild
new file mode 100644
index 000000000000..c9b9aedea3cc
--- /dev/null
+++ b/app-editors/emacs/emacs-22.3-r1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r1.ebuild,v 1.1 2008/11/29 20:38:52 ulm Exp $
+
+inherit autotools elisp-common eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
+SLOT="22"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+RESTRICT="strip"
+
+RDEPEND="!<app-editors/emacs-cvs-22.1
+	sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( dev-util/pkgconfig )
+	X? ( gtk? ( dev-util/pkgconfig ) )
+	gzip-el? ( app-arch/gzip )"
+
+# 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}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
+	# SuperH support (bug 238210)
+	epatch "${FILESDIR}/emacs-22.2-sh.patch"
+	# Fix sporadic segmentation faults in unexec (bug 236579)
+	epatch "${FILESDIR}/emacs-22.3-linux-random-heap.patch"
+
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+
+	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.in \
+			|| die "unable to sed configure.in"
+	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 "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	#unset LDFLAGS
+	if use hppa; then # bug #193703
+		replace-flags -O[2-9] -O
+	else
+		replace-flags -O[3-9] -O2
+	fi
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		myconf="${myconf} $(use_with xpm)"
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d (Athena) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --without-gtk"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
+		fi
+
+		local f tk=
+		for f in gtk Xaw3d motif; do
+			use ${f} || continue
+			[ "${tk}" ] \
+				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+			tk="${tk}${tk:+ }${f}"
+		done
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	myconf="${myconf} $(use_with hesiod)"
+	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
+
+	econf \
+		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	local i m
+
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv "${i}" "${i}.info" || die "mv info failed"
+	done
+
+	# move man pages to the correct place
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /usr/share/emacs/site-lisp
+	keepdir /var/lib/games/emacs
+
+	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/*.[ch]
+		c=""
+	fi
+
+	sed 's/^X//' >"${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}      "/usr/share/emacs/${FULL_VERSION}/src")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "/usr/share/info/emacs-${SLOT}"))
+	X    (and path
+	X	 ;; move Emacs Info dir to beginning of list
+	X	 (setq Info-directory-list
+	X	       (cons dir (delete dir (split-string path ":" t)))))))
+	EOF
+	elisp-site-file-install "${SITEFILE}" || die
+
+	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f "${ROOT}"${infodir}/dir{,.*}
+	for f in "${ROOT}"${infodir}/*.info*; do
+		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
+	done
+	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
+	echo
+}
+
+pkg_postinst() {
+	[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
+		|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	local f
+	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[ -e "${f}" ] || touch "${f}"
+	done
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+
+	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
+		# transition from pre-eselect revision
+		eselect emacs set emacs-${SLOT}
+	else
+		eselect emacs update ifunset
+	fi
+
+	echo
+	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."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+}