--- more-2.12r.ebuild.orig	2011-07-08 19:59:24.000000000 +0900
+++ more-2.12r.ebuild	2012-11-09 00:32:20.000000000 +0900
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/more/more-2.12r.ebuild,v 1.4 2011/07/08 10:59:24 ssuominen Exp $
 
+EAPI=2
+
 inherit eutils flag-o-matic
 
 DESCRIPTION="Primitive text file viewer"
@@ -14,18 +16,16 @@
 KEYWORDS="~x86-fbsd"
 IUSE="static nls selinux"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND="!static? ( >=sys-libs/ncurses-5.2-r2 )
 	selinux? ( sys-libs/libselinux )
 	!sys-apps/util-linux"
 DEPEND="${RDEPEND}
+	static? ( >=sys-libs/ncurses-5.2-r2[static-libs] )
 	nls? ( sys-devel/gettext )"
 
 yesno() { use $1 && echo yes || echo no; }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-freebsd.patch
 
 	# Enable random features
@@ -42,11 +42,14 @@
 		${mconfigs} || die "MCONFIG sed"
 }
 
-src_compile() {
+src_configure() {
 	use static && append-ldflags -static
 	export CC="$(tc-getCC)"
 
 	econf || die "configure failed"
+}
+
+src_compile() {
 	emake -C lib xstrncpy.o || die "emake xstrncpy.o failed"
 	emake -C text-utils more || die "emake more failed"
 }