Version bump, update HOMEPAGE and SRC_URI, bug 410521. Add contrib USE flag. Remove old.

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

7 files changed, 71 insertions, 63 deletions

diff --git a/app-emacs/magit/ChangeLog b/app-emacs/magit/ChangeLog
index 3eef06f380a6..d33e7f11843e 100644
--- a/app-emacs/magit/ChangeLog
+++ b/app-emacs/magit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/magit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.6 2011/04/17 15:32:02 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.7 2012/04/02 17:54:02 ulm Exp $
+
+*magit-1.1.1 (02 Apr 2012)
+
+  02 Apr 2012; Ulrich Müller <ulm@gentoo.org> -magit-0.8.1.ebuild,
+  -magit-0.8.2.ebuild, magit-1.0.0.ebuild, +magit-1.1.1.ebuild, metadata.xml:
+  Version bump, update HOMEPAGE and SRC_URI, bug 410521. Add contrib USE flag.
+  Remove old.
 
 *magit-1.0.0 (17 Apr 2011)
 
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 3e3c2d7fb308..281fd6cdc505 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -2,18 +2,26 @@
 Hash: SHA1
 
 AUX 50magit-gentoo.el 77 RMD160 689d5f5965bd37f73345f4f39bc27585053f13fe SHA1 831bd4a97ad40feb1503f4dda723207a4f1ebbb2 SHA256 f3c97d1e80e018ed8338bdb9d1f7a0b8be54ad3e84a590680c2bc0422dc3caef
-DIST magit-0.8.1.tar.gz 211915 RMD160 78812232a3b0a9310c83cadbd01abedb08faca86 SHA1 7c8e6c36146ba71f2f8abad2568c04ec32d3cb79 SHA256 0903a055b0eb3acdfbb439ea5829cfcbd1186120e6d8c7456eae8f4576195fcd
-DIST magit-0.8.2.tar.gz 214803 RMD160 e451d17d3686004886b62b5ea05afdaaf0a8bb1c SHA1 f7d188fa78adee10d1d159199dfa8ef23785f968 SHA256 fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8
 DIST magit-1.0.0.tar.gz 60561 RMD160 bdc7d134883ea06e66fffd9e9a75ec5374bec0e7 SHA1 58773e84870d9d8d1138619e1f3928d1696aa168 SHA256 f87393137f2ddf814dd79e31986289a00357fa479774b4c3b0f19bd440a2cdc1
