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

(Portage version: 2.1.10.54/cvs/Linux x86_64)

6 files changed, 52 insertions, 52 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/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>