Version bump.

Package-Manager: portage-2.2_rc44/cvs/Linux i686

4 files changed, 108 insertions, 7 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index 25c611a98f26..35a8a6561d95 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/jasspa-microemacs
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.35 2009/04/11 13:27:49 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.36 2009/10/14 22:04:59 ulm Exp $
+
+*jasspa-microemacs-20091011 (14 Oct 2009)
+
+  14 Oct 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/20091011-ncurses.patch, +jasspa-microemacs-20091011.ebuild:
+  Version bump.
 
   11 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
   files/jasspa-microemacs.desktop:
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 253bc9eb8157..1ceaa8eefebe 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA1
 
 AUX 20050505-ncurses.patch 773 RMD160 2d867abbf6f6a7ee94b01d7fd1edcd215d57bcd3 SHA1 f46101f426cd135186631a7ed4758de3be19215f SHA256 ec1e6cb4370d3240607f87f11fe3f19090c47cd1356726929cb37f3b71055b80
+AUX 20091011-ncurses.patch 583 RMD160 4cda187fcdb25d1ed0e3d9542730b36bdfbc654a SHA1 556de21b4835f6c4a748f9c25708c3492542bd50 SHA256 8b8937c4668d4f026a65eb31d3602565299d3b866802f5b89ed6b67f66a9aab4
 AUX jasspa-microemacs.desktop 282 RMD160 102529b939ee5f4e70f54cd3ca214db23278d9d1 SHA1 9c412a51086b055ac4189aedcabaf5a256d759ca SHA256 9c77adfb1eb77eb0e313add3bc5f1c06d56cfaf1a1d096751d225d3586347c88
 DIST jasspa-mehtml-20060909.tar.gz 617066 RMD160 84a31dba95839c41661f9907bee76e8c87a13c13 SHA1 867d492949a6f765963d059836edcf191ee3c6c1 SHA256 367a30cbd39856c3c4e64a18fda8fd33de8f07385bdfa680dce5f5ce91d0cdd2
+DIST jasspa-mehtml-20091011.tar.gz 628008 RMD160 1b622f7448cc205ca610a35266d0e6b3ffa4ee91 SHA1 fdc75f5d50fb3532ef0fa97d03d9ac19bf4bf3fa SHA256 c106af1a7a1bd5862883ae237ae8a27dccfa30f300944211995658bcfb8621d0
 DIST jasspa-memacros-20060909-2.tar.gz 1074818 RMD160 363f4279e3a34975239aafc219c30e25a6abbfa7 SHA1 060d80dd0a4b19a2b16030abae09a9169a76a8d4 SHA256 b7bd93092ea5a48654a3b666ab11d243e080fe60de25504c03311ed2ec52ff17
+DIST jasspa-memacros-20091011.tar.gz 1105320 RMD160 7b96c454a89da60fd9c4d6f32628a6457b3a5059 SHA1 a9c28d52573d9edfc6797d4cc035ec74482b22c9 SHA256 a010d51c7a7e8efd19b7f837566569f446dfbda8fe9eda96e45b1951e2f5ddec
 DIST jasspa-mesrc-20060909-2.tar.gz 797821 RMD160 6cac620803c84349850493c0250af7272b36af4e SHA1 e7c9cf3504c2bec4c074ecbe82f6a053560c4532 SHA256 2cb80e403a1c76c6a3405ccbf67e457e2f558e19f80c96baa608635f3e917299
+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-20060909-r1.ebuild 2040 RMD160 b7f93146cb7534091fae08c4ff5706045b302a8b SHA1 9f89cc89761b9a1f86451a645d36b8770207e30a SHA256 d91d72c754d01023bb201d408112cf6fbe6b77143a1b6429a668a5cce383c084
-MISC ChangeLog 6534 RMD160 6b9e7d353d23ed2fcfe1f92a31826dc9db3221e0 SHA1 0a956c9163454c25214ea302746a618dbac67aae SHA256 10dd09e9e8140d96d32a754ad9c56c45d815da811d355863db974a8a594b5372
+EBUILD jasspa-microemacs-20091011.ebuild 2041 RMD160 17d9795aee90b7ff513826535f8e04472ad83b95 SHA1 f3e5aed7a02b6546c73b21a9100b944a3e086aa7 SHA256 a9eb3164e95e7cfba10f53a65810617670a75a7d0c17a6d4e40671311b15538c
+MISC ChangeLog 6710 RMD160 17358ee36a5bce9d33b98392b39555650dbd8667 SHA1 8df4a7ddd871df1231c89d3157350ca22b2bddb5 SHA256 cc99b47f9812afe9ac1aeee373a8a2591c7115b83b7e6f78606399f922fe5094
 MISC metadata.xml 1001 RMD160 5ee6ad89fad2090878597910c1d2bbc87b16da94 SHA1 5cc031f57eb5092959b28c169c46ec500cafb509 SHA256 ce5887d8c485076c2a80ce19cf9dbef7bba962052758729577832b9a225ef827
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkngmysACgkQOeoy/oIi7uzTQgCg3PzjSCOvdNYUwYe+M+B7dvfX
-CLAAnRYuIRyjjVEXTrtQ0Y2vQUPiJTJi
-=KbSX
+iEYEARECAAYFAkrWSw8ACgkQOeoy/oIi7ux5NACgxYRW897MlbaEhzwW7Qq5GF+N
+4LMAoLtq58Hu1bSM76TjsSEj4D/BeqT8
+=JL7i
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jasspa-microemacs/files/20091011-ncurses.patch b/app-editors/jasspa-microemacs/files/20091011-ncurses.patch
new file mode 100644
index 000000000000..92a2885895b1
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/20091011-ncurses.patch
@@ -0,0 +1,15 @@
+--- me091011-orig/src/linux26.gmk
++++ me091011/src/linux26.gmk
+@@ -66,12 +66,7 @@
+ # accomplish this try to compile test.c and see if it can link termcap. For
+ # Linux 2.6 then preference would appear to be "ncurses" rather than "termcap". 
+ #
+-test = $(shell echo "\#include <stdio.h>" > _t.c ; echo "main() { printf(\"HW\n\"); }" >> _t.c ; $(LD) $(LDFLAGS) -o /dev/null -lncurses _t.c 2>&1 ; rm -f _t.c)
+-ifneq "$(strip $(test))" ""
+-CONSOLE_LIBS  = -ltermcap
+-else
+ CONSOLE_LIBS  = -lncurses
+-endif
+ #
+ # Rules
+ .SUFFIXES: .c .oc .ow .ob .on .ov .oe .odc .odw .odb .odn .odv .ode
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011.ebuild
new file mode 100644
index 000000000000..4a412357cd39
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/10/14 22:04:59 ulm Exp $
+
+inherit eutils toolchain-funcs
+
+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-${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"
+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
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-ncurses.patch"
+
+	# allow for some variables to be passed to make
+	sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" STRIP=true/' \
+		build || die "sed failed"
+}
+
+src_compile() {
+	local loadpath="~/.jasspa:/usr/share/jasspa/site:/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 "${loadpath}" \
+		|| die "build failed"
+}
+
+src_install() {
+	local me=me type=c
+	use nanoemacs && me=ne
+	use X && type=cw
+	newbin ${me}${type} ${me} || die "newbin failed"
+
+	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 || die "dodoc failed"
+}