-EBUILD magit-0.8.1.ebuild 651 RMD160 8c5fc4b529036e927c8e25ec58cb51559c153514 SHA1 2fe9ce98cc5bc9b3a720ed35d2135ff6710843d6 SHA256 5c8db8ba0384b8d9212dd87b3211ec9ac5c08d3404b5960ce88235d17bf13f17
-EBUILD magit-0.8.2.ebuild 651 RMD160 17ad4915d20c22aee0bfc57840c3510cd7346281 SHA1 f8c3f0f8f3d6418b086ffc8fa315e7905fa93287 SHA256 4becac3dcb548930708af7148ded21ae89fde1c89fc5c64569947f5e51f396f7
-EBUILD magit-1.0.0.ebuild 693 RMD160 a231fbcad637f93753a7b1ea8239301902db27d5 SHA1 6f99883b949b18a707bca365fb11c5875e8d122c SHA256 7f0d11cb319a1ba78ac70c5c728ee3102cf73ca40504bf5c17de6d553a9c8c37
-MISC ChangeLog 997 RMD160 6aa245337aaf49063862e558c2f43d4972c47cdd SHA1 33ce2b302c51e70188b7a7baecb19fb74eb1e24b SHA256 c101cbb01d5caefd5025685a6efd0697f4314bf30a116a780d655d2f87d1625c
-MISC metadata.xml 613 RMD160 4db3a1a52e84c907267008f06d94cc7425925777 SHA1 d781e3e19791694d299dc6c751e0f975662c0344 SHA256 98493ba87c039a7b677e21838610686169bd819f96023fda86ab575b2224487b
+DIST magit-1.1.1.tar.gz 97241 RMD160 216dcf8082117cc699ed83a412d9e4dc7622a8b6 SHA1 f490dfd38a7c1093216e1458886ace54560e7355 SHA256 9ffdfddad0023262df6e7ff90a15a3f170e1a8127c9cec848d54d57b63c7e57e
+EBUILD magit-1.0.0.ebuild 681 RMD160 db42952ef27a1498b87d3fdad900bfda1d7ca920 SHA1 5a1a80f570f1e7b1a723e2b26d2385f398bf8ca2 SHA256 7f7653c32fbd4e6a4967cfa35febb3e474d0541da2e7b23c914ed2cb18451cc1
+EBUILD magit-1.1.1.ebuild 852 RMD160 3ed285eeac23ed4daa77a1352b27c0a11e54d952 SHA1 25ae0d38cdf5ba9aba1529469556041c502a3f11 SHA256 6c80a976d5bf2a46c50f03ae314a8b1058ce49e81254645404c66fdfbfd7b538
+MISC ChangeLog 1265 RMD160 86a7ddf546349103592b5b8207916a062cd805dd SHA1 3cbebe2f563f337e26482af6252902504d5bcd8d SHA256 6c62d1515d373e4d0919e7eb6ed2bb11ae7223832e980dd37a6c38858d0bf4d7
+MISC metadata.xml 687 RMD160 036ae4c94639dd5d4c5a1f9d1ba76afb5fa6fc1f SHA1 8d9749bae2ac64694e4d2e2b712e22c8faa708ea SHA256 fb8fe91baf6aa372bc0b888f7f1714cc8b315a8c51f19406981df02840a33399
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk2rCEsACgkQOeoy/oIi7uxvPACbBd172Fne1SqtK/2Gj9ETee0L
-iiEAnRb8+vHwxpdpBZWP3/LR9qI33uLn
-=1weP
+iQIcBAEBAgAGBQJPeeh0AAoJEDxpGckxwJCBZ1sP/1RPgD/HaQfmEXDjXfEk1NtY
+dReUAFYzKux6cnc+ST7LK2pDEXPar+SvMsMF+FZSB2fpGNN0vlAaYlAfUhZlRT2s
+DspXv0b2wrg2at9D5ErSey7aK6aTnqqdF2E5c8Zfatkr0vV7E/ZcfZoR10KW21Qr
+NtJP6hFECGKjZIa2uNHNxuANYyiPWIHPIqwYGYPlO8v/rKTVlFw7FIvtnxkR/ZP3
+AUaC6mfESnWBfVl2odLBPru6bg1frTP8uy2e/XR1Rj+b65huvxaHW7IGsS27vcoo
+OY/wKk+D436q4C9Ne1fkxbRki6xhZMGDDMhutJIZMDjzKsgq0Dsta9KwU1ZIcBNo
+FymddSYlOX0YbfuYtm4eq8oawcWoGoSnrsnAFdSaOZ5qr56iODO7LNcKPLwn1uKq
+Y9VFXXZp1u7BORs668gwFxdPAHesSRiGarWMSbSKp8Jzh/jsGTsfJNW17kMkIFLz
+nkLCi4+EeCiE+Sywn2wsyXkpRmNVwURIe+gUz/4ea2GB18/brBP0uQmXsgNg0+qu
+fn2BR6pQpDRoT2mLZ6RMIB5AwlV3CycfzzfgZc75vvkNGXpFPUKt+LXzoWJChwCl
+mNV2UO7hEpFmDUbvDC9snQ+SqCubC6y0wpiyxt8BQDGrE0IA7hpdpz0ERf0ZOGWy
+oZPygiuaGCBSFUGtAHMR
+=O01N
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/magit/magit-0.8.1.ebuild b/app-emacs/magit/magit-0.8.1.ebuild
deleted file mode 100644
index 4a4f974e0361..000000000000
--- a/app-emacs/magit/magit-0.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-0.8.1.ebuild,v 1.1 2010/06/13 18:08:45 fauli Exp $
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://philjackson.github.com/magit/"
-SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50magit-gentoo.el"
-
-src_install() {
-	elisp-install ${PN} magit.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo magit.info || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/app-emacs/magit/magit-0.8.2.ebuild b/app-emacs/magit/magit-0.8.2.ebuild
deleted file mode 100644
index 86b7d465e71f..000000000000
--- a/app-emacs/magit/magit-0.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-0.8.2.ebuild,v 1.1 2010/07/18 06:25:52 fauli Exp $
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://philjackson.github.com/magit/"
-SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50magit-gentoo.el"
-
-src_install() {
-	elisp-install ${PN} magit.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo magit.info || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/app-emacs/magit/magit-1.0.0.ebuild b/app-emacs/magit/magit-1.0.0.ebuild
index b7cb7bb8737f..234defa85966 100644
--- a/app-emacs/magit/magit-1.0.0.ebuild
+++ b/app-emacs/magit/magit-1.0.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.1 2011/04/17 15:32:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.2 2012/04/02 17:54:02 ulm Exp $
 
 EAPI=4
 
 inherit elisp
 
 DESCRIPTION="An Emacs mode for GIT"
-HOMEPAGE="http://philjackson.github.com/magit/"
-SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
+HOMEPAGE="http://magit.github.com/magit/"
+SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
 
 LICENSE="GPL-3 FDL-1.2"
 SLOT="0"
diff --git a/app-emacs/magit/magit-1.1.1.ebuild b/app-emacs/magit/magit-1.1.1.ebuild
new file mode 100644
index 000000000000..27a011545bb3
--- /dev/null
+++ b/app-emacs/magit/magit-1.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.1 2012/04/02 17:54:02 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for GIT"
+HOMEPAGE="http://magit.github.com/magit/"
+SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib"
+
+SITEFILE="50magit-gentoo.el"
+
+src_compile() {
+	emake core docs
+	use contrib && emake contrib
+}
+
+src_install() {
+	elisp-install ${PN} magit.{el,elc} \
+		magit-{svn,topgit,stgit,key-mode,bisect}.{el,elc} || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	doinfo magit.info
+	dodoc README.md
+
+	if use contrib; then
+		elisp-install ${PN} contrib/*.{el,elc} || die
+		dobin contrib/magit
+	fi
+}
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index 6d207da22393..154ec09c4e81 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -12,4 +12,7 @@
   support for cherry picking, reverting, merging, rebasing, and other common
   Git operations.
 </longdescription>
+<use>
+  <flag name='contrib'>Install user-contributed files</flag>
+</use>
 </pkgmetadata>