Include latest updates for macros. Change EAPI to 4.

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

3 files changed, 107 insertions, 6 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index a9005e925892..4ae476cddce0 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/jasspa-microemacs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.48 2011/08/18 21:26:25 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.49 2012/03/19 17:27:26 ulm Exp $
+
+*jasspa-microemacs-20091011-r2 (19 Mar 2012)
+
+  19 Mar 2012; Ulrich Müller <ulm@gentoo.org>
+  +jasspa-microemacs-20091011-r2.ebuild:
+  Include latest updates for macros. Change EAPI to 4.
 
   18 Aug 2011; Ulrich Mueller <ulm@gentoo.org> +files/20091011-linux3.patch,
   jasspa-microemacs-20091011-r1.ebuild:
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 98586c4d5ffe..c634a71deb20 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -6,15 +6,27 @@ AUX 20091011-ncurses.patch 583 RMD160 4cda187fcdb25d1ed0e3d9542730b36bdfbc654a S
 AUX jasspa-microemacs.desktop 282 RMD160 102529b939ee5f4e70f54cd3ca214db23278d9d1 SHA1 9c412a51086b055ac4189aedcabaf5a256d759ca SHA256 9c77adfb1eb77eb0e313add3bc5f1c06d56cfaf1a1d096751d225d3586347c88
 DIST jasspa-mehtml-20091011.tar.gz 628008 RMD160 1b622f7448cc205ca610a35266d0e6b3ffa4ee91 SHA1 fdc75f5d50fb3532ef0fa97d03d9ac19bf4bf3fa SHA256 c106af1a7a1bd5862883ae237ae8a27dccfa30f300944211995658bcfb8621d0
 DIST jasspa-memacros-20091011.tar.gz 1105320 RMD160 7b96c454a89da60fd9c4d6f32628a6457b3a5059 SHA1 a9c28d52573d9edfc6797d4cc035ec74482b22c9 SHA256 a010d51c7a7e8efd19b7f837566569f446dfbda8fe9eda96e45b1951e2f5ddec
+DIST jasspa-memacros-20091017.tar.gz 1105437 RMD160 c9fb40e1a39da3a2c7332dc9653bf4b872eea5d1 SHA1 a467e5f518c48e375d51c25e9309dceb02343151 SHA256 aa23d2bb4d5d5b87eb8aa5a28439ff1bcdd2162c5c14a186b84366c06691aa2d
 DIST jasspa-mesrc-20091011.tar.gz 810128 RMD160 b65816f7704af7b3587ac32f31f7e45cdc66638e SHA1 d252c9d34cdb802a9e890a378462b12a58a2a3c7 SHA256 44109a9118da34a1d026450ec85a3f85d983c4015c97db2b9abbad69e8d90889
 DIST meicons-extra.tar.gz 43345 RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 SHA1 5a196c1bcd3a6a3afaa619b719848f775a3a910b SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef
 EBUILD jasspa-microemacs-20091011-r1.ebuild 2198 RMD160 db34202ff8c6be0d52d0a28a341ea3b7519e1aa9 SHA1 0234abd278186516cf19de2ef91937864ab15d44 SHA256 ee7972edb513d21d34b164e7e2b85e22d091074757021532c099a9395ce74aea
