Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.1.9999-r1.ebuild
Date: Sun, 24 Jun 2012 15:13:15
Message-Id: 20120624151305.6D0352004B@flycatcher.gentoo.org
ulm         12/06/24 15:13:05

  Modified:             ChangeLog emacs-vcs-24.1.9999-r1.ebuild
  Log:
  Store version information in system-configuration-options variable.
  
  (Portage version: 2.1.11.1/cvs/Linux x86_64)

Revision  Changes    Path
1.103                app-editors/emacs-vcs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.102&r2=1.103

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog	10 Jun 2012 18:34:48 -0000	1.102
+++ ChangeLog	24 Jun 2012 15:13:05 -0000	1.103
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.102 2012/06/10 18:34:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.103 2012/06/24 15:13:05 ulm Exp $
+
+  24 Jun 2012; Ulrich Müller <ulm@g.o> emacs-vcs-24.1.9999-r1.ebuild:
+  Store version information in system-configuration-options variable.
 
   10 Jun 2012; Ulrich Müller <ulm@g.o> emacs-vcs-24.1.9999-r1.ebuild:
   Game score files moved to app-emacs/emacs-common-gentoo. Configure doesn't



1.6                  app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild?r1=1.5&r2=1.6

Index: emacs-vcs-24.1.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-vcs-24.1.9999-r1.ebuild	10 Jun 2012 18:34:48 -0000	1.5
+++ emacs-vcs-24.1.9999-r1.ebuild	24 Jun 2012 15:13:05 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.5 2012/06/10 18:34:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.6 2012/06/24 15:13:05 ulm Exp $
 
 EAPI=4
 
@@ -191,10 +191,10 @@
 		myconf="${myconf} --without-x --without-ns"
 	fi
 
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
 	if [[ ${PV##*.} = 9999 ]]; then
-		# These variables are not needed for building. We add them to
-		# configure options because they are stored in the Emacs binary
-		# and available in variable "system-configuration-options".
 		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
 	fi
 
@@ -230,8 +230,6 @@
 		# cleanup, otherwise emacs will be dumped again in src_install
 		(cd src; emake versionclean)
 	fi
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }