Store version information in system-configuration-options variable.

(Portage version: 2.1.11.1/cvs/Linux x86_64)

3 files changed, 15 insertions, 7 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index fedb84b6f2a6..b6fdd32d65e5 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.495 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.496 2012/06/24 15:12:02 ulm Exp $
+
+  24 Jun 2012; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r3.ebuild,
+  emacs-24.1.ebuild:
+  Store version information in system-configuration-options variable.
 
   13 Jun 2012; Ulrich Müller <ulm@gentoo.org> -emacs-22.3-r9.ebuild,
   -emacs-23.4-r2.ebuild, emacs-23.4-r3.ebuild, -emacs-24.1_rc.ebuild,
diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
index 07693372de85..8425a1852b01 100644
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-r3.ebuild
@@ -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/emacs-23.4-r3.ebuild,v 1.2 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.3 2012/06/24 15:12:02 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -174,6 +174,10 @@ src_configure() {
 		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}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -196,8 +200,6 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/app-editors/emacs/emacs-24.1.ebuild b/app-editors/emacs/emacs-24.1.ebuild
index 006b598681cb..44605eedb0c4 100644
--- a/app-editors/emacs/emacs-24.1.ebuild
+++ b/app-editors/emacs/emacs-24.1.ebuild
@@ -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/emacs-24.1.ebuild,v 1.3 2012/06/13 17:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.4 2012/06/24 15:12:02 ulm Exp $
 
 EAPI=4
 
@@ -178,6 +178,10 @@ src_configure() {
 		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}"
+
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -206,8 +210,6 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	# set last component of emacs-version to (package revision + 1)
-	touch src/emacs-${FULL_VERSION}.${PR#r}
 	emake CC="$(tc-getCC)"
 }