-MISC ChangeLog 8152 RMD160 5646c42a2c34952f5990c6f33602b19b21fa827e SHA1 57529d9553ef485772905cf352d4323aa13a0ec8 SHA256 ad0ffe3d5ee3d46b012217077bdbc9762bbb56dfbee675865c575e9e74008da1
+EBUILD jasspa-microemacs-20091011-r2.ebuild 2184 RMD160 cdc8a5d12a8c90e159af4b8ff4b352342e9f1e23 SHA1 9aaf9e719212dc6d966bbe6bec77a0690f6ef8ef SHA256 af6b438ac90c7cff945b0467246e039a339832d76c10d0b2d8fc51580896bbb3
+MISC ChangeLog 8342 RMD160 4a5556d35187994c49107d63312e86a301bb9a11 SHA1 f47da344822fe8749facf14d2f22c0f39dc6bbac SHA256 528b11e68050bd61f90662e82de58736809d42312ef0ae4c7fc8b86c25a09cc3
 MISC metadata.xml 1001 RMD160 5ee6ad89fad2090878597910c1d2bbc87b16da94 SHA1 5cc031f57eb5092959b28c169c46ec500cafb509 SHA256 ce5887d8c485076c2a80ce19cf9dbef7bba962052758729577832b9a225ef827
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5NhNsACgkQOeoy/oIi7uyURgCeNsBCn/udQbv8qkiIf+KM+CXo
-md4AoLG9lFMgQUCGwBbalJtUI6xlu1xk
-=Phay
+iQIcBAEBAgAGBQJPZ21ZAAoJEDxpGckxwJCBmY0QAIhJ8WtRhMZPCIxaY9EQFwF1
+uoBdPgQ9ijah9S8FOSpX5OJFIvwYn+w1NokWRlB8BnKCPw/6rPINFpgNIiylTDQJ
+LAQbyaW6lDixcN8kkIQ/wSvvSh2b5Dsetu0fp6sXOLtW+sNyt6UsBzBco/QATQMs
+eChQRKc0xRsiyFIiegqRfESe50FjshBwow7/lj6tRp13hIc9RmhVvLktWhzIm2Pu
+WjUylnC2a+MoBJ+q2yIlnj3XhEZ7Y5a1EbmQDecTkzC/NANUbcYzdHVewzKU+kyn
+O6R7lfMpTgNvS9vzBRSyxNj4Efns3itEzLgONx+udQlPj88nh/oJIaU1XVIF0v8D
+3DwHllzGoM1B6xHWQDIlh/waoFA5OY60nFutCFpjnzygbbZxrE1BVkZtFLilVNNj
+fE+oOxAdhEw4oNQ3ZMJtzhakCyNEh168vngSmo1c9gkCAmz8Su6aUIXw78Sgd5BH
+dxQgdzVnA4d540urXDFuFgKm4UnIFcCCCOXnWyb5U+z6xAc5HEDyWQ5atCCPHE0K
+ytZSa6z5PvQoQ3jbz33AFvCcgNYa0CkZVkTrqUZyYjg85EO7NCRa5QwCApdS4bGD
+8Ld+Ls36diMoo5GxyTGwrf+oPCZzX6UASezDPbeG4MkraNrusXLYm7ZriUmGnvYO
+jl4G3xKBBalZOyeSdvYh
+=qfsB
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
new file mode 100644
index 000000000000..ddf9fb5c6baf
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v 1.1 2012/03/19 17:27:26 ulm Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+MACROS_PV="20091017"
+
+DESCRIPTION="Jasspa Microemacs"
+HOMEPAGE="http://www.jasspa.com/"
+SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
+	!nanoemacs? (
+		http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
+		http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
+		http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="nanoemacs X xpm"
+
+RDEPEND="sys-libs/ncurses
+	X? ( x11-libs/libX11
+		xpm? ( x11-libs/libXpm ) )
+	nanoemacs? ( !app-editors/ne )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXt
+		x11-proto/xproto )"
+
+S="${WORKDIR}/me${PV:2}/src"
+
+src_unpack() {
+	unpack jasspa-mesrc-${PV}.tar.gz
+	if ! use nanoemacs; then
+		mkdir "${WORKDIR}/jasspa"
+		cd "${WORKDIR}/jasspa"
+		# everything except jasspa-mesrc
+		unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-ncurses.patch"
+	epatch "${FILESDIR}/${PV}-linux3.patch"
+
+	# allow for some variables to be passed to make
+	sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" STRIP=true/' \
+		build || die "sed failed"
+}
+
+src_compile() {
+	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
+	local me="" type=c
+	use nanoemacs && me="-ne"
+	use X && type=cw
+	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
+
+	CC="$(tc-getCC)" ./build ${me} \
+		-t ${type} \
+		-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
+		|| die "build failed"
+}
+
+src_install() {
+	local me=me type=c
+	use nanoemacs && me=ne
+	use X && type=cw
+	newbin ${me}${type} ${me}
+
+	if ! use nanoemacs; then
+		keepdir /usr/share/jasspa/site
+		insinto /usr/share
+		doins -r "${WORKDIR}/jasspa"
+		if use X; then
+			insinto /usr/share/applications
+			doins "${FILESDIR}/${PN}.desktop"
+		fi
+	fi
+
+	dodoc ../faq.txt ../readme.txt ../change.log
+}