New prerelease version from upstream. Remove "freetype" configure option.

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

4 files changed, 321 insertions, 5 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 7d15ed1c9d34..e87f3a5cb0bc 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.242 2009/04/05 18:46:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.243 2009/05/01 19:49:00 ulm Exp $
+
+*emacs-cvs-23.0.93 (01 May 2009)
+
+  01 May 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.93.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  New prerelease version from upstream. Remove "freetype" configure option.
 
   05 Apr 2009; Raúl Porcel <armin76@gentoo.org> emacs-cvs-23.0.92.ebuild,
   emacs-cvs-23.0.9999-r1.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index f829adfaa11a..65a7571c55fa 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-23.0.92-sh.patch 446 RMD160 b1a3ee15e5f690a8c4f5a1d0740aae6d65e61513 SHA1 1ac571ac9a47d9ce4583c8cb6745fa7646d8e621 SHA256 e609f84435f3e22daa013262078f6cc7875664f895f0edd9a73b55fcb38ab888
 DIST emacs-23.0.90.tar.gz 42816900 RMD160 59f151e19ee555a5173a9d37829ba379043dd7e0 SHA1 25ef0fe0f37e9e13cdbc684c9cebd3863ce20ab4 SHA256 0afb69a3996455c0883909fd1f9db786d0485eed9ef44c12bd623dff2ec7c7af
 DIST emacs-23.0.91.tar.gz 43011675 RMD160 dd0f93a06d3f1179d96ec32a91866ba4dadc4a27 SHA1 47df77669910c82eb1ef60d827235f11a486c2de SHA256 d0915f56a3c68090687d22a6f8d94f0e6edbf92c3600c746b512439863bf39fd
 DIST emacs-23.0.92.tar.gz 43022949 RMD160 f7f4a14d01f2470a3278035a9587f825de149b48 SHA1 d3032a3a1ac4b9a22fa127051c8dfe188bea13f4 SHA256 53af89e1c80928130469da94f7acecbe3d663546432cfee8233568ed9e3ba7aa
+DIST emacs-23.0.93.tar.gz 42838836 RMD160 42457a324d1672154c4a15d307060902a4cf544b SHA1 4279b2988b11a6f04dded0efd952293cf8f95865 SHA256 f5699af73cf0ed524c247d3273154c4d3399a1a05f404924263891cde6d12cad
 EBUILD emacs-cvs-23.0.90.ebuild 8886 RMD160 c105ad9c4057e56f579456ef429c43e2650d96d6 SHA1 c1b05e5a7a136607d75d166658aef10444ee4ab6 SHA256 2a274195fad1c9ac3c1387c5ad5415d0c28e6d0074e6f691468369de959c9060
 EBUILD emacs-cvs-23.0.91.ebuild 8886 RMD160 e1471f3a4f613660ba22e8dcf4e3adb8562c77b6 SHA1 d555ba5a2cc61e80ef628bc4aa57320c6a92417d SHA256 1509f6c55f0d2de72129e14a666f06db6977f2431e117d4aa6bebe07bbe835c6
 EBUILD emacs-cvs-23.0.92.ebuild 9011 RMD160 15f486cd36033c06783c0cfb66692834ba0238ba SHA1 f5c0b26fda53a19bace44ab9ae0ace3cd1450cfe SHA256 e12cdeca1bb56ca079b327aca89d7e11b6c068d6cff07d9a9e13a4bc7fda1202
-EBUILD emacs-cvs-23.0.9999-r1.ebuild 8964 RMD160 154def6f814d0c090345200badb9b4204169337d SHA1 1a3df0ff9a48df4e7c52b2cfc2d51556c06652f3 SHA256 e8b97707babc4e16fe120abb813e00e22a6e9c3875b500ea09bb94ed070c85f4
-MISC ChangeLog 45308 RMD160 2ed5856705eda92aac737b2305abc4d3e6e338bd SHA1 271fcd1a23e1713b79f8f1414af95861fd83ccaf SHA256 927d57a68dc588f468be9c6e9c9b31a1cd789809e1332d15bef74b8c20913723
+EBUILD emacs-cvs-23.0.93.ebuild 8984 RMD160 8ccdb1bb2277fc1470207ade11595863ee9dccb5 SHA1 f6385aa558fdbfe9e6531c0e8c2c46d6e64ce7cf SHA256 1c24fdebb3d1ed9762e26277d0cd249969b017d5c905f144326e20e6bde1bb15
+EBUILD emacs-cvs-23.0.9999-r1.ebuild 8935 RMD160 86855b9f01105507711d47beac8cb8817b0b6018 SHA1 30a4eab743d06f46d33d7ae0bce660d1968a000f SHA256 b33131d44b8439064c82266a28fe47c1b375170d56df218365dcb7bae6044fa8
+MISC ChangeLog 45522 RMD160 028425a38127c962401610a0c674b340b7ef3c0f SHA1 212032e7be6c9aa7dee61d9a5eee6848beae2799 SHA256 5019b17415d61eeef691b1612ea92fb54dbd397680dd5a4f862c13b27adef44d
 MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkn7UpkACgkQOeoy/oIi7uw8DQCgp4+LYw++SUvoa7V6SKAPTQMX
+amoAoJguRbcdIBlbJYS10lfEamDjqzaS
+=zhfB
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild
new file mode 100644
index 000000000000..3b3cc1c19aab
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.93.ebuild,v 1.1 2009/05/01 19:49:00 ulm Exp $
+
+EAPI=2
+
+inherit autotools elisp-common eutils flag-o-matic
+
+if [ "${PV##*.}" = "9999" ]; then
+	ECVS_AUTH="pserver"
+	ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+	ECVS_MODULE="emacs"
+	ECVS_BRANCH="HEAD"
+	ECVS_LOCALNAME="emacs"
+	inherit cvs
+	SRC_URI=""
+	FULL_VERSION=""
+	S="${WORKDIR}/${ECVS_LOCALNAME}"
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
+		ftp://alpha.gnu.org/gnu/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 as-is X11 W3C"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+RESTRICT="strip"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		png? ( media-libs/libpng )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff )
+		xpm? ( x11-libs/libXpm )
+		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? ( x11-libs/gtk+:2 )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	>=app-emacs/emacs-common-gentoo-1[X?]
+	spell? ( || ( app-text/aspell app-text/ispell ) )"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [ -z "${FULL_VERSION}" ]; then
+		FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+			| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+		[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+		echo
+		einfo "Emacs CVS branch: ${ECVS_BRANCH}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+		echo
+	fi
+
+	epatch "${FILESDIR}/emacs-23.0.92-sh.patch" #262359
+
+	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_configure() {
+	ALLOWED_FLAGS=""
+	strip-flags
+	#unset LDFLAGS
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	else
+		replace-flags -O[3-9] -O2
+	fi
+
+	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 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 xft)"
+
+		if use xft; then
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && einfo \
+				"USE flag \"m17n-lib\" has no effect because xft is not set."
+		fi
+
+		# 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/Lucid) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+		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
+
+		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)"
+	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir=/usr/share/info/${EMACS_SUFFIX} \
+		${myconf} || die "econf emacs failed"
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	if [ "${PV##*.}" = "9999" ]; then
+		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+		# cleanup, otherwise emacs will be dumped again in src_install
+		(cd src; emake versionclean)
+	fi
+	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_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; 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_SUFFIX}.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 -rf "${D}"/usr/share/{applications,icons}
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	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_SUFFIX}"))
+	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 README BUGS || 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_SUFFIX} 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() {
+	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
+	eselect emacs update ifunset
+
+	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 "You can therefore test emacs-cvs along with the stable release."
+	elog "\"man emacs.eselect\" for details."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
index af3f0d23e3a6..bac86f5012d5 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.8 2009/04/05 18:46:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.9 2009/05/01 19:49:00 ulm Exp $
 
 EAPI=2
 
@@ -142,7 +142,7 @@ src_configure() {
 		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 xft freetype) $(use_with xft)"
+		myconf="${myconf} $(use_with xft)"
 
 		if use xft; then
 			myconf="${myconf} $(use_with m17n-lib libotf)"