Version bump.

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

3 files changed, 61 insertions, 10 deletions

diff --git a/app-emacs/magit/ChangeLog b/app-emacs/magit/ChangeLog
index 0d4e4912f723..ff39cfeae6ab 100644
--- a/app-emacs/magit/ChangeLog
+++ b/app-emacs/magit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/magit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.15 2014/08/09 10:42:50 nimiux Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.16 2015/03/25 10:58:24 ulm Exp $
+
+*magit-1.2.2 (25 Mar 2015)
+
+  25 Mar 2015; Ulrich Müller <ulm@gentoo.org> +magit-1.2.2.ebuild:
+  Version bump.
 
   09 Aug 2014; Chema Alonso <nimiux@gentoo.org> magit-1.2.0-r1.ebuild:
   Stable for amd64 wrt bug #509736
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index ff65c8e0df99..651c62711942 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -4,17 +4,22 @@ Hash: SHA256
 AUX 50magit-gentoo.el 77 SHA256 f3c97d1e80e018ed8338bdb9d1f7a0b8be54ad3e84a590680c2bc0422dc3caef SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 WHIRLPOOL b84bb8d7ca0343774c19c7d604778cd7d01fff37a0d5cc15696002ef335f2acaad21a96084e86d539b13c2a4f589a20b83099170d2a0bf8a67627b07ba98cebc
 AUX magit-1.2.0-delete-directory.patch 1315 SHA256 b283b6742c045cfd0acd92d74450adb4f0aaf72eeb21a3091dd572c2b485ced7 SHA512 498d1d0a48709e72c1023b3254019c035c42fbad6f43ae8312320e28180d7a81d8f4c5f14d59e2faa6e167494d2b6e2b6420b0883f2c52542c0377d6b6c8ac55 WHIRLPOOL 53557bf1c929929b3e7caa7638bb336f7ce4b4587a20b9f682c505dfb9e7f74bee97aaedb658ffba0607f34f1bea2fcf595e7a6d3dd179d682ca4c0d2c5b86d7
 DIST magit-1.2.0.tar.gz 163318 SHA256 ef535819b8ee32c53ad38efabc82028f62422f2629407d69ddc5970669dc1ba9 SHA512 3f673d38d9f73cdf653108184ed97c1d499492224be3925949ffadb3bb6900a9be664c773dae49da696c6e1daa8bbb70d7446a9f9d7f9a7f8714ca254ed02c3d WHIRLPOOL 0462ea59ae75c01992d6d7dd17783ab4c60c335c17e03a8791be0771caf54d6a546a84c0622f2c1d45d1231a8d2638fb936bff31c94aa08a10d2c98e5986e4a4
+DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
 EBUILD magit-1.2.0-r1.ebuild 1126 SHA256 67fb8784df391e0c11c626038587ffe0066193c37845a69d0169c779a4c122a0 SHA512 8e34befab1f721f37c381ae8bee2956445a1659de172cfdf26a7aef458653a3cdb5f4888280d0365547968065c268cc4d919a1c560943987ce06fb22ee2c8db7 WHIRLPOOL b771ab764e6452d894943c43522b7ab249bd765a9e4e1433f2394ba3d61d4a08e36abadbfc33645df6e330a985b561873e37bde4e8f309a161c12912ec985ff1
