Upstream has changed version number of emacs-24 branch to 24.5.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 24 insertions, 14 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index ad5303055876..0e478ce86c2e 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.189 2015/03/08 18:28:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.190 2015/03/29 12:32:46 ulm Exp $
+
+*emacs-vcs-24.5.9999 (29 Mar 2015)
+
+  29 Mar 2015; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.4.9999-r2.ebuild,
+  +emacs-vcs-24.5.9999.ebuild:
+  Upstream has changed version number of emacs-24 branch to 24.5.
 
 *emacs-vcs-24.4.91 (08 Mar 2015)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index dd642d589997..79b9f4224c1c 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -8,23 +8,23 @@ DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b7
 DIST emacs-25.0.50_pre20150228.tar.xz 24749116 SHA256 8e442cbb27e0b39aee9ebcd981512870a7030ecdd4f7941c3ea43dfbb0635635 SHA512 a9f3f3fe5bb2d662c06317c630af40c48b47b33f5cfdbc2a3fa592ac27cb9b9e1c91524326def931b931fc4a35056bac45b7836e24e550088965783dad2c3188 WHIRLPOOL 9349f8f94873a2addc75af295852434a6609bc88f2acb9ef45b24947a8d5f2b058b2e3a0d461eb2ce34816b4895225fdbd939c4ed366608949ca13c354a74185
 EBUILD emacs-vcs-24.4.90-r1.ebuild 11527 SHA256 af9d6a9607e4bce9eddd909ed0ff1fe2a3e274aa55f0daef6600f324b77c53ef SHA512 7ca61abd79446fad970deec4779bcf153c9e10b1f28f5f19156b24913aae6074a507da069d1e997a4b141b2dbf60b0479b3ea47cd7427eb775eb2ac82213c335 WHIRLPOOL a30bd9527d65df834e21739c75b5ca21e387904931d0b6cf444f4e6e2caf5cb44cfa3c04ab73c67369f41a93967614cd0f0e48cafda34b0e945809c724e8db09
 EBUILD emacs-vcs-24.4.91.ebuild 11524 SHA256 cda2e2c3fb34ad2d89725d3bead5bfd35bead98de2fbbdfd07035124709d2ba3 SHA512 a3d19d8aa284e4033bd2a36537d2d8e3847a617b9e090cac4d945cff781332a11bc47896cca01949ec504f46895e9189ede494e697c4ed1189a2c5cc6541734c WHIRLPOOL 3059209b49730871daed9124f55cd05379644d88409f08a16b6d246a7a30b0a69dd8ebb690024c43a5ba487c88613e4729047f063744e978f2e11ea8cc301cfe
-EBUILD emacs-vcs-24.4.9999-r2.ebuild 11456 SHA256 d506a7c926f276a4c1da9b3370b9819e1a98b36c10f1212b68224638c5babb12 SHA512 1e7f6541525d6f794f5f65f2eee3b035b08b664ac2d03ecd80fb09f1bb0399caca4c192fd0396159fe0616548954aa48839daa5dbe0ca212c557fcfe84ae4b9a WHIRLPOOL e6f8a303aad8c2874b795e1ac9510389b9fdcc7b74caf9db803f9c8838b4322573fb67a42f9b972b4dce04eecf1656de429f39a2fb48d78011b530bb833285ef
+EBUILD emacs-vcs-24.5.9999.ebuild 11576 SHA256 108a94eb332896071d40fcaadfd5c42a6c5a9862c6f996be6c56195f90e52747 SHA512 ae34bc023add66aec6280f52a2eefc0874242ee5a383d325986e83310c2506ea4780cffc6733aa1b0adf3d71b9b01f317ef94c84139f083455e40288a328d1b7 WHIRLPOOL 6c66459924a825a4122d56cbe2d038435bc76b4da9cd21370bb49352927061948c4a5d7cd9da701a0d44b66b81e4f804e0025af5e6b8842977b0d5993b0d20a7
 EBUILD emacs-vcs-25.0.50_pre20150131.ebuild 11462 SHA256 d694f7c745e4fe0bcbd32a2ed2bcd390493db3c84387ad58ac6d1a0bda3b5c72 SHA512 76bccb3cbf8a1d2339011d4f5a5b973c388c823d2372731ce3d067b904accd645ab8d05f03041cf609c647375544f06afd2405ba62e1193ca008c1207df8e567 WHIRLPOOL 9d4b6581f030958af6d849242d3dcbe5c9f3bab5544c93874a50fff3ba618cffd460a27eec435da16071df167741afd99796694c98b1c34dd0edccc3b3c3f535
 EBUILD emacs-vcs-25.0.50_pre20150228.ebuild 11462 SHA256 a825ead7b98aeab6b375153e5c6358668307a3b08785d03d6f06174302529ac0 SHA512 63ccdb4ce9105d39576e9a649c7eabec3276a74721417fa3236f67d368129c3bcc5acb9ffbdaa8de008ff2aefe914dd187ae2f304ff863386e411bbd26a61b02 WHIRLPOOL fdc0d15de1d63a7f95bc8aba8ac6cfc0475735172bb9e73f51db12239c0d9f4083a39630624d782053d9eb95c45aca840af62ab5f2eba9b2030d848e2e805b63
 EBUILD emacs-vcs-25.0.9999-r1.ebuild 11455 SHA256 9bcc9c4a9a8b6a10e98ec4a86a473ba40d25d33db98e27f1f12d2ec3b0655823 SHA512 9e1b3124fe5d95b96d249ff72153a4f49fc36fda3b846d5498ebe03253227aea2cc84cc46a66427ba3b9e1fd9f465847d47bc541a8aa35b60cfdaeb7c38d4536 WHIRLPOOL 23b7a8fccef2599aac210d6efd970f6d652d414885ab86537414c146298cc77036c0c892202123a64b56835948c40a437db71c402b199725c5dc5e16e74a57a3
-MISC ChangeLog 83958 SHA256 46c388de0af97db42c3ccf3530eda13203eea21ac4e631142005583982e4f83f SHA512 3fbeb635cbb860f7a80b6c0da50b988552914f5b15b122b5d347cd5ff183c22c5645194eeb47ad557cbe55c20a548807e47fec765c415f5ba0bf2ece70a61ada WHIRLPOOL 19566063c3dea9004f82a28846ff5ea356045e2703abbd97246b34043e25c54f02fcfc4d3bf3b53ab00f11823bb7e9390b5ecec907f94511ae9fbb55d9e089c0
+MISC ChangeLog 84171 SHA256 605d644879bfafa7f9412c1bb08a659b1d7e4e502146c08c3b25ef5f6e285b75 SHA512 740eabe6af6f8abb1190727586cd71c0f558a083e421863ba18f47b7b839c24ec90b5dd999eca3d24ed72a4128bf8214379d67db80b83c9e848d10379145efb0 WHIRLPOOL 60e99fcc7ff1c0de7a08e44f61f1c42ae9b9bf1b554a7ad91514ec8ad58a867ac15ecb645f16d33a17add32bd9625bf3409b6f82cbb05256d2785010d24a4c44
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJU/JTCAAoJEJQzkH1pP7W4/M8L+wWj6Z3YpBznJgPUjupbsLGt
-yOCiH5Tx0ShX3LCenXHO3TtSDMYfxrlIxTyuyzfKd2UsWBmO+ywknR6ndV/KDVqQ
-S102zfVnth67vc4TUCrWzjRpBuSB3SrD/3c2tqxV07WPXoiJvIGivFbwbSGRlZEo
-mFpQnpZxPpManqMnyqgfOuxhiezYzUkEUttu1OLJh4gDB+hyjoSdcLOkbEVeiF6C
-N/RC+NyFDs/f4988XI8TKP6edToqA4B0TjFAKbau+zLYcxz9Nh626U8pu/Fgoyay
-Clb5yKJU11DIgx34IHE48B1CRnXLtGz96GnR5hpWlHnullIZmKHVR5ok6/PSkjUK
-keiaSt/dGtO51gen9vBJGAL/rCd+yXqMBjnlOh2A+ppBay7eQKXqamEOyNoEdnLf
-NP/feSg+8ufQFFY8q03WDjDIWLYrFkWBfNdIhPW4bafNVxBpVR2GzSj63zaFOZMj
-ldkUgZs1o9mcddFnTBoAARez9oXDKI8mrgGcAyLpEg==
-=sU3P
+iQGcBAEBCAAGBQJVF/D9AAoJEJQzkH1pP7W4EKsL/RRxbMNyMXDOF85jdMLY+rgq
+86b2WJozDNGRES+/ryPooqumyQ8k7b5W8YDMbu0/OMoySSNUznJYsWl/M8om8TpI
+sBFFC2eXAXAt91OFtqMrFKzCybmsqhRIPbz5UfToVt10oiyg8Z5usKDj0j+zhl64
+Q8sKViSSpmiaNJRtpWtYc0owFWPgDDPuA9BSFpuQ6vuzyo0ZU2phUD+wJDlU3sHE
+jVO3ZNSTfjBHc5YZy/0NWj3WHFUKOHgbQ8y6aWygnJjxqfyUl9MbhCui7FbBjjLb
+9fjUb6RxHZDRbWIYHwgsIyYH2xr9ezSNh6/dWt/a2TOElSaNxJNUWl5pFD3FpbQE
+BQntWPxlKrTbQRwL2Eyjtl5ycMlbCJxzxfeBldsOwybteJfHitbTiyuVNcCkBBk6
+48LZibnhgoGjYePVv0H/yXpAWw9jVLuMvjtHwGs7Jo4j/zHxrjN0R7yoKVslZgGH
+o9YKX0h/pNLotDfPuXfi2FX+jh9hDl4WlyTHC+KvSA==
+=yKD7
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
index eb6f0d004796..5774faf6ed60 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.4.9999-r2.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild,v 1.1 2015/03/29 12:32:46 ulm Exp $
 
 EAPI=5
 
@@ -95,6 +95,10 @@ if [[ ${PV##*.} = 9999 ]]; then
 	sys-apps/texinfo"
 fi
 
+# temporary blocker, because the emacs-24 branch installs as version 24.5
+RDEPEND="${RDEPEND}
+	!=app-editors/emacs-24.5*"
+
 EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"