Configure options "font-backend" and "carbon" are no longer supported. Remove old snapshot.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 i686

5 files changed, 13 insertions, 280 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index ca98d2f6fbbe..8b52d1ac42aa 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.211 2008/08/15 23:49:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.212 2008/08/20 15:34:02 ulm Exp $
+
+  20 Aug 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-freebsd-sparc.patch,
+  -emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Configure options "font-backend" and "carbon" are no longer supported.
+  Remove old snapshot.
 
 *emacs-cvs-22.2.90 (15 Aug 2008)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 554427f2aa65..d422c330ef21 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -3,19 +3,16 @@ Hash: SHA1
 
 AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
 AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8
-AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 DIST emacs-22.2.90.tar.gz 39579679 RMD160 53f7884475e714142154ad96eccbf0366586296b SHA1 93e4bc5c949f73f19462ae5e13171fe25e64dcb7 SHA256 6084f7dcc3bc767c0fe60d3b447aad2775856c2a0b88b4d932eafbef44b08a1f
-DIST emacs-cvs-23.0.50_pre20080201.tar.bz2 21883295 RMD160 fa6f3b46fd642d4168018298e63f43afd4949233 SHA1 1b649cb9f3e9eafbe7e2fbe1e4523a92bf9dc72e SHA256 6aff7cf61e3873aa8620b0f491a5186dd449a8f3b9a321b2abab63807be4d5b9
 EBUILD emacs-cvs-22.2.90.ebuild 7876 RMD160 e57c043b3e05a8c09d823717ba25b3c74155d1cc SHA1 e863bf4212f4991cfa1f3e391f44e775542aff6a SHA256 f4bf9d1355673d62938c05b1b0fdd0a70dd17cfdca3c777bea39eeb13bde8fdd
 EBUILD emacs-cvs-22.2.9999.ebuild 8411 RMD160 12c84ecc58b179bd7bfa6a2ab9b7e343b8338ca0 SHA1 53cf7763dc02ed03f33d78c1aa7e81da6bf47458 SHA256 7f447789befa06751483bacfbd8b4c27af29147de73870ad7580031a5ef8e7bf
-EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7957 RMD160 92351c78dffc7861145d07373651af5e00da573f SHA1 c6501f0922baef7378cb53d7de1ea0827aa34a13 SHA256 655a77674c9713d167a7c53ec6257d98ee7ece467aed62436971f8f3c091936c
-EBUILD emacs-cvs-23.0.9999.ebuild 8896 RMD160 255c7637892316c0e6248d7f276ff1d575d1db98 SHA1 91c6f18683ef77f2ef96b6de7ea3b02719374e0a SHA256 e2d2a574ed02ef30657c8009d698b301c1cd6d5188fc97b51ce240e07c657f88
-MISC ChangeLog 40261 RMD160 4ed9ea35e9aa3cfdf51030659987a0fc243bde83 SHA1 06c4deb377d6ce5f26d9b54bfcf4cdbcd5207eb7 SHA256 ea03d3a57078aeefa9ec4c9d6458563e36a2d41cce567bbea8176ede12ad1a02
+EBUILD emacs-cvs-23.0.9999.ebuild 8822 RMD160 c0383e5c47d11113483d1dc4a1b2ce47a43bb413 SHA1 9d6c2148ed4c50f5c9734e8e68395020bb0f9716 SHA256 d82a395ee2ba8d63d3f7e68ae6aeecc94bba3239b8a9392c3be6a302ee87179b
+MISC ChangeLog 40514 RMD160 50d563ad1d03eb8e3f80cc82b58118edf8201bb5 SHA1 c6b2ad5e30c1b9a73b4994ab79f75bbbebabd16c SHA256 b7f0d76380802ae2f342abe611df73c69d12bd7c4f7442edc0e17ec9163e6a2d
 MISC metadata.xml 1606 RMD160 f898da13dfc3bdb1636e9ff7bc241997d235498b SHA1 2dea9901bc80a1d91f38628707395d9b4ef0df70 SHA256 f4df95b7db6f7b3375bdd658024520a03a763e75f4ca846ab494609f6094c9bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkimFiAACgkQOeoy/oIi7uyUmgCfcTDEKVurt5lZdXzRWu6d4a4q
-zQIAnAzVKQR2YpkaCxRX/ghyJAJ9wTQE
-=BPmn
+iEYEARECAAYFAkisOX4ACgkQOeoy/oIi7uz25QCffNVZ05ujMo25rrRTEJJ6SKHD
+X7EAoIA54JbSDZRsLb8AAkO//IN6DCsN
+=IOT2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
deleted file mode 100644
index 573869ea52bc..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2008 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.50_pre20080201.ebuild,v 1.9 2008/06/04 12:28:46 ulm Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-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://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-RDEPEND="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 )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
-		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 )
-		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 )"
-
-S="${WORKDIR}/emacs"
-
-# 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%%_*}"
-EMACS_SUFFIX="emacs-${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.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
-	replace-flags -O[3-9] -O2
-
-	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)"
-
-		# 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)"
-	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-	# cleanup, otherwise emacs will be dumped again in src_install
-	(cd src; emake versionclean)
-	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
-	einfo "Fixing info documentation ..."
-	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
-	einfo "Fixing manpages ..."
-	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 /usr/share/emacs/site-lisp
-	keepdir /var/lib/games/emacs
-
-	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]
-		sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 10${PN}-${SLOT}-gentoo.el
-	fi
-
-	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
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| 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() {
-	test -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
-		test -e "${f}" || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	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 "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.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
index de866c200c10..6133335460b5 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.ebuild,v 1.7 2008/07/09 18:00:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.8 2008/08/20 15:34:02 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -133,8 +133,6 @@ src_compile() {
 		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_enable xft font-backend)"
 		myconf="${myconf} $(use_with xft freetype) $(use_with xft)"
 
 		if use xft; then
@@ -181,7 +179,6 @@ src_compile() {
 	econf \
 		--program-suffix=-${EMACS_SUFFIX} \
 		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
 	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch
deleted file mode 100644
index d5e0793aa3de..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: emacs/src/alloc.c
-===================================================================
---- emacs.orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4522,7 +4522,7 @@ mark_stack ()
-   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
--#ifdef sparc
-+#if defined(sparc) && !defined(__FreeBSD__)
-   asm ("ta 3");
- #endif
-