-MISC ChangeLog 2416 SHA256 fd78a3da2d4039e155c58c49d25779455adea885616fdfb10e7a18d2d97bc3bf SHA512 21f87e5dc8174064a7e2ff79f2869c1fb6d0140809ed79ff87d8e4484cd93e5ae67afbb22a235c8ce23dd0121b2753266236ebb36b17827a4fa15bc5dd94b16d WHIRLPOOL 4caf2ed539086442100f3b090aef924b94737a5e4ea0cbd4bbf3711b0a1adb150f0b7c4e8804dc163f5febfb909183261c4ee82874f21a0f288115decd91d494
+EBUILD magit-1.2.2.ebuild 1071 SHA256 5e5519749a4629b3fc471ed18940e0767e452d015ae255c4984516b90982ada9 SHA512 70589c3dab812932b2718fc6f3c512badd998ed562e9497c210efd7f446073c786f9c56dbc0575d17a44a8caeb0a975949ba3eea96fadd2ea61b6583a6bd1fac WHIRLPOOL b70573b3e516d71fb9966abf164122eb41b81f33fb70d1c7b6faa5013ad7db5693fc6c62f652d6dcfb8c78abdc6874904582f774f11b2a80d5093af640a20585
+MISC ChangeLog 2526 SHA256 5db42259e8d9742881cce6bb70dbce0c8863a5c5503a4b37e25121f6236a8c80 SHA512 5328a93d61bb89eefab828f4405e6d8f48d1ad06d351ec9bf67d1a05c77878288589e0e271c67002a720c438d6d9de7e946731d0ea6f1c83b81c4169c2b87086 WHIRLPOOL df3e4f74df278e063f83f05c361bdb76f963ca8d58daba7c92e683c1f24087ce169db1b1be82b89af4bb7184469a8ce730bb3783d940de1a04fac9947143cf22
 MISC metadata.xml 687 SHA256 fb8fe91baf6aa372bc0b888f7f1714cc8b315a8c51f19406981df02840a33399 SHA512 3b455d672fff7a9d8142cb22284863e545246ed940223b4b714f40833c358cc188ac1764dc355a7f23a37a890d4d89a2d6734794baf748e0a35470deddc2befc WHIRLPOOL b86a97a4694c65936518b9caf8da015f6b123e1d6df9384d3b4f1403305cc409f224804c34a6e04469d322da81ecf3bfa1ce741fb2fdd5789ee09d58f79d255f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT5ft0AAoJEA2sAkrWKOU2B6sH/0nmLKuA9cK+54TITWkaaq8r
-8IES1ZPgqJaP2R/pOO3PuyQA6dtyg/EwsuF12xdoPgmPIJSpqIqRco+TaNKPIbvn
-GZW5j7x9ukyHc9XDj1JVbYorKlhoxhK8zEyOsZ+/WoXIGL+bMDZ84V0c820jEJsA
-LK9qjazwpfG8hoOBuail0XcU7TrHg7/PCxBZWehbEUMsWRdzVyLQdMZc7b/0V/So
-sNw9tkQgvSo58qXbrWJ3sjslIgtjUcdebvh/yKPkdyJmp7CgIfPSGZFUGaDfWyRL
-exFv4uGmDJ5TgbqifQBW/vhQTP4HKgFRL+bAlS0Uno7GliTtYiBGmXj1gv65T6g=
-=DcEh
+iQGcBAEBCAAGBQJVEpTbAAoJEJQzkH1pP7W4GIkL/3b24UJFcrrn/fbqBexG9Kkd
+HyNhVlRQZKy7G/koKSkdKYk8+CDx1rWD7+f4NfnDzXEhuXm1TTGHc77Z57umqd20
+ZGte8aZ2PDVWHGH61eXJwsHP458mK6QTAJQKKEaHs2XK4ZWYLAuehgqobT05cCNI
+oJ9LjCqWVCGQHODYd8yqH9GFH2qkquTHgiTNSHRyNJcMUgoxLUBHUG/Fn5sU4jB7
+cul/Epubpe1lHueXAyz3mRf3QvPmwGom9c1g0EYMLOWUzaFtxyGxmY3lcNSjvOG/
+T6Xd4O1OWb1YE2Pi3AUn59BpuH4sonaZyN/DaAdsra5Quf1TedfnSqtNYeBOcoQj
+LusEzxJdMh8msRP/ph/Xyd7iF3EEJVVoLRt7t9fO+taMUDSrYug5zzasYdTnXxvp
+DsoB/Vx5imk6UGiq9DRitE0An0WhGJ1fUA1jGeXg8tI+fHA4jt4Dmp38ktl8i+nP
+o33+KSJdeIEE7dhcmC305tb+1YCVbibOctYfMfnG5g==
+=R+HE
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/magit/magit-1.2.2.ebuild b/app-emacs/magit/magit-1.2.2.ebuild
new file mode 100644
index 000000000000..a5236e78e93b
--- /dev/null
+++ b/app-emacs/magit/magit-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.2.2.ebuild,v 1.1 2015/03/25 10:58:24 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for GIT"
+HOMEPAGE="http://magit.github.io/"
+SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="contrib"
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	# The upstream build system ignores errors during byte-compilation
+	# and happily installs broken files, causing errors at runtime.
+	# Call elisp-compile, in order to catch them here already.
+	elisp-compile *.el
+	emake core docs
+	use contrib && emake contrib
+	rm 50magit.el magit-pkg.el || die
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo magit.info
+	dodoc README.md
+
+	if use contrib; then
+		elisp-install ${PN} contrib/*.{el,elc}
+		dobin contrib/magit
+	fi
+}