Version bump, bug 444776. Specify LICENSE more precisely.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

4 files changed, 47 insertions, 5 deletions

diff --git a/app-emacs/magit/ChangeLog b/app-emacs/magit/ChangeLog
index d33e7f11843e..bf9e78d4daf4 100644
--- a/app-emacs/magit/ChangeLog
+++ b/app-emacs/magit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/magit
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/ChangeLog,v 1.8 2012/11/26 11:31:15 ulm Exp $
+
+*magit-1.2.0 (26 Nov 2012)
+
+  26 Nov 2012; Ulrich Müller <ulm@gentoo.org> magit-1.0.0.ebuild,
+  magit-1.1.1.ebuild, +magit-1.2.0.ebuild:
+  Version bump, bug 444776. Specify LICENSE more precisely.
 
 *magit-1.1.1 (02 Apr 2012)
 
diff --git a/app-emacs/magit/magit-1.0.0.ebuild b/app-emacs/magit/magit-1.0.0.ebuild
index 234defa85966..c612fe26c6d3 100644
--- a/app-emacs/magit/magit-1.0.0.ebuild
+++ b/app-emacs/magit/magit-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/04/02 17:54:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.3 2012/11/26 11:31:15 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ 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"
+LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-emacs/magit/magit-1.1.1.ebuild b/app-emacs/magit/magit-1.1.1.ebuild
index 27a011545bb3..d1820646d88b 100644
--- a/app-emacs/magit/magit-1.1.1.ebuild
+++ b/app-emacs/magit/magit-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.2 2012/11/26 11:31:15 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ 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"
+LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="contrib"
diff --git a/app-emacs/magit/magit-1.2.0.ebuild b/app-emacs/magit/magit-1.2.0.ebuild
new file mode 100644
index 000000000000..bfa88a4e2729
--- /dev/null
+++ b/app-emacs/magit/magit-1.2.0.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.2.0.ebuild,v 1.1 2012/11/26 11:31:15 ulm Exp $
+
+EAPI=5
+
+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="50${PN}-gentoo.el"
+
+src_compile() {
+	emake core docs
+	use contrib && emake contrib
+	rm 50magit.el magit-pkg.el || die
+}
+
+src_install() {
+	elisp-install ${PN} *.{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
+}