--- a/bins-1.1.29.ebuild	2010-01-01 13:05:37.000000000 -0500
+++ a/bins-1.1.29.ebuild	2010-04-17 20:48:33.000000000 -0400
@@ -2,6 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/bins/bins-1.1.29.ebuild,v 1.14 2010/01/01 17:56:37 ssuominen Exp $
 
+EAPI="2"
+
 inherit eutils
 
 DESCRIPTION="Static HTML photo album generator"
@@ -13,8 +15,8 @@ 
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=">=dev-lang/perl-5.6.1-r6
-	>=media-gfx/imagemagick-6.2.2.0
+DEPEND=">=dev-lang/perl-5.8.8
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	>=dev-perl/ImageSize-2.99
 	>=dev-perl/ImageInfo-1.04-r1
 	>=dev-perl/IO-String-1.01-r1
@@ -34,9 +36,7 @@ 
 	dev-perl/TimeDate
 	>=sys-apps/sed-4"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-install.patch
 	sed -i -e  's|MAN="\$PREFIX/man/man1"|MAN="${D}usr/share/man/man1"|' "${S}"/install.sh
 }
@@ -50,7 +50,6 @@ 
 	for i in `grep -l "usr\/local\/share" "${D}"/usr/bin/*`; do
 		sed -i -e "s:usr\/local\/share:usr\/share:" ${i}
 	done
-
 }
 
 pkg_postinst() {