new upstream release. fixes bug #332729.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 105 insertions, 2 deletions

diff --git a/app-editors/ee/ChangeLog b/app-editors/ee/ChangeLog
index f3145ccf21a0..a6d602f001c9 100644
--- a/app-editors/ee/ChangeLog
+++ b/app-editors/ee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/ee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.1 2011/05/07 15:46:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.2 2011/05/07 16:37:12 hattya Exp $
+
+*ee-1.5.2 (07 May 2011)
+
+  07 May 2011; Akinori Hattori <hattya@gentoo.org> +ee-1.5.2.ebuild,
+  +files/ee-init-location.diff:
+  new upstream release. fixes bug #332729.
 
 *ee-1.4.7 (07 May 2011)
 *ee-1.4.6 (07 May 2011)
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
index 1b81cc571fca..f532e806f74d 100644
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@@ -1,6 +1,9 @@
+AUX ee-init-location.diff 1450 RMD160 28e1c02acd8c8634a79fe9e05cb881dd0401005b SHA1 c5bb61aca17672d309ff2806933203b65ea6b82b SHA256 6e3640641fcc33407924fbdb6d61f702f8535f1079260f6998a61199eed0c728
 DIST ee-1.4.6.src.tgz 70511 RMD160 2ed8ad3123c5443b29f5db142ad367d67028da27 SHA1 6be7d03eade441a6c409b9d441ba2c144e26b157 SHA256 a85362dbc24c2bd0f675093fb593ba347b471749c0a0dbefdc75b6334a7b6e4c
 DIST ee-1.4.7.src.tgz 70936 RMD160 03ecef414431c6bcfae8564516322519dc0341c3 SHA1 0604b204f3c8735e9d4018a813c36b613feb5451 SHA256 f53010c69258b1b5a65870afe1938134bec01bb1f605b890ca474bcb03265189
+DIST ee-1.5.2.src.tgz 69651 RMD160 af1ecc2c826ef3129af3a568d563b5c4bb47ba14 SHA1 da0697f34e407c010754922531b2f94bd7a589f8 SHA256 e08d7511a48b43ee354042fe3fe7d9cb3431238caedcf4ac729c61a447003918
 EBUILD ee-1.4.6.ebuild 881 RMD160 a2700707dbd3ce41507902f97dc81cbba345fb3c SHA1 44f76bae3b1d512b04b6d603cb24d8db5e4bbff5 SHA256 f3f32e7ad9dde5979d4ef776ad100b7c3b5051ea84a189b842fa177b65ea3aa4
 EBUILD ee-1.4.7.ebuild 981 RMD160 fec4d5e2ec1995538589cd91b2ef913ce25d3ca5 SHA1 bd8f72dbcf41f7c656112734eeff5d8f1ac086ef SHA256 2ae137c7d8247ba107ca7aa2ef8174323c17cd2efc7cccad8f56dcb8f0d8a432
-MISC ChangeLog 2767 RMD160 f674f34ed3075a7296e35eb184f31a338ede33f0 SHA1 4cd6bf37451bfcf2145443b90ffa7fafc0611349 SHA256 c51e5db76b5254555203bac072cdbda122a1f00f5f0b00deb12ca342376f6fd9
+EBUILD ee-1.5.2.ebuild 1040 RMD160 4f4359071fff72ef96d560692dc972300d13aba0 SHA1 1646d96e0bf8244188e2112eab249dcb3af0e488 SHA256 68d5cd6bf629ab4e9db19385c00a63873b0a2756ba395babfed1a87f31551a32
+MISC ChangeLog 2937 RMD160 82290c10c9669bc4da2d2ae23001e1bc853f4c4e SHA1 b7146d83e516ee9a17f6c45e6dcf243a0d32a63f SHA256 e15f15799a881a979afe4d39c9e1a4e8cf4f21c60c0e8662a70b1b4bb2ecd8d3
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
new file mode 100644
index 000000000000..27d1490c6bb2
--- /dev/null
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.1 2011/05/07 16:37:12 hattya Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="An easy to use text editor. A subset of aee."
+HOMEPAGE="http://mahon.cwx.net/"
+SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+S="${WORKDIR}/easyedit-${PV}"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${PN}-*.diff
+
+	sed -i \
+		-e "s/make -/\$(MAKE) -/g" \
+		-e "/^buildee/s/$/ localmake/" \
+		Makefile \
+		|| die
+
+	sed -i \
+		-e "s/\tcc /\t\\\\\$(CC) /" \
+		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
+		-e "/other_cflag/s/ *-s//" \
+		create.make \
+		|| die
+
+}
+
+src_compile() {
+
+	emake CC="$(tc-getCC)" || die
+
+}
+
+src_install() {
+
+	dobin ee
+	doman ee.1
+	dodoc Changes README.ee ee.i18n.guide ee.msg
+	dodir /usr/share/${PN}
+
+}
diff --git a/app-editors/ee/files/ee-init-location.diff b/app-editors/ee/files/ee-init-location.diff
new file mode 100644
index 000000000000..c623bcdba807
--- /dev/null
+++ b/app-editors/ee/files/ee-init-location.diff
@@ -0,0 +1,42 @@
+diff -ur easyedit-1.5.2.orig/ee.1 easyedit-1.5.2/ee.1
+--- easyedit-1.5.2.orig/ee.1
++++ easyedit-1.5.2/ee.1
+@@ -406,7 +406,7 @@
+ .PP
+ Since different users have different preferences, \fIee\fR allows some 
+ slight configurability.  There are three possible locations for an 
+-initialization file for ee:  the file \fI/usr/local/lib/init.ee\fR, the 
++initialization file for ee:  the file \fI/usr/share/ee/init.ee\fR, the 
+ file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR 
+ in the current directory (if different from the home 
+ directory).  This allows system administrators to set some preferences for 
+@@ -414,7 +414,7 @@
+ and the user to customize settings for particular directories (like one 
+ for correspondence, and a different directory for programming).
+ .PP
+-The file \fI\/usr/local/lib/init.ee\fR is read first, then 
++The file \fI\/usr/share/ee/init.ee\fR is read first, then 
+ \fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the 
+ most recent file read taking precedence.
+ .PP
+@@ -521,7 +521,7 @@
+ may be too slow for slower systems.
+ .SH FILES
+ .PP
+-.I /usr/local/lib/init.ee
++.I /usr/share/ee/init.ee
+ .br
+ .I $HOME/.init.ee
+ .br
+diff -ur easyedit-1.5.2.orig/ee.c easyedit-1.5.2/ee.c
+--- easyedit-1.5.2.orig/ee.c
++++ easyedit-1.5.2/ee.c
+@@ -4124,7 +4124,7 @@
+ }
+ 
+ unsigned char *init_name[3] = {
+-	"/usr/local/lib/init.ee", 
++	"/usr/share/ee/init.ee", 
+ 	NULL, 
+ 	".init.ee"
+ 	};