Specify LICENSE more precisely. Merge changes from Emacs overlay.

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

4 files changed, 71 insertions, 15 deletions

diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index aff4e9af8cf0..4e1ae9918234 100644
--- a/app-editors/mg/ChangeLog
+++ b/app-editors/mg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/mg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.47 2013/02/28 17:04:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.48 2013/03/20 17:20:50 ulm Exp $
+
+*mg-20110905-r1 (20 Mar 2013)
+
+  20 Mar 2013; Ulrich Müller <ulm@gentoo.org> mg-20110905.ebuild,
+  +mg-20110905-r1.ebuild:
+  Specify LICENSE more precisely. Merge changes from Emacs overlay.
 
   28 Feb 2013; Ulrich Müller <ulm@gentoo.org> mg-20110905.ebuild:
   Don't call pkg-config directly, in order not to break cross compilation.
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 55757c9de4a8..3a1fade0eca8 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA256
 
 DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
-EBUILD mg-20110905.ebuild 1072 SHA256 c7e3fccb301edca20ecbb29142d990136d9c143870764fb9b1a8723923b98857 SHA512 348970f01a02b0ef38e853ccbce8fd7231b8e1451ca8ba5f4bc2e89748600c939ffa9a3c85060f21a9bded860dc96c8dd737deae6c19236d3d7264f63e582424 WHIRLPOOL 2b0854d9b10043b854c7983a3d5a3d6027ebc658a31de3675844aad1c607828853654ba63d30859fcf479d18762725cdb5cc3d3e0727b0d94c12513af69f0f84
-MISC ChangeLog 5420 SHA256 51faab1e348483a1744579ec57f4d873595c2630d3f53cd64a93a50c822ca628 SHA512 96d7ca9699e981fa4d4c36b43545a01daedd43ea39feb0ce4558e809948f87b483c817d29720cc371ced15e981372414c3406e60771a487d5bb891f71a229466 WHIRLPOOL 512e42046750441d53ace226d1e86c66ba665924656f7df8500c2297f04e69dcac60136161e86ff69b5436619113b25d81f6de89a3a9378747cabf41230d095c
+EBUILD mg-20110905-r1.ebuild 1225 SHA256 98b384bb33f7986c1bedc083462ee69c2469fe35922d0a3e718c3a2c329ac9ed SHA512 c623710125cd744522d0d4bbdfdd9de24425164670beadb61d870d7e4daa11ea569c2066f9bb71ed4a8ecb7905b3c04ab544cd0797ca2e0268db0f84a6b4657e WHIRLPOOL e5ab79dd44cfc79b31acfbc2835997110aea403ca6a436759d1b4af0accb22392a8fd0c3d913eaf5b80142496193e5c5a53c669fbbcdf9aa9517a1ae5dee44ab
+EBUILD mg-20110905.ebuild 1076 SHA256 40fe62370f9155da1dbb81248b9552606c79f9a214ec24436e2eb780b0d7ce40 SHA512 05589cf736d2a7cfec0ce7d7721f776c93c3bcdc97a2a412e002d66b789c6694da64c35f3cc94d8d2e8949b75ffeee34e32d8ec3fcf735e08a722a8ea931326f WHIRLPOOL 8dacad84fc5f45dfbe687e1b83d777852fac5dc236e2007c0827fcbf587a6b8c51b3454d3bbf971e452fcd34683d44c804cf35e6ffb725eeb947f70144f2b2ea
+MISC ChangeLog 5613 SHA256 390949dc14010bcd27d4cdb9c278cbb4338c3482b63c7fd782f88e7bbe4f0190 SHA512 56124760711dd1b1c154798bd5fd2329093315915d1b44ad00225e10c8790f3464e6ab9c2d01149763f5d2f238ca1b1321f4155ada9a2db7a01f8f65ba9b31e3 WHIRLPOOL ec76863c7e21437abacc83b9dc4939c269548db7a7653f8914bc36abad18422acac614e9d4a0616e6391d822fa7d5f724f37a581066c53379c3d34b191bbd232
 MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRL48ZAAoJEJQzkH1pP7W41FEL/2FefHbSzCjYFPi8fmBKBAqH
