USE flags gconf and gsettings no longer exclude each other. Record bzr branch and...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 19c903df5a404db08de4c0dc15b120ee6ab992d0..83200ac16e08e10b0fd31a7cceef2ca1670e19ec 100644 (file)
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.60 2011/08/13 21:47:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.61 2011/08/19 17:27:26 ulm Exp $
+
+  19 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+  emacs-vcs-24.0.9999-r1.ebuild:
+  USE flags gconf and gsettings no longer exclude each other. Record bzr branch
+  and revision in the binary.
 
   13 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
   emacs-vcs-24.0.9999-r1.ebuild:

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index e4df72a2957231b611bec786c130b988721073d9..2e777cd99488b08cfa99c010c1989457d30c99d6 100644 (file)
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD emacs-vcs-23.3.9999.ebuild 10431 RMD160 afb0652d1be6c3103a0557d0719eb4e8d6380047 SHA1 4df6d303a8cebc611bbed4d9f37e77ac9b157b9f SHA256 1584c67d8679fdb701a884c5467376656d5aef312a7b26c7cb84335226e53bb7
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10946 RMD160 af16a12271ba269e35001c3aae915b33582725f1 SHA1 482c4575e6938388878ede0fbc1e9ab7f34d1399 SHA256 6f2b1949b696c7d9d59229e3e72c4d62fdb37418c6d7c77810f2de2eccb7ad6b
-MISC ChangeLog 59433 RMD160 c32a2269e1ac771fab3664ebff7cc033448878c9 SHA1 63089a082ad80140e4564ad43cff46ce443f3516 SHA256 7f544cf32d19e93c5ac4824326f35a4389c7623174ac83a329d258fac678fc17
+EBUILD emacs-vcs-23.3.9999.ebuild 10758 RMD160 e6309cea48c35c96dbcfe6653cd2b244fb2d88c1 SHA1 e7be2815b95425aeae35464f43e0af5d478e7e46 SHA256 1fa1267eca6445e426b3d318522252fe5106226c00acdaa434d24d72b24ed102
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 11092 RMD160 887770eb1aaecaffb1b5749c683c0ecf371b15a9 SHA1 3064317ff00176ece5f7c7328172cbff8c87a4d9 SHA256 92b209f6b7ff72fcdfa05f49d6e649ea99837e724e0c1531cb278b0f013f140b
+MISC ChangeLog 59652 RMD160 556720192f793bbdce6d6f93738f740c8520ddaa SHA1 d3d9c0dcd030e95988730cd0aea4a248f820af86 SHA256 054fac6a892f9ad14a3eb7e95ac309c15a2c8ecea41d5a261331a6ad396d0786
 MISC metadata.xml 2219 RMD160 59724e54af053aa155ff1079d7971df365088afd SHA1 664d49b56b126e8ad2c64b4415eafcf68e447ad3 SHA256 2d94fccd2d478d91044897e7e5facb4883cb752ea81382e0671a33dd17dce579
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5G8lIACgkQOeoy/oIi7uwTywCgwTB24ytNhhW5beC6G/KKEYDP
-7eIAnj6a3Z+FxVTRcJ4Ezd6hBD7nfwck
-=SIlh
+iEYEARECAAYFAk5OnlwACgkQOeoy/oIi7uy9cgCgjSH/GqkLJ/GtOrscxgLRsIP3
+VOEAn1WG3xKrACg6N9zBp3V4fZx8gaMh
+=ij+k
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index f82aa7b0d9cb12edcd6026f2612d8298290c9cf0..dad39821ff145372d8b485a668c4af0ffc90013a 100644 (file)
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.9 2011/08/13 21:47:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.10 2011/08/19 17:27:26 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -94,6 +94,7 @@ src_prepare() {
                [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
                echo
                einfo "Emacs branch: ${EBZR_BRANCH}"
+               einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
                einfo "Emacs version number: ${FULL_VERSION}"
                [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
                        || die "Upstream version number changed to ${FULL_VERSION}"
@@ -194,6 +195,11 @@ src_configure() {
                myconf="${myconf} --without-x"
        fi
 
+       if [ "${PV##*.}" = "9999" ]; then
+               # This will be saved in system-configuration-options
+               myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+       fi
+
        # 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
@@ -219,6 +225,8 @@ src_compile() {
                # 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)"
 }
 

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
index db14c3eb4cc9211fbb461a1038e8a58513a9863a..759857ea841279b6f6f32aeb8c6f148d23664e1c 100644 (file)
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.0.9999-r1.ebuild,v 1.14 2011/08/13 21:47:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.15 2011/08/19 17:27:26 ulm Exp $
 
 EAPI=4
 
@@ -46,8 +46,8 @@ RDEPEND="sys-libs/ncurses
                x11-libs/libXmu
                x11-libs/libXt
                x11-misc/xbitmaps
+               gconf? ( >=gnome-base/gconf-2.26.2 )
                gsettings? ( >=dev-libs/glib-2.28.6 )
-               !gsettings? ( gconf? ( >=gnome-base/gconf-2.26.2 ) )
                libxml2? ( >=dev-libs/libxml2-2.2.0 )
                gif? ( media-libs/giflib )
                jpeg? ( virtual/jpeg )
@@ -101,6 +101,7 @@ src_prepare() {
                [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
                echo
                einfo "Emacs branch: ${EBZR_BRANCH}"
+               einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
                einfo "Emacs version number: ${FULL_VERSION}"
                [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
                        || die "Upstream version number changed to ${FULL_VERSION}"
@@ -150,6 +151,8 @@ src_configure() {
 
        if use X; then
                myconf="${myconf} --with-x"
+               myconf="${myconf} $(use_with gconf)"
+               myconf="${myconf} $(use_with gsettings)"
                myconf="${myconf} $(use_with libxml2 xml2)"
                myconf="${myconf} $(use_with toolkit-scroll-bars)"
                myconf="${myconf} $(use_with wide-int)"
@@ -158,14 +161,6 @@ src_configure() {
                myconf="${myconf} $(use_with tiff) $(use_with xpm)"
                myconf="${myconf} $(use_with imagemagick)"
 
-               if use gsettings; then
-                       myconf="${myconf} --with-gsettings --without-gconf"
-                       use gconf && ewarn \
-                               "USE flag \"gconf\" has no effect if \"gsettings\" is also set."
-               else
-                       myconf="${myconf} --without-gsettings $(use_with gconf)"
-               fi
-
                if use xft; then
                        myconf="${myconf} --with-xft"
                        myconf="${myconf} $(use_with m17n-lib libotf)"
@@ -207,6 +202,11 @@ src_configure() {
                myconf="${myconf} --without-x"
        fi
 
+       if [ "${PV##*.}" = "9999" ]; then
+               # This will be saved in system-configuration-options
+               myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+       fi
+
        # 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
@@ -236,6 +236,8 @@ src_compile() {
                # 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)"
 }