Migrate changes from Gentoo Prefix. EAPI4, darwin patch, emake call modifications

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

4 files changed, 38 insertions, 26 deletions

diff --git a/app-editors/levee/ChangeLog b/app-editors/levee/ChangeLog
index 67d5901a2872..05c512e031a7 100644
--- a/app-editors/levee/ChangeLog
+++ b/app-editors/levee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/levee
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/levee/ChangeLog,v 1.25 2009/11/30 23:30:54 tcunha Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/levee/ChangeLog,v 1.26 2012/02/13 16:30:44 darkside Exp $
+
+  13 Feb 2012; Jeremy Olexa <darkside@gentoo.org>
+  +files/levee-3.4o-darwin.patch, levee-3.5a.ebuild:
+  Migrate changes from Gentoo Prefix. EAPI4, darwin patch, emake call
+  modifications
 
   01 Dec 2009; Tiago Cunha <tcunha@gentoo.org> levee-3.5a.ebuild:
   stable sparc, bug 289333
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index 27ebb983cd63..09465f5d1964 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX levee-3.4o-darwin.patch 318 RMD160 e3214ce0779b666cc3573de055b0beb70b99ac13 SHA1 d2c26395a0be9a5277751198030c0ae6321f7b29 SHA256 dc3b5a2afca9f06415a2afcc5df4c9ade33498085b9a66936e4754d43a433c2c
 AUX levee-3.5-glibc210.patch 2448 RMD160 5ec2a69d1e1378fc53de6188fb038331570e9e21 SHA1 89e0b5166e50ce61aab5ca5bbb85002b8bee755d SHA256 75f6f3e128996d3b1a68d37f5f3a1e767c010a5b768bdd413fb578e276e54312
 AUX levee-3.5a-QA.patch 637 RMD160 b7d07b24a661db2d0fe426f1c6566dcd37bf9002 SHA1 aec334c6f804ca1d05a2f337d2cd26ba34468477 SHA256 67da4403b8c34b3579570f04ca3ab894cac1ca85cd2421a72e36ba92ad563463
 DIST levee-3.5a.tar.gz 67733 RMD160 8005e429c440ca273bf31e7b1e499f168432ce46 SHA1 b4853bf55297258e9cac6512abce2552d668ff02 SHA256 eff1c937b1079c68725c26375969a8b51109b170bc1aba9529b989e32f7b34c8
 DIST levee.tar.gz 62562 RMD160 c558ea9b10e3bce25562c5c61a1d5431e63f0d7c SHA1 787a8b6deeead5a376f6d05735fa169e33a374b2 SHA256 3168ce386a9995e52d6467aeb5c7cc2f19b2c422b197c6801cd678273475c84b
 EBUILD levee-3.4o.ebuild 679 RMD160 c795c41e386aefb80b0e042a995c62d8f40db9e7 SHA1 946c8ea98e447a384808e1e28a904895453bf01d SHA256 ccbccbe90100872b61051b4da1a3f5e6adce9448a687dc67706cbfbb49cfafe5
-EBUILD levee-3.5a.ebuild 923 RMD160 fd02347a71841104708aa7c46ec0a9bde935317b SHA1 18a6e11eb88b28387c013bf36b26cb724383fe6a SHA256 014cf15c8f264eb815972b61aaa6a8c045bd602e125b4655f662f37ab689d55a
-MISC ChangeLog 2501 RMD160 1e0690205c88b188c6e34208a21f13c09eeebb07 SHA1 0119609288f45522624917ff22f1fa6e66db8cb1 SHA256 989c8a5f47fd36b717cb3c9410c0f4f3e03a134d0e0a6c6b63df7c035393f6c0
+EBUILD levee-3.5a.ebuild 1041 RMD160 9a98a6c3f393bf12cb18b25d4941f946d3acaee5 SHA1 3b9dd3806e225b1db539bf0af3fead2119632f2c SHA256 b9afd605c451be3025d413f4673c5d96d16d0ead42cacc4793ca896c8c323cc9
+MISC ChangeLog 2693 RMD160 e762aedda7388b16dcc74cba8f75705398b2e07b SHA1 b65019bec1eda55524b9e38b5f526005f3989f18 SHA256 8b26bc2f6248ba31ed25490c10536b35a07645f95cc0f6a0db9806d84493e34b
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk58/F8ACgkQfXuS5UK5QB1CvAP+MohYDOOipEFJUTRJXXFhjuI9
-9TeTcofjSniJJqYb/JN3vkSu3ZdX5RNcvdFEw5uzNzeYNRCuVHjdqyVu9Ne7agYh
-YQikDyi8sQqLhbLjy3/NEbUcHpem4ur6ZEEjoahffn8iw/M3XUSVckIqDUVK+7nW
-1LFVJliuPgFm46WttCs=
-=Dv/S
------END PGP SIGNATURE-----
diff --git a/app-editors/levee/files/levee-3.4o-darwin.patch b/app-editors/levee/files/levee-3.4o-darwin.patch
new file mode 100644
index 000000000000..9481b1a3ade9
--- /dev/null
+++ b/app-editors/levee/files/levee-3.4o-darwin.patch
@@ -0,0 +1,16 @@
+--- unixcall.c.orig	2007-03-18 17:46:05 +0100
++++ unixcall.c	2007-03-18 17:51:13 +0100
+@@ -77,6 +77,13 @@
+ static int ioset = 0;
+ static struct termios old;
+ 
++#if defined(__MACH__)
++# define TCGETS TIOCGETA
++# define TCSETS TIOCSETA
++# define TCGETA TIOCGETA
++# define TCSETAF TIOCSETAF
++#endif
++
+ void
+ initcon()
+ {
diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild
index 2f529e426851..5487ef7c90f1 100644
--- a/app-editors/levee/levee-3.5a.ebuild
+++ b/app-editors/levee/levee-3.5a.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/levee/levee-3.5a.ebuild,v 1.5 2009/11/30 23:30:54 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/levee/levee-3.5a.ebuild,v 1.6 2012/02/13 16:30:44 darkside Exp $
+
+EAPI=4
 
 inherit toolchain-funcs eutils
 
@@ -10,26 +12,26 @@ SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz"
 
 LICENSE="levee"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="!app-text/lv
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4o-darwin.patch
 	epatch "${FILESDIR}"/${P}-QA.patch
 	epatch "${FILESDIR}"/${PN}-3.5-glibc210.patch
 }
 
 src_compile() {
-	./configure.sh --prefix=/usr || die "configure failed"
-	emake	CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" \
-		CC=$(tc-getCC) || die "emake failed"
+	export AC_CPP_PROG=$(tc-getCPP)
+	export AC_PATH=${PATH}
+	./configure.sh --prefix="${PREFIX}"/usr || die "configure failed"
+	emake CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" CC=$(tc-getCC)
 }
 
 src_install() {
-	emake PREFIX="${D}" install || die "emake install failed"
+	emake PREFIX="${D}${EPREFIX}" install
 }