--- /usr/portage/sci-biology/amap/amap-2.1.ebuild	2008-02-03 06:07:07.000000000 +0100
+++ amap-2.2.ebuild	2008-04-16 11:53:38.000000000 +0200
@@ -4,23 +4,25 @@
 
 inherit eutils toolchain-funcs
 
 MY_P="${PN}.${PV}"
 DESCRIPTION="Protein multiple-alignment-based sequence annealing"
-HOMEPAGE="http://bio.math.berkeley.edu/amap/"
-SRC_URI="http://bio.math.berkeley.edu/amap/download/${MY_P}.tar.gz"
+HOMEPAGE="http://baboon.math.berkeley.edu/amap/"
+SRC_URI="http://baboon.math.berkeley.edu/amap/download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-align"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-fix-cxxflags.patch
+	epatch "${FILESDIR}"/${PV}-gcc43.patch
 }
 
 src_compile() {
 	cd "${S}"/align
 	emake \