--- /usr/portage/media-gfx/fontforge/fontforge-20110222-r1.ebuild	2012-09-05 10:01:19.000000000 +0200
+++ fontforge-20120731.ebuild	2012-09-22 20:41:49.348799254 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.7 2012/05/09 02:09:37 aballier Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -13,22 +13,23 @@
 # users. http://fontforge.sourceforge.net/faq.html#libraries. To see what
 # libraries fontforge thinks with use $ fontforge --library-status
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="python? 2"
 inherit eutils fdo-mime python autotools
 
-HTDOCSV="20110221"
+MY_PV="${PV}-b"
+HTDOCSV="${PV}-b"
 CIDMAPV="20090121"
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
+SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${MY_PV}.tar.bz2
 	doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${HTDOCSV}.tar.bz2 )
 	cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )"	# http://fontforge.sf.net/cidmaps.tgz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~x86"
 IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
 
 RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
@@ -47,6 +48,8 @@
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
@@ -55,7 +58,7 @@
 }
 
 src_unpack() {
-	unpack ${PN}_full-${PV}.tar.bz2
+	unpack ${PN}_full-${MY_PV}.tar.bz2
 	use cjk && unpack cidmaps-${CIDMAPV}.tgz
 	if use doc; then
 		mkdir html
@@ -65,8 +68,6 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-lxkbui.patch"
-	epatch "${FILESDIR}/${P}-libz.so-linkage.patch"
 	if use doc; then
 		chmod -x "${WORKDIR}"/html/*.html || die
 	fi
@@ -92,26 +93,26 @@
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README* || die
+	emake install DESTDIR="${D}"
 
 	find "${ED}" -name '*.la' -exec rm -f {} +
 
 	if use cjk; then #129518
 		insinto /usr/share/fontforge
-		doins "${WORKDIR}"/*.cidmap || die
+		doins "${WORKDIR}"/*.cidmap
 	fi
 
-	doicon Packaging/fontforge.png || die
-	domenu Packaging/fontforge.desktop || die
+	for isize in 16 22 24 32 48
+	do	
+		doicon -s ${isize} Packaging/icons/${isize}x${isize}/apps/fontforge.png
+	done
+	doicon -s scalable Packaging/icons/scalable/apps/fontforge.svg
+	insinto /usr/share/applications
+	doins Packaging/fontforge.desktop
 	insinto /usr/share/mime/application
-	doins Packaging/fontforge.xml || die
+	doins Packaging/fontforge.xml
 
-	if use doc; then
-		insinto /usr/share/doc/${PN}
-		cd "${WORKDIR}/html/"
-		doins -r * || die
-	fi
+	use doc && dodoc -r README* "${WORKDIR}/html" 
 }
 
 pkg_postrm() {