4 files changed, 105 insertions, 11 deletions
diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index 7221df48f9d6..243d7e34bb51 100644
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/arj
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.39 2009/10/12 16:38:22 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.40 2010/03/29 23:43:41 abcd Exp $
+
+  29 Mar 2010; Jonathan Callen <abcd@gentoo.org> arj-3.10.22-r2.ebuild,
+  +files/arj-3.10.22-darwin.patch, +files/arj-3.10.22-interix.patch:
+  Bump to EAPI=3, add prefix keywords & patches
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> arj-3.10.22-r1.ebuild:
   QA fixes; WANT_AUTOCONF redundantly set to latest
diff --git a/app-arch/arj/arj-3.10.22-r2.ebuild b/app-arch/arj/arj-3.10.22-r2.ebuild
index f7a77b9d5f9b..3c6db394b5d2 100644
--- a/app-arch/arj/arj-3.10.22-r2.ebuild
+++ b/app-arch/arj/arj-3.10.22-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r2.ebuild,v 1.9 2009/09/23 15:09:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r2.ebuild,v 1.10 2010/03/29 23:43:41 abcd Exp $
+
+EAPI=3
 
 inherit autotools eutils toolchain-funcs
 
@@ -13,14 +15,12 @@ SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${WORKDIR}"/${P/-/_}-${PATCH_LEVEL}.diff \
 		"${FILESDIR}"/${P}-implicit-declarations.patch
 	epatch "${FILESDIR}/${P}-glibc2.10.patch"
@@ -28,18 +28,22 @@ src_unpack() {
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
 		epatch debian/patches
 
+	epatch "${FILESDIR}"/${P}-darwin.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+
 	cd gnu
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	cd gnu
 	CFLAGS="${CFLAGS} -Wall" econf
+}
 
-	cd "${S}"
+src_compile() {
 	sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed."
 
-	ARJLIBDIR="/usr/$(get_libdir)"
+	ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)"
 
 	emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \
 		pkglibdir="${ARJLIBDIR}" all || die "emake failed."
diff --git a/app-arch/arj/files/arj-3.10.22-darwin.patch b/app-arch/arj/files/arj-3.10.22-darwin.patch
new file mode 100644
index 000000000000..a09c30d3126d
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-darwin.patch
@@ -0,0 +1,41 @@
+--- arj-3.10.22/environ.c
++++ arj-3.10.22/environ.c
+@@ -58,7 +58,7 @@
+   #include <sys/ioctl.h>
+   #include <sys/statfs.h>
+   #include <sys/statvfs.h>
+- #elif defined(__FreeBSD__)||defined(__NetBSD__)
++ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+  #elif defined(__QNXNTO__)
+--- arj-3.10.22/gnu/configure.in
++++ arj-3.10.22/gnu/configure.in
+@@ -62,6 +62,11 @@
+         DLL_FLAGS="-shared -export-dynamic"
+         LD_STRIP="gnu/stripgcc.lnk"
+ 	;;
++*darwin*)
++	# not ELF
++	DLL_EXT=".dylib"
++	DLL_FLAGS=""
++	;;
+ interix3*)
+ 	# not ELF
+ 	DLL_FLAGS="-shared"
+--- arj-3.10.22/arjcrypt.c
++++ arj-3.10.22/arjcrypt.c
+@@ -329,6 +329,13 @@
+ }
+ #endif
+ 
++#if defined(__APPLE__)
++int main()
++{
++ return(0);
++}
++#endif
++
+ /* External entry */
+ 
+ #if TARGET==DOS
diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch
new file mode 100644
index 000000000000..8294f1e96bb4
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.22-interix.patch
@@ -0,0 +1,45 @@
+diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c
+--- arj-3.10.22.orig/environ.c	2008-03-30 16:51:40 +0200
++++ arj-3.10.22/environ.c	2008-03-30 16:50:16 +0200
+@@ -61,7 +61,7 @@
+  #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+- #elif defined(__QNXNTO__)
++ #elif defined(__QNXNTO__) || defined(__INTERIX)
+   #include <sys/statvfs.h>
+  #else
+   #include <sys/statfs.h>
+@@ -2286,7 +2286,7 @@
+   else
+    return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
+  #elif TARGET==UNIX
+-  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
++  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)
+    struct statvfs vfs;
+ 
+    if(statvfs(name, &vfs)==-1)
+@@ -3802,7 +3802,9 @@
+  #elif TARGET==WIN32
+   return(0);
+  #elif TARGET==UNIX
++ #ifndef __INTERIX
+   sync();
++ #endif
+   return(0);
+  #endif
+ }
+diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in
+--- arj-3.10.22.orig/gnu/configure.in	2008-03-30 16:51:40 +0200
++++ arj-3.10.22/gnu/configure.in	2008-03-30 16:41:37 +0200
+@@ -67,8 +67,9 @@
+ 	DLL_EXT=".dylib"
+ 	DLL_FLAGS=""
+ 	;;
+-interix3*)
++interix*)
+ 	# not ELF
++	DYN_LIBS="-ldl"
+ 	DLL_FLAGS="-shared"
+ 	DLL_CFLAGS=""
+ 	;;