Unify ebuild for both live CVS and snapshots.

svn path=/emacs-overlay/; revision=1257

4 files changed, 42 insertions, 31 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index aef28ff..2486169 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -5,7 +5,7 @@
   23 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
   -files/emacs-cvs-freebsd-sparc-1.patch, metadata.xml,
   emacs-cvs-23.0.9999.ebuild:
-  Sync from Portage tree.
+  Sync from Portage tree. Unify ebuild for both live CVS and snapshots.
 
   05 Jan 2009; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Drop description for local xft USE flag, as it's global now.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 9136d0d..c29cfb6 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,3 +1,3 @@
-EBUILD emacs-cvs-23.0.9999.ebuild 8732 RMD160 6c88b1672b39f7bd7a597f976c791336757be2fb SHA1 a82efcb62c3f9051abc0c2d9a11a2e2d69fbb3ba SHA256 372de4b22053310edb135daccddd58424bd73f0ec9f1bd62ace5526104c6739c
-MISC ChangeLog 1983 RMD160 2c132e1d7b3d44d93f520aaa0a7cd8ae01e62faa SHA1 7518f9080e8af03487dae2946ad77601dcb5e9de SHA256 4882d79d53d5de4479e359941519e38b02a3a99b89e8fae73b46a048dc00c429
-MISC metadata.xml 1529 RMD160 1e4a6c8f33b5c5007453b6a374db9d46077d6a3b SHA1 923a08f042ef9e5a1305d90bb4f26c3e06719705 SHA256 d1e2464bc38a14bc0c0f8051ae39b5177b3619da4128a490a9a0fdbe40d17932
+EBUILD emacs-cvs-23.0.9999.ebuild 9063 RMD160 53f7ec923ae50459f56320aa3ecf7dbadf2d77fb SHA1 77a11191f817630913a1a3e9f71b0bdb343ad9c5 SHA256 085b0d1c4d2366625d247a507510e2bc18d7ee527ede8d2c312035a2f71ea9af
+MISC ChangeLog 2029 RMD160 16b16253eeda36ff52ec1c6849ffa4774b5fdaab SHA1 2f32ecd0eb548dd0b7d081507e7f50fa5f1f0598 SHA256 7fa67b72cb728a079192b9312adf8706775b3e02fd15424d54f481b576663a7c
+MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
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 2c02ff6..fe6db9e 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
@@ -4,25 +4,37 @@
 
 EAPI=2
 
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-ECVS_LOCALNAME="emacs"
-
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit autotools cvs elisp-common eutils flag-o-matic
+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="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz
+		mirror://gentoo/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/"
-SRC_URI=""
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C"
 SLOT="23"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
 
@@ -66,24 +78,21 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
 
 src_prepare() {
-	# 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=$(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
+	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
 
 	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" \
@@ -181,9 +190,11 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-	# cleanup, otherwise emacs will be dumped again in src_install
-	(cd src; emake versionclean)
+	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"
 }
 
diff --git a/app-editors/emacs-cvs/metadata.xml b/app-editors/emacs-cvs/metadata.xml
index 9affa72..73f87a6 100644
--- a/app-editors/emacs-cvs/metadata.xml
+++ b/app-editors/emacs-cvs/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