-f755ie/nGIgA9YLsTLHCYXGC+vHv8KCTlVsYfP7qWCndJsMo22KzRgebSNKIWBRG
-M4bp5d50SyPJ+eksbhRZCDj4mo8Cjl/tlF1npxg0+OD7h1JBOiLPwfdptpf6OyGe
-ltq8lDswS96NxIVpaJEjT4FjHkBUWlrY/pSK06QNqsWqTFky3a+fVP5pKB30Q9se
-R//sohk1VINqJmdxG5EyCPt6gnKJUFQq+/0obk3h2B+QsM7PEtXb75t85rV7ttGt
-upF/fbx64LGCuDpcvxoaauU9bA9+NQ6I6CV79fCT4PAjTSNB/8w7wJdOo9hCsapA
-TD4JjC/ir1MKKSj7y4ummcoXaCJp3zETqAFXw86zFSE+6CLJ5R1QkXgHozRyTNNs
-waBwaQeJmH41RucwgwwXH2lE88RiPRyb9jqhg9jcBUjVt8kav95tzRrg1gY1AiYx
-WBlR27ikN46k9yYGBTvdY01pW97je3wo2oQMLguv8A==
-=nZ4G
+iQGcBAEBCAAGBQJRSfAEAAoJEJQzkH1pP7W4n0EL/RjC/jaIgEgL619ii8YvHe6c
+WoBKpzU+Zgtei+bFL6oqDk6WYeSp+41r8ZHv/VhUtd0Ols/B1X5A7+bWKYxICem6
+1yE8+tZKEhEo4InRCw+WqwYDc5d91RcYiR6ApEqmzDKpIWAExBS5Yu5xGdFSU5Ro
+1Blbqu0UQEs3TC7192WRX6j0ymNcaJ6QoTUQq3lKMZnRR+6S3KfpOwcPGpGlMTNp
+zMhDPTN9GtmkgDX+acd0ZmUeCNw6yovE78NF+4SDjzS6WfwJqS+pqDuwRzsELVQ7
+6+2ix0LHv8RVohXntZ8Wy/lhIA+XuOHdOBlGSTLCDjmslA06/E0hJ/t3cQkozrxe
+OnUhl3N3K2rCVF8cym82/zXqwTXMV/rHzlhnCX1WwGLgBcOEmq7KBAz7+Cn5qBXV
+RbUqRLX8FON3h4Eja2zFMtVKyeXhIbogALXAPcfcIIIrp4ppkROoYH/cLDZUFcv8
+3T//WkfLmSpihraNbbFwt4KP4EKTvPH38p88JrqRvA==
+=VGsk
 -----END PGP SIGNATURE-----
diff --git a/app-editors/mg/mg-20110905-r1.ebuild b/app-editors/mg/mg-20110905-r1.ebuild
new file mode 100644
index 000000000000..19b9a833cb9e
--- /dev/null
+++ b/app-editors/mg/mg-20110905-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110905-r1.ebuild,v 1.1 2013/03/20 17:20:50 ulm Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="http://homepage.boetes.org/software/mg/"
+SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+
+LICENSE="public-domain ISC BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# remove OpenBSD specific easter egg
+	sed -i -e 's/theo\.o//' Makefile.in || die
+	sed -i -e '/theo_init/d' main.c || die
+}
+
+src_configure() {
+	# econf won't work, as this script does not accept any parameters
+	./configure || die "configure failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install()  {
+	einstall
+	dodoc README tutorial
+}
+
+pkg_postinst() {
+	if use livecd; then
+		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+	fi
+}
diff --git a/app-editors/mg/mg-20110905.ebuild b/app-editors/mg/mg-20110905.ebuild
index d4adb159596b..0d83334a66e8 100644
--- a/app-editors/mg/mg-20110905.ebuild
+++ b/app-editors/mg/mg-20110905.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110905.ebuild,v 1.14 2013/02/28 17:04:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110905.ebuild,v 1.15 2013/03/20 17:20:50 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
 HOMEPAGE="http://homepage.boetes.org/software/mg/"
 SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
-LICENSE="public-domain BSD"
+LICENSE="public-domain ISC BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="